static int
cache_entry_private_init( Entry*e )
{
-#ifdef LDAP_DEBUG
assert( e->e_private == NULL );
-#endif
if( e->e_private != NULL ) {
/* this should never happen */
static int
cache_entry_private_destroy( Entry*e )
{
-#ifdef LDAP_DEBUG
assert( e->e_private );
-#endif
cache_entry_rdwr_destroy( e );
void
cache_return_entry_rw( struct cache *cache, Entry *e, int rw )
{
+ ID id;
+ int refcnt;
+
/* set cache mutex */
ldap_pvt_thread_mutex_lock( &cache->c_mutex );
-#ifdef LDAP_DEBUG
assert( e->e_private );
-#endif
cache_entry_rdwr_unlock(e, rw);
- LEI(e)->lei_refcnt--;
+ id = e->e_id;
+ refcnt = --LEI(e)->lei_refcnt;
if ( LEI(e)->lei_state == CACHE_ENTRY_CREATING ) {
+ LEI(e)->lei_state = CACHE_ENTRY_READY;
+
+ /* free cache mutex */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+
Debug( LDAP_DEBUG_TRACE,
"====> cache_return_entry_%s( %ld ): created (%d)\n",
- rw ? "w" : "r", e->e_id, LEI(e)->lei_refcnt );
-
- LEI(e)->lei_state = CACHE_ENTRY_READY;
+ rw ? "w" : "r", id, refcnt );
} else if ( LEI(e)->lei_state == CACHE_ENTRY_DELETED ) {
- if( LEI(e)->lei_refcnt > 0 ) {
+ if( refcnt > 0 ) {
+ /* free cache mutex */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+
Debug( LDAP_DEBUG_TRACE,
"====> cache_return_entry_%s( %ld ): delete pending (%d)\n",
- rw ? "w" : "r", e->e_id, LEI(e)->lei_refcnt );
+ rw ? "w" : "r", id, refcnt );
} else {
- Debug( LDAP_DEBUG_TRACE,
- "====> cache_return_entry_%s( %ld ): deleted (%d)\n",
- rw ? "w" : "r", e->e_id, LEI(e)->lei_refcnt );
-
cache_entry_private_destroy( e );
entry_free( e );
+
+ /* free cache mutex */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+
+ Debug( LDAP_DEBUG_TRACE,
+ "====> cache_return_entry_%s( %ld ): deleted (%d)\n",
+ rw ? "w" : "r", id, refcnt );
}
} else {
+ /* free cache mutex */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+
Debug( LDAP_DEBUG_TRACE,
"====> cache_return_entry_%s( %ld ): returned (%d)\n",
- rw ? "w" : "r", e->e_id, LEI(e)->lei_refcnt);
+ rw ? "w" : "r", id, refcnt);
}
-
-
- /* free cache mutex */
- ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
}
-#define LRU_DELETE( cache, e ) { \
+#define LRU_DELETE( cache, e ) do { \
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; \
} \
-}
+} while(0)
-#define LRU_ADD( cache, e ) { \
- LEI(e)->lei_lrunext = cache->c_lruhead; \
+#define LRU_ADD( cache, e ) do { \
+ 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); \
} \
-}
+} while(0)
/*
* cache_add_entry_rw - create and lock an entry in the cache
/* set cache 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,
"====> 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,
(AVL_CMP) entry_dn_cmp, avl_dup_error ) != 0 )
{
+ /* free cache mutex */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+
Debug( LDAP_DEBUG_TRACE,
"====> cache_add_entry( %ld ): \"%s\": already in dn cache\n",
e->e_id, e->e_dn, 0 );
cache_entry_private_destroy(e);
- /* free cache mutex */
- ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
return( 1 );
}
/* set cache 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,
(AVL_CMP) entry_dn_cmp, avl_dup_error ) != 0 )
char *dn
)
{
- struct ldbminfo *li = (struct ldbminfo *) be->be_private;
Entry e, *ep;
ID id;
-
- /* set cache mutex */
- ldap_pvt_thread_mutex_lock( &cache->c_mutex );
+ int count = 0;
e.e_dn = dn;
e.e_ndn = dn_normalize_case( ch_strdup( dn ) );
+try_again:
+ /* set cache mutex */
+ ldap_pvt_thread_mutex_lock( &cache->c_mutex );
+
if ( (ep = (Entry *) avl_find( cache->c_dntree, (caddr_t) &e,
(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
- Debug(LDAP_DEBUG_TRACE,
- "====> cache_find_entry_dn2id(\"%s\"): %ld (not ready) %d\n",
- dn, ep->e_id, LEI(ep)->lei_state);
+ if ( state != CACHE_ENTRY_READY ) {
+ assert(state != CACHE_ENTRY_UNDEFINED);
/* free cache mutex */
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
- return( NOID );
- }
- Debug(LDAP_DEBUG_TRACE,
- "====> cache_find_entry_dn2id(\"%s\"): %ld\n",
- dn, ep->e_id, 0);
+ Debug(LDAP_DEBUG_TRACE,
+ "====> cache_find_entry_dn2id(\"%s\"): %ld (not ready) %d\n",
+ dn, id, state);
+
+ ldap_pvt_thread_yield();
+ goto try_again;
+ }
/* 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,
+ "====> cache_find_entry_dn2id(\"%s\"): %ld (%d tries)\n",
+ dn, id, count);
+ } else {
/* free cache mutex */
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
- return( id );
+ id = NOID;
}
free(e.e_ndn);
- /* free cache mutex */
- ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
-
- return( NOID );
+ return( id );
}
/*
{
Entry e;
Entry *ep;
+ int count = 0;
e.e_id = id;
if ( (ep = (Entry *) avl_find( cache->c_idtree, (caddr_t) &e,
(AVL_CMP) entry_id_cmp )) != NULL )
{
-#ifdef LDAP_DEBUG
+ int state;
+ ID ep_id;
+
+ count++;
+
assert( ep->e_private );
-#endif
+
+ ep_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
- Debug(LDAP_DEBUG_TRACE,
- "====> cache_find_entry_id( %ld ): %ld (not ready) %d\n",
- id, ep->e_id, LEI(ep)->lei_state);
+ if ( state != CACHE_ENTRY_READY ) {
+
+ assert(state != CACHE_ENTRY_UNDEFINED);
/* free cache mutex */
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
- return( NULL );
- }
- Debug(LDAP_DEBUG_TRACE,
- "====> cache_find_entry_id( %ld, %s ) \"%s\" (found)\n",
- id, rw ? "w" : "r", ep->e_dn);
+ Debug(LDAP_DEBUG_TRACE,
+ "====> cache_find_entry_id( %ld ): %ld (not ready) %d\n",
+ id, ep_id, state);
+
+ ldap_pvt_thread_yield();
+ goto try_again;
+ }
/* acquire reader lock */
if ( cache_entry_rdwr_trylock(ep, rw) == LDAP_PVT_THREAD_EBUSY ) {
/* free cache mutex */
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+
+ Debug(LDAP_DEBUG_TRACE,
+ "====> cache_find_entry_id( %ld ): %ld (busy) %d\n",
+ id, ep_id, state);
+
ldap_pvt_thread_yield();
goto try_again;
}
/* free cache mutex */
ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+ Debug(LDAP_DEBUG_TRACE,
+ "====> cache_find_entry_id( %ld ) \"%s\" (found) (%d tries)\n",
+ ep_id, ep->e_dn, count);
+
return( ep );
}
/* set cache mutex */
ldap_pvt_thread_mutex_lock( &cache->c_mutex );
-#ifdef LDAP_DEBUG
assert( e->e_private );
-#endif
Debug( LDAP_DEBUG_TRACE, "====> cache_delete_entry( %ld )\n",
e->e_id, 0, 0 );
return( 0 );
}
+#ifdef SLAP_CLEANUP
+
+void
+cache_release_all( struct cache *cache )
+{
+ Entry *e;
+ int rc;
+
+ /* set cache mutex */
+ ldap_pvt_thread_mutex_lock( &cache->c_mutex );
+
+ Debug( LDAP_DEBUG_TRACE, "====> cache_release_all\n", 0, 0, 0 );
+
+ while ( (e = cache->c_lrutail) != NULL && LEI(e)->lei_refcnt == 0 ) {
+ assert(!ldap_pvt_thread_rdwr_active(&LEI(e)->lei_rdwr));
+
+ /* delete from cache and lru q */
+ /* XXX do we need rc ? */
+ rc = cache_delete_entry_internal( cache, e );
+ cache_entry_private_destroy( e );
+ entry_free( e );
+ }
+
+ if ( cache->c_cursize ) {
+ Debug( LDAP_DEBUG_TRACE, "Entry-cache could not be emptied\n", 0, 0, 0 );
+ }
+
+ /* free cache mutex */
+ ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
+}
+
+#endif /* SLAP_CLEANUP */
+
#ifdef LDAP_DEBUG
static void
projects / openldap / blobdiff