/* LDBM backend specific entry info -- visible only to the cache */
struct ldbm_entry_info {
- ldap_pvt_thread_rdwr_t lei_rdwr; /* reader/writer lock */
-
/*
- * remaining fields require backend cache lock to access
* These items are specific to the LDBM backend and should
* be hidden.
*/
#define CACHE_ENTRY_DELETED 3
int lei_refcnt; /* # threads ref'ing this entry */
- struct entry *lei_lrunext; /* for cache lru list */
- struct entry *lei_lruprev;
+ Entry *lei_lrunext; /* for cache lru list */
+ Entry *lei_lruprev;
};
#define LEI(e) ((struct ldbm_entry_info *) ((e)->e_private))
static void lru_print(struct cache *cache);
#endif
-static int
-cache_entry_rdwr_lock(Entry *e, int rw)
-{
- Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%slock: ID: %ld\n",
- rw ? "w" : "r", e->e_id, 0);
-
- if (rw)
- return ldap_pvt_thread_rdwr_wlock(&LEI(e)->lei_rdwr);
- else
- return ldap_pvt_thread_rdwr_rlock(&LEI(e)->lei_rdwr);
-}
-
-static int
-cache_entry_rdwr_trylock(Entry *e, int rw)
-{
- Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%strylock: ID: %ld\n",
- rw ? "w" : "r", e->e_id, 0);
-
- if (rw)
- return ldap_pvt_thread_rdwr_wtrylock(&LEI(e)->lei_rdwr);
- else
- return ldap_pvt_thread_rdwr_rtrylock(&LEI(e)->lei_rdwr);
-}
-
-static int
-cache_entry_rdwr_unlock(Entry *e, int rw)
-{
- Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%sunlock: ID: %ld\n",
- rw ? "w" : "r", e->e_id, 0);
-
- if (rw)
- return ldap_pvt_thread_rdwr_wunlock(&LEI(e)->lei_rdwr);
- else
- return ldap_pvt_thread_rdwr_runlock(&LEI(e)->lei_rdwr);
-}
-
-static int
-cache_entry_rdwr_init(Entry *e)
-{
- return ldap_pvt_thread_rdwr_init( &LEI(e)->lei_rdwr );
-}
-
-static int
-cache_entry_rdwr_destroy(Entry *e)
-{
- return ldap_pvt_thread_rdwr_destroy( &LEI(e)->lei_rdwr );
-}
-
static int
cache_entry_private_init( Entry*e )
{
- struct ldbm_entry_info *lei;
-
-#ifdef LDAP_DEBUG
assert( e->e_private == NULL );
-#endif
if( e->e_private != NULL ) {
/* this should never happen */
e->e_private = ch_calloc(1, sizeof(struct ldbm_entry_info));
- /* DDD if( cache_entry_rdwr_init( e ) != 0 ) { */
- /* DDD free( LEI(e) ); */
- /* DDD e->e_private = NULL; */
- /* DDD return 1; */
- /* DDD } */
-
return 0;
}
static int
cache_entry_private_destroy( Entry*e )
{
- struct ldbm_entry_info *lei;
-
-#ifdef LDAP_DEBUG
assert( e->e_private );
-#endif
-
- /* DDD cache_entry_rdwr_destroy( e ); */
free( e->e_private );
e->e_private = NULL;
bdb2i_cache_return_entry_rw( struct cache *cache, Entry *e, int rw )
{
/* set cache mutex */
- /* DDD ldap_pvt_thread_mutex_lock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_lock( &cache->c_mutex );
-#ifdef LDAP_DEBUG
assert( e->e_private );
-#endif
-
- /* DDD cache_entry_rdwr_unlock(e, rw); */
LEI(e)->lei_refcnt--;
}
/* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
}
#define LRU_DELETE( cache, e ) { \
if ( LEI(e)->lei_lruprev != NULL ) { \
LEI(LEI(e)->lei_lruprev)->lei_lrunext = LEI(e)->lei_lrunext; \
} else { \
- cache->c_lruhead = LEI(e)->lei_lrunext; \
+ (cache)->c_lruhead = LEI(e)->lei_lrunext; \
} \
if ( LEI(e)->lei_lrunext != NULL ) { \
LEI(LEI(e)->lei_lrunext)->lei_lruprev = LEI(e)->lei_lruprev; \
} else { \
- cache->c_lrutail = LEI(e)->lei_lruprev; \
+ (cache)->c_lrutail = LEI(e)->lei_lruprev; \
} \
}
#define LRU_ADD( cache, e ) { \
- LEI(e)->lei_lrunext = cache->c_lruhead; \
+ LEI(e)->lei_lrunext = (cache)->c_lruhead; \
if ( LEI(e)->lei_lrunext != NULL ) { \
- LEI(LEI(e)->lei_lrunext)->lei_lruprev = e; \
+ LEI(LEI(e)->lei_lrunext)->lei_lruprev = (e); \
} \
- cache->c_lruhead = e; \
+ (cache)->c_lruhead = (e); \
LEI(e)->lei_lruprev = NULL; \
- if ( cache->c_lrutail == NULL ) { \
- cache->c_lrutail = e; \
+ if ( (cache)->c_lrutail == NULL ) { \
+ (cache)->c_lrutail = (e); \
} \
}
int rw
)
{
- int i, rc;
+ int i;
Entry *ee;
/* set cache mutex */
- /* DDD ldap_pvt_thread_mutex_lock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_lock( &cache->c_mutex );
-#ifdef LDAP_DEBUG
assert( e->e_private == NULL );
-#endif
if( cache_entry_private_init(e) != 0 ) {
+ /* free cache mutex */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+
Debug( LDAP_DEBUG_ANY,
"====> bdb2i_cache_add_entry( %ld ): \"%s\": private init failed!\n",
e->e_id, e->e_dn, 0 );
+
return( -1 );
}
if ( avl_insert( &cache->c_dntree, (caddr_t) e,
- entry_dn_cmp, avl_dup_error ) != 0 )
+ (AVL_CMP) entry_dn_cmp, avl_dup_error ) != 0 )
{
Debug( LDAP_DEBUG_TRACE,
"====> bdb2i_cache_add_entry( %ld ): \"%s\": already in dn cache\n",
cache_entry_private_destroy(e);
/* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
return( 1 );
}
/* id tree */
if ( avl_insert( &cache->c_idtree, (caddr_t) e,
- entry_id_cmp, avl_dup_error ) != 0 )
+ (AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 )
{
Debug( LDAP_DEBUG_ANY,
"====> bdb2i_cache_add_entry( %ld ): \"%s\": already in id cache\n",
/* delete from dn tree inserted above */
if ( avl_delete( &cache->c_dntree, (caddr_t) e,
- entry_dn_cmp ) == NULL )
+ (AVL_CMP) entry_dn_cmp ) == NULL )
{
Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n",
0, 0, 0 );
cache_entry_private_destroy(e);
/* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
return( -1 );
}
- /* DDD cache_entry_rdwr_lock( e, rw ); */
-
/* put the entry into 'CREATING' state */
/* will be marked after when entry is returned */
LEI(e)->lei_state = CACHE_ENTRY_CREATING;
e = cache->c_lrutail;
/* delete from cache and lru q */
- /* XXX do we need rc ? */
- rc = cache_delete_entry_internal( cache, e );
+ cache_delete_entry_internal( cache, e );
cache_entry_private_destroy( e );
entry_free( e );
}
}
/* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
return( 0 );
}
Entry *e
)
{
- int i, rc;
+ int i;
Entry *ee;
/* set cache mutex */
- /* DDD ldap_pvt_thread_mutex_lock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_lock( &cache->c_mutex );
-#ifdef LDAP_DEBUG
assert( e->e_private );
-#endif
if ( avl_insert( &cache->c_dntree, (caddr_t) e,
- entry_dn_cmp, avl_dup_error ) != 0 )
+ (AVL_CMP) entry_dn_cmp, avl_dup_error ) != 0 )
{
Debug( LDAP_DEBUG_TRACE,
"====> bdb2i_cache_add_entry( %ld ): \"%s\": already in dn cache\n",
e->e_id, e->e_dn, 0 );
/* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
return( 1 );
}
/* id tree */
if ( avl_insert( &cache->c_idtree, (caddr_t) e,
- entry_id_cmp, avl_dup_error ) != 0 )
+ (AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 )
{
Debug( LDAP_DEBUG_ANY,
"====> bdb2i_cache_update_entry( %ld ): \"%s\": already in id cache\n",
/* delete from dn tree inserted above */
if ( avl_delete( &cache->c_dntree, (caddr_t) e,
- entry_dn_cmp ) == NULL )
+ (AVL_CMP) entry_dn_cmp ) == NULL )
{
Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n",
0, 0, 0 );
}
/* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
return( -1 );
}
e = cache->c_lrutail;
/* delete from cache and lru q */
- /* XXX do we need rc ? */
- rc = cache_delete_entry_internal( cache, e );
+ cache_delete_entry_internal( cache, e );
cache_entry_private_destroy( e );
entry_free( e );
}
}
/* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
return( 0 );
}
/*
- * cache_find_entry_dn2id - find an entry in the cache, given dn
+ * bdb2i_cache_find_entry_dn2id - find an entry in the cache, given dn
*/
ID
char *dn
)
{
- struct ldbminfo *li = (struct ldbminfo *) be->be_private;
Entry e, *ep;
ID id;
-
- /* set cache mutex */
- /* DDD ldap_pvt_thread_mutex_lock( &cache->c_mutex ); */
+ int count = 0;
e.e_dn = dn;
- e.e_ndn = dn_normalize_case( ch_strdup( dn ) );
+ e.e_ndn = ch_strdup( dn );
+ (void) dn_normalize_case( e.e_ndn );
+
+try_again:
+ /* set cache mutex */
+ ldap_pvt_thread_mutex_lock( &cache->c_mutex );
if ( (ep = (Entry *) avl_find( cache->c_dntree, (caddr_t) &e,
- entry_dn_cmp )) != NULL )
+ (AVL_CMP) entry_dn_cmp )) != NULL )
{
+ int state;
+ count++;
+
/*
* ep now points to an unlocked entry
* we do not need to lock the entry if we only
* check the state, refcnt, LRU, and id.
*/
- free(e.e_ndn);
-#ifdef LDAP_DEBUG
assert( ep->e_private );
-#endif
+
+ /* save id */
+ id = ep->e_id;
+ state = LEI(ep)->lei_state;
/*
* entry is deleted or not fully created yet
*/
- if ( LEI(ep)->lei_state != CACHE_ENTRY_READY ) {
-#ifdef LDAP_DEBUG
- assert(LEI(ep)->lei_state != CACHE_ENTRY_UNDEFINED);
-#endif
+ if ( state != CACHE_ENTRY_READY ) {
+ assert(state != CACHE_ENTRY_UNDEFINED);
+
+ /* free cache mutex */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+
Debug(LDAP_DEBUG_TRACE,
"====> bdb2i_cache_find_entry_dn2id(\"%s\"): %ld (not ready) %d\n",
- dn, ep->e_id, LEI(ep)->lei_state);
+ dn, id, state);
- /* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
- return( NOID );
+ ldap_pvt_thread_yield();
+ goto try_again;
}
- Debug(LDAP_DEBUG_TRACE,
- "====> bdb2i_cache_find_entry_dn2id(\"%s\"): %ld\n",
- dn, ep->e_id, 0);
-
/* lru */
LRU_DELETE( cache, ep );
LRU_ADD( cache, ep );
- /* save id */
- id = ep->e_id;
+ /* free cache mutex */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+ Debug(LDAP_DEBUG_TRACE,
+ "====> bdb2i_cache_find_entry_dn2id(\"%s\"): %ld (%d tries)\n",
+ dn, id, count);
+
+ } else {
/* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
- return( id );
+ id = NOID;
}
free(e.e_ndn);
- /* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
-
- return( NOID );
+ return( id );
}
/*
{
Entry e;
Entry *ep;
+ int count=0;
e.e_id = id;
try_again:
/* set cache mutex */
- /* DDD ldap_pvt_thread_mutex_lock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_lock( &cache->c_mutex );
if ( (ep = (Entry *) avl_find( cache->c_idtree, (caddr_t) &e,
- entry_id_cmp )) != NULL )
+ (AVL_CMP) entry_id_cmp )) != NULL )
{
-#ifdef LDAP_DEBUG
+ int state;
+
assert( ep->e_private );
-#endif
+
+ state = LEI(ep)->lei_state;
/*
* entry is deleted or not fully created yet
*/
- if ( LEI(ep)->lei_state != CACHE_ENTRY_READY ) {
-#ifdef LDAP_DEBUG
- assert(LEI(ep)->lei_state != CACHE_ENTRY_UNDEFINED);
-#endif
- Debug(LDAP_DEBUG_TRACE,
- "====> bdb2i_cache_find_entry_id( %ld ): %ld (not ready) %d\n",
- id, ep->e_id, LEI(ep)->lei_state);
+ if ( state != CACHE_ENTRY_READY ) {
+ ID ep_id = ep->e_id;
- /* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
- return( NULL );
- }
+ assert(state != CACHE_ENTRY_UNDEFINED);
- Debug(LDAP_DEBUG_TRACE,
- "====> bdb2i_cache_find_entry_id( %ld, %s ) \"%s\" (found)\n",
- id, rw ? "w" : "r", ep->e_dn);
+ /* free cache mutex */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
- /* acquire reader lock */
- /* DDD if ( cache_entry_rdwr_trylock(ep, rw) == LDAP_PVT_THREAD_EBUSY ) { */
- /* could not acquire entry lock...
- * owner cannot free as we have the cache locked.
- * so, unlock the cache, yield, and try again.
- */
+ Debug(LDAP_DEBUG_TRACE,
+ "====> bdb2i_cache_find_entry_id( %ld ): %ld (not ready) %d\n",
+ id, ep_id, state);
- /* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
- /* DDD ldap_pvt_thread_yield(); */
- /* DDD goto try_again; */
- /* DDD } */
+ ldap_pvt_thread_yield();
+ goto try_again;
+ }
/* lru */
LRU_DELETE( cache, ep );
LEI(ep)->lei_refcnt++;
/* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+
+ Debug(LDAP_DEBUG_TRACE,
+ "====> bdb2i_cache_find_entry_id( %ld ) \"%s\" (found) (%d tries)\n",
+ id, ep->e_dn, count);
return( ep );
}
/* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
return( NULL );
}
int rc;
/* set cache mutex */
- /* DDD ldap_pvt_thread_mutex_lock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_lock( &cache->c_mutex );
-#ifdef LDAP_DEBUG
assert( e->e_private );
-#endif
Debug( LDAP_DEBUG_TRACE, "====> bdb2i_cache_delete_entry( %ld )\n",
e->e_id, 0, 0 );
rc = cache_delete_entry_internal( cache, e );
/* free cache mutex */
- /* DDD ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
return( rc );
}
int rc = 0; /* return code */
/* dn tree */
- if ( avl_delete( &cache->c_dntree, (caddr_t) e, entry_dn_cmp )
+ if ( avl_delete( &cache->c_dntree, (caddr_t) e, (AVL_CMP) entry_dn_cmp )
== NULL )
{
rc = -1;
}
/* id tree */
- if ( avl_delete( &cache->c_idtree, (caddr_t) e, entry_id_cmp )
+ if ( avl_delete( &cache->c_idtree, (caddr_t) e, (AVL_CMP) entry_id_cmp )
== NULL )
{
rc = -1;