X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fcache.c;h=4a26488a4e8bf3831a7ab06e4f6808fb1458f110;hb=b95ab4ac648f3e0e8ea53e384634d0668e9a2411;hp=b5aaaa2f3787b2ee7c37f676d7960bfc90014bf8;hpb=0eac91fcc7affeb68f2dcb5d3e08ed29d53c9e21;p=openldap diff --git a/servers/slapd/back-ldbm/cache.c b/servers/slapd/back-ldbm/cache.c index b5aaaa2f37..4a26488a4e 100644 --- a/servers/slapd/back-ldbm/cache.c +++ b/servers/slapd/back-ldbm/cache.c @@ -19,14 +19,9 @@ /* LDBM backend specific entry info -- visible only to the cache */ typedef struct ldbm_entry_info { -#ifdef LDBM_ENTRY_RWLOCK - ldap_pvt_thread_rdwr_t lei_rdwr; /* reader/writer lock */ -#endif - /* - * 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 @@ -47,77 +42,6 @@ static int cache_delete_entry_internal(Cache *cache, Entry *e); static void lru_print(Cache *cache); #endif -#ifdef LDBM_ENTRY_RWLOCK -static int -cache_entry_rdwr_lock(Entry *e, int rw) -{ -#ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY, - "cache_entry_rdwr_lock: %s lock on ID %ld\n", - rw ? "w" : "r", e->e_id )); -#else - Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%slock: ID: %ld\n", - rw ? "w" : "r", e->e_id, 0); -#endif - - - 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) -{ -#ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY, - "cache_entry_rdwr_trylock: try %s lock on ID: %ld.\n", - rw ? "w" : "r", e->e_id )); -#else - Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%strylock: ID: %ld\n", - rw ? "w" : "r", e->e_id, 0); -#endif - - - 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) -{ -#ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY, - "cache_entry_rdwr_unlock: remove %s lock on ID %ld.\n", - rw ? "w" : "r", e->e_id )); -#else - Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%sunlock: ID: %ld\n", - rw ? "w" : "r", e->e_id, 0); -#endif - - - 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 ); -} -#endif - static int cache_entry_private_init( Entry*e ) { @@ -130,14 +54,6 @@ cache_entry_private_init( Entry*e ) e->e_private = ch_calloc(1, sizeof(struct ldbm_entry_info)); -#ifdef LDBM_ENTRY_RWLOCK - if( cache_entry_rdwr_init( e ) != 0 ) { - free( LEI(e) ); - e->e_private = NULL; - return 1; - } -#endif - return 0; } @@ -163,10 +79,6 @@ cache_entry_private_destroy( Entry*e ) { assert( e->e_private ); -#ifdef LDBM_ENTRY_RWLOCK - cache_entry_rdwr_destroy( e ); -#endif - free( e->e_private ); e->e_private = NULL; return 0; @@ -183,10 +95,6 @@ cache_return_entry_rw( Cache *cache, Entry *e, int rw ) assert( e->e_private ); -#ifdef LDBM_ENTRY_RWLOCK - cache_entry_rdwr_unlock(e, rw); -#endif - id = e->e_id; refcnt = --LEI(e)->lei_refcnt; @@ -208,32 +116,30 @@ cache_return_entry_rw( Cache *cache, Entry *e, int rw ) ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1, + LDAP_LOG( CACHE, DETAIL1, "cache_return_entry_rw: return (%ld):%s, refcnt=%d\n", - id, rw ? "w" : "r", refcnt )); + 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", LDAP_LEVEL_DETAIL1, + LDAP_LOG( CACHE, DETAIL1, "cache_return_entry_rw: %ld, delete pending (%d).\n", - id, refcnt )); + 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 ); if ( freeit ) { @@ -244,15 +150,13 @@ cache_return_entry_rw( Cache *cache, Entry *e, int rw ) ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1, - "cache_return_entry_rw: (%ld): deleted (%d)\n", - id, refcnt )); + 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 { @@ -260,15 +164,14 @@ cache_return_entry_rw( Cache *cache, Entry *e, int rw ) ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1, + LDAP_LOG( CACHE, DETAIL1, "cache_return_entry_rw: ID %ld:%s returned (%d)\n", - id, rw ? "w": "r", refcnt )); + id, rw ? "w": "r", refcnt ); #else Debug( LDAP_DEBUG_TRACE, "====> cache_return_entry_%s( %ld ): returned (%d)\n", rw ? "w" : "r", id, refcnt); #endif - } } @@ -314,9 +217,9 @@ cache_add_entry_rw( Entry *ee; #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY, + LDAP_LOG( CACHE, ENTRY, "cache_add_entry_rw: add (%s):%s to cache\n", - e->e_dn, rw ? "w" : "r" )); + e->e_dn, rw ? "w" : "r", 0 ); #endif /* set cache mutex */ ldap_pvt_thread_mutex_lock( &cache->c_mutex ); @@ -328,16 +231,15 @@ cache_add_entry_rw( ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_ERR, + LDAP_LOG( CACHE, ERR, "cache_add_entry_rw: add (%s):%ld private init failed!\n", - e->e_dn, e->e_id )); + 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 ); } @@ -348,16 +250,15 @@ cache_add_entry_rw( ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1, - "cache_add_entry: (%s):%ld already in cache.\n", - e->e_dn, e->e_id )); + 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); return( 1 ); @@ -368,9 +269,9 @@ cache_add_entry_rw( (AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1, - "cache_add_entry: (%s):%ls already in cache.\n", - e->e_dn, e->e_id )); + 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", @@ -382,9 +283,9 @@ cache_add_entry_rw( (AVL_CMP) entry_dn_cmp ) == NULL ) { #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_INFO, - "cache_add_entry: can't delete (%s) from cache.\n", - e->e_dn )); + 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 ); @@ -398,10 +299,6 @@ cache_add_entry_rw( return( -1 ); } -#ifdef LDBM_ENTRY_RWLOCK - cache_entry_rdwr_lock( e, rw ); -#endif - /* put the entry into 'CREATING' state */ /* will be marked after when entry is returned */ LEI(e)->lei_state = CACHE_ENTRY_CREATING; @@ -474,16 +371,15 @@ cache_update_entry( (AVL_CMP) entry_dn_cmp, avl_dup_error ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1, + LDAP_LOG( CACHE, DETAIL1, "cache_update_entry: (%s):%ld already in dn cache\n", - e->e_dn, e->e_id )); + 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 ); return( 1 ); @@ -494,29 +390,27 @@ cache_update_entry( (AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1, + LDAP_LOG( CACHE, DETAIL1, "cache_update_entry: (%s)%ld already in id cache\n", - e->e_dn, e->e_id )); + 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", LDAP_LEVEL_INFO, - "cache_update_entry: can't delete (%s)%ld from dn cache.\n", - e->e_dn, e->e_id )); + 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 */ @@ -524,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; @@ -601,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 */ @@ -618,16 +510,15 @@ try_again: ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_INFO, + LDAP_LOG( CACHE, INFO, "cache_find_entry_dn2id: (%s) %ld not ready: %d\n", - ndn->bv_val, id, state )); + ndn->bv_val, id, state ); #else Debug(LDAP_DEBUG_TRACE, "====> cache_find_entry_dn2id(\"%s\"): %ld (not ready) %d\n", ndn->bv_val, id, state); #endif - ldap_pvt_thread_yield(); goto try_again; } @@ -640,20 +531,18 @@ try_again: ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1, + LDAP_LOG( CACHE, DETAIL1, "cache_find_entry_dn2id: (%s): %ld %d tries\n", - ndn->bv_val, id, count )); + ndn->bv_val, id, count ); #else Debug(LDAP_DEBUG_TRACE, "====> cache_find_entry_dn2id(\"%s\"): %ld (%d tries)\n", ndn->bv_val, id, count); #endif - } else { /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); - id = NOID; } @@ -698,16 +587,15 @@ 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", LDAP_LEVEL_INFO, + LDAP_LOG( CACHE, INFO, "cache_find_entry_id: (%ld)->%ld not ready (%d).\n", - id, ep_id, state )); + id, ep_id, state ); #else Debug(LDAP_DEBUG_TRACE, @@ -715,38 +603,10 @@ try_again: id, ep_id, state); #endif - ldap_pvt_thread_yield(); goto try_again; } -#ifdef LDBM_ENTRY_RWLOCK - /* 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 ); - -#ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_INFO, - "cache_find_entry_id: %ld -> %ld (busy) %d.\n", - id, ep_id, state )); -#else - 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; - } -#endif - /* lru */ LRU_DELETE( cache, ep ); LRU_ADD( cache, ep ); @@ -757,16 +617,15 @@ try_again: ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1, + LDAP_LOG( CACHE, DETAIL1, "cache_find_entry_id: %ld -> %s found %d tries.\n", - ep_id, ep->e_dn, count )); + 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 ); } @@ -801,14 +660,13 @@ cache_delete_entry( assert( e->e_private ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY, - "cache_delete_entry: delete %ld.\n", e->e_id )); + 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 ); /* free cache mutex */ @@ -864,18 +722,13 @@ cache_release_all( Cache *cache ) ldap_pvt_thread_mutex_lock( &cache->c_mutex ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY, - "cache_release_all: enter\n" )); + 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 ) { -#ifdef LDAP_RDWR_DEBUG - assert(!ldap_pvt_thread_rdwr_active(&LEI(e)->lei_rdwr)); -#endif - /* delete from cache and lru q */ /* XXX do we need rc ? */ rc = cache_delete_entry_internal( cache, e ); @@ -885,12 +738,11 @@ cache_release_all( Cache *cache ) if ( cache->c_cursize ) { #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_INFO, - "cache_release_all: Entry cache could not be emptied.\n" )); + 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 */ @@ -898,7 +750,6 @@ cache_release_all( Cache *cache ) } #ifdef LDAP_DEBUG - static void lru_print( Cache *cache ) { @@ -915,6 +766,4 @@ lru_print( Cache *cache ) e->e_dn, e->e_id, LEI(e)->lei_refcnt ); } } - #endif -