X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fcache.c;h=4a26488a4e8bf3831a7ab06e4f6808fb1458f110;hb=b95ab4ac648f3e0e8ea53e384634d0668e9a2411;hp=c1875562f60b3e4d1a951b68ba92e66f25c8c537;hpb=7a0b0b2bbf7777cf009ab746654d67ea0abef6ee;p=openldap diff --git a/servers/slapd/back-ldbm/cache.c b/servers/slapd/back-ldbm/cache.c index c1875562f6..4a26488a4e 100644 --- a/servers/slapd/back-ldbm/cache.c +++ b/servers/slapd/back-ldbm/cache.c @@ -1,7 +1,7 @@ /* cache.c - routines to maintain an in-core cache of entries */ /* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -19,23 +19,22 @@ /* LDBM backend specific entry info -- visible only to the cache */ typedef 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. + * be hidden. Backend cache lock required to access. */ int lei_state; /* for the cache */ #define CACHE_ENTRY_UNDEFINED 0 #define CACHE_ENTRY_CREATING 1 -#define CACHE_ENTRY_READY 2 -#define CACHE_ENTRY_DELETED 3 - +#define CACHE_ENTRY_READY 2 +#define CACHE_ENTRY_DELETED 3 +#define CACHE_ENTRY_COMMITTED 4 + int lei_refcnt; /* # threads ref'ing this entry */ Entry *lei_lrunext; /* for cache lru list */ Entry *lei_lruprev; } EntryInfo; +#undef LEI #define LEI(e) ((EntryInfo *) ((e)->e_private)) static int cache_delete_entry_internal(Cache *cache, Entry *e); @@ -43,54 +42,6 @@ static int cache_delete_entry_internal(Cache *cache, Entry *e); static void lru_print(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 ) { @@ -103,22 +54,31 @@ cache_entry_private_init( Entry*e ) e->e_private = ch_calloc(1, sizeof(struct ldbm_entry_info)); - if( cache_entry_rdwr_init( e ) != 0 ) { - free( LEI(e) ); - e->e_private = NULL; - return 1; - } - return 0; } +/* + * marks an entry in CREATING state as committed, so it is really returned + * to the cache. Otherwise an entry in CREATING state is removed. + * Makes e_private be destroyed at the following cache_return_entry_w, + * but lets the entry untouched (owned by someone else) + */ +void +cache_entry_commit( Entry *e ) +{ + assert( e ); + assert( e->e_private ); + assert( LEI(e)->lei_state == CACHE_ENTRY_CREATING ); + /* assert( LEI(e)->lei_refcnt == 1 ); */ + + LEI(e)->lei_state = CACHE_ENTRY_COMMITTED; +} + static int cache_entry_private_destroy( Entry*e ) { assert( e->e_private ); - cache_entry_rdwr_destroy( e ); - free( e->e_private ); e->e_private = NULL; return 0; @@ -128,56 +88,90 @@ void cache_return_entry_rw( Cache *cache, Entry *e, int rw ) { ID id; - int refcnt; + int refcnt, freeit = 1; /* set cache mutex */ ldap_pvt_thread_mutex_lock( &cache->c_mutex ); assert( e->e_private ); - cache_entry_rdwr_unlock(e, rw); - id = e->e_id; refcnt = --LEI(e)->lei_refcnt; - if ( LEI(e)->lei_state == CACHE_ENTRY_CREATING ) { + /* + * if the entry is returned when in CREATING state, it is deleted + * but not freed because it may belong to someone else (do_add, + * for instance) + */ + if ( LEI(e)->lei_state == CACHE_ENTRY_CREATING ) { + cache_delete_entry_internal( cache, e ); + freeit = 0; + /* now the entry is in DELETED state */ + } + + if ( LEI(e)->lei_state == CACHE_ENTRY_COMMITTED ) { LEI(e)->lei_state = CACHE_ENTRY_READY; /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, DETAIL1, + "cache_return_entry_rw: return (%ld):%s, refcnt=%d\n", + id, rw ? "w" : "r", refcnt ); +#else Debug( LDAP_DEBUG_TRACE, "====> cache_return_entry_%s( %ld ): created (%d)\n", rw ? "w" : "r", id, refcnt ); +#endif } else if ( LEI(e)->lei_state == CACHE_ENTRY_DELETED ) { if( refcnt > 0 ) { /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, DETAIL1, + "cache_return_entry_rw: %ld, delete pending (%d).\n", + id, refcnt, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "====> cache_return_entry_%s( %ld ): delete pending (%d)\n", rw ? "w" : "r", id, refcnt ); +#endif } else { cache_entry_private_destroy( e ); - entry_free( e ); + if ( freeit ) { + entry_free( e ); + } /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, DETAIL1, + "cache_return_entry_rw: (%ld): deleted (%d)\n", id, refcnt, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "====> cache_return_entry_%s( %ld ): deleted (%d)\n", rw ? "w" : "r", id, refcnt ); +#endif } } else { /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, DETAIL1, + "cache_return_entry_rw: ID %ld:%s returned (%d)\n", + id, rw ? "w": "r", refcnt ); +#else Debug( LDAP_DEBUG_TRACE, "====> cache_return_entry_%s( %ld ): returned (%d)\n", rw ? "w" : "r", id, refcnt); +#endif } } @@ -222,6 +216,11 @@ cache_add_entry_rw( int i, rc; Entry *ee; +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, ENTRY, + "cache_add_entry_rw: add (%s):%s to cache\n", + e->e_dn, rw ? "w" : "r", 0 ); +#endif /* set cache mutex */ ldap_pvt_thread_mutex_lock( &cache->c_mutex ); @@ -231,9 +230,15 @@ cache_add_entry_rw( /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, ERR, + "cache_add_entry_rw: add (%s):%ld private init failed!\n", + e->e_dn, e->e_id, 0 ); +#else Debug( LDAP_DEBUG_ANY, "====> cache_add_entry( %ld ): \"%s\": private init failed!\n", e->e_id, e->e_dn, 0 ); +#endif return( -1 ); } @@ -244,9 +249,15 @@ cache_add_entry_rw( /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, DETAIL1, + "cache_add_entry: (%s):%ld already in cache.\n", + e->e_dn, e->e_id, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "====> cache_add_entry( %ld ): \"%s\": already in dn cache\n", e->e_id, e->e_dn, 0 ); +#endif cache_entry_private_destroy(e); @@ -257,17 +268,28 @@ cache_add_entry_rw( if ( avl_insert( &cache->c_idtree, (caddr_t) e, (AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, DETAIL1, + "cache_add_entry: (%s):%ls already in cache.\n", + e->e_dn, e->e_id, 0 ); +#else Debug( LDAP_DEBUG_ANY, "====> cache_add_entry( %ld ): \"%s\": already in id cache\n", e->e_id, e->e_dn, 0 ); - +#endif /* delete from dn tree inserted above */ if ( avl_delete( &cache->c_dntree, (caddr_t) e, (AVL_CMP) entry_dn_cmp ) == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, INFO, + "cache_add_entry: can't delete (%s) from cache.\n", + e->e_dn, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n", 0, 0, 0 ); +#endif } cache_entry_private_destroy(e); @@ -277,8 +299,6 @@ cache_add_entry_rw( return( -1 ); } - 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; @@ -350,9 +370,15 @@ cache_update_entry( if ( avl_insert( &cache->c_dntree, (caddr_t) e, (AVL_CMP) entry_dn_cmp, avl_dup_error ) != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, DETAIL1, + "cache_update_entry: (%s):%ld already in dn cache\n", + e->e_dn, e->e_id, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "====> cache_update_entry( %ld ): \"%s\": already in dn cache\n", e->e_id, e->e_dn, 0 ); +#endif /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); @@ -363,16 +389,28 @@ cache_update_entry( if ( avl_insert( &cache->c_idtree, (caddr_t) e, (AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, DETAIL1, + "cache_update_entry: (%s)%ld already in id cache\n", + e->e_dn, e->e_id, 0 ); +#else Debug( LDAP_DEBUG_ANY, "====> cache_update_entry( %ld ): \"%s\": already in id cache\n", e->e_id, e->e_dn, 0 ); +#endif /* delete from dn tree inserted above */ if ( avl_delete( &cache->c_dntree, (caddr_t) e, (AVL_CMP) entry_dn_cmp ) == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, INFO, + "cache_update_entry: can't delete (%s)%ld from dn cache.\n", + e->e_dn, e->e_id, 0 ); +#else Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n", 0, 0, 0 ); +#endif } /* free cache mutex */ @@ -380,7 +418,6 @@ cache_update_entry( return( -1 ); } - /* put the entry into 'CREATING' state */ /* will be marked after when entry is returned */ LEI(e)->lei_state = CACHE_ENTRY_CREATING; @@ -428,24 +465,19 @@ cache_update_entry( return( 0 ); } -/* - * cache_find_entry_dn2id - find an entry in the cache, given dn - */ - ID -cache_find_entry_dn2id( +cache_find_entry_ndn2id( Backend *be, Cache *cache, - const char *dn + struct berval *ndn ) { Entry e, *ep; ID id; int count = 0; - e.e_dn = (char *) dn; - e.e_ndn = ch_strdup( dn ); - (void) dn_normalize( e.e_ndn ); + /* this function is always called with normalized DN */ + e.e_nname = *ndn; try_again: /* set cache mutex */ @@ -462,7 +494,6 @@ try_again: * we do not need to lock the entry if we only * check the state, refcnt, LRU, and id. */ - assert( ep->e_private ); /* save id */ @@ -478,9 +509,15 @@ try_again: /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, INFO, + "cache_find_entry_dn2id: (%s) %ld not ready: %d\n", + ndn->bv_val, id, state ); +#else Debug(LDAP_DEBUG_TRACE, "====> cache_find_entry_dn2id(\"%s\"): %ld (not ready) %d\n", - dn, id, state); + ndn->bv_val, id, state); +#endif ldap_pvt_thread_yield(); goto try_again; @@ -489,23 +526,26 @@ try_again: /* lru */ LRU_DELETE( cache, ep ); LRU_ADD( cache, ep ); - + /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, DETAIL1, + "cache_find_entry_dn2id: (%s): %ld %d tries\n", + ndn->bv_val, id, count ); +#else Debug(LDAP_DEBUG_TRACE, "====> cache_find_entry_dn2id(\"%s\"): %ld (%d tries)\n", - dn, id, count); + ndn->bv_val, id, count); +#endif } else { /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); - id = NOID; } - free(e.e_ndn); - return( id ); } @@ -547,33 +587,21 @@ try_again: * entry is deleted or not fully created yet */ if ( state != CACHE_ENTRY_READY ) { - assert(state != CACHE_ENTRY_UNDEFINED); /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, INFO, + "cache_find_entry_id: (%ld)->%ld not ready (%d).\n", + id, ep_id, state ); + +#else 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 ) { - /* could not acquire entry lock... - * owner cannot free as we have the cache locked. - * so, unlock the cache, yield, and try again. - */ - - /* 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); +#endif ldap_pvt_thread_yield(); goto try_again; @@ -582,15 +610,21 @@ try_again: /* lru */ LRU_DELETE( cache, ep ); LRU_ADD( cache, ep ); - + LEI(ep)->lei_refcnt++; /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, DETAIL1, + "cache_find_entry_id: %ld -> %s found %d tries.\n", + ep_id, ep->e_dn, count ); +#else Debug(LDAP_DEBUG_TRACE, "====> cache_find_entry_id( %ld ) \"%s\" (found) (%d tries)\n", ep_id, ep->e_dn, count); +#endif return( ep ); } @@ -625,8 +659,13 @@ cache_delete_entry( assert( e->e_private ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, ENTRY, + "cache_delete_entry: delete %ld.\n", e->e_id, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "====> cache_delete_entry( %ld )\n", e->e_id, 0, 0 ); +#endif rc = cache_delete_entry_internal( cache, e ); @@ -641,7 +680,7 @@ cache_delete_entry_internal( Entry *e ) { - int rc = 0; /* return code */ + int rc = 0; /* return code */ /* dn tree */ if ( avl_delete( &cache->c_dntree, (caddr_t) e, (AVL_CMP) entry_dn_cmp ) @@ -682,11 +721,14 @@ cache_release_all( Cache *cache ) /* set cache mutex */ ldap_pvt_thread_mutex_lock( &cache->c_mutex ); +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, ENTRY, "cache_release_all: enter\n" , 0, 0, 0); +#else Debug( LDAP_DEBUG_TRACE, "====> cache_release_all\n", 0, 0, 0 ); +#endif - while ( (e = cache->c_lrutail) != NULL && LEI(e)->lei_refcnt == 0 ) { - assert(!ldap_pvt_thread_rdwr_active(&LEI(e)->lei_rdwr)); + while ( (e = cache->c_lrutail) != NULL && LEI(e)->lei_refcnt == 0 ) { /* delete from cache and lru q */ /* XXX do we need rc ? */ rc = cache_delete_entry_internal( cache, e ); @@ -695,7 +737,12 @@ cache_release_all( Cache *cache ) } if ( cache->c_cursize ) { +#ifdef NEW_LOGGING + LDAP_LOG( CACHE, INFO, + "cache_release_all: Entry cache could not be emptied.\n", 0, 0, 0); +#else Debug( LDAP_DEBUG_TRACE, "Entry-cache could not be emptied\n", 0, 0, 0 ); +#endif } /* free cache mutex */ @@ -703,7 +750,6 @@ cache_release_all( Cache *cache ) } #ifdef LDAP_DEBUG - static void lru_print( Cache *cache ) { @@ -720,6 +766,4 @@ lru_print( Cache *cache ) e->e_dn, e->e_id, LEI(e)->lei_refcnt ); } } - #endif -