X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fcache.c;h=c6f9b237a72c6f2f36d598e32e5783c09276c500;hb=426ca14a868b6edb638b48e14593542a365fcc4b;hp=65c1e4fec24934c9c9f72bb87b266f931837cf88;hpb=aec4430d593d316c0a102cb132b8e46d8346eda0;p=openldap diff --git a/servers/slapd/back-ldbm/cache.c b/servers/slapd/back-ldbm/cache.c index 65c1e4fec2..c6f9b237a7 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-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -19,19 +19,16 @@ /* 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_DESTROY_PRIVATE 4 +#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 */ @@ -45,75 +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) -{ -#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 ); -} - static int cache_entry_private_init( Entry*e ) { @@ -126,27 +54,24 @@ 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; } /* - * assumes that the entry is write-locked;marks it i a manner that - * makes e_private be destroyed at the following cache_return_entry_w, + * 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_private_destroy_mark( Entry *e ) +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_DESTROY_PRIVATE; + LEI(e)->lei_state = CACHE_ENTRY_COMMITTED; } static int @@ -154,8 +79,6 @@ 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; @@ -165,57 +88,61 @@ 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", 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 - || LEI(e)->lei_state == CACHE_ENTRY_DESTROY_PRIVATE ) { + } 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 { - int state = LEI(e)->lei_state; - cache_entry_private_destroy( e ); - if ( state == CACHE_ENTRY_DELETED ) { + if ( freeit ) { entry_free( e ); } @@ -223,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 { @@ -239,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 - } } @@ -293,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 ); @@ -307,36 +231,34 @@ 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 ); } if ( avl_insert( &cache->c_dntree, (caddr_t) e, - (AVL_CMP) entry_dn_cmp, avl_dup_error ) != 0 ) + entry_dn_cmp, avl_dup_error ) != 0 ) { /* free cache mutex */ 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 ); @@ -344,33 +266,30 @@ cache_add_entry_rw( /* id tree */ if ( avl_insert( &cache->c_idtree, (caddr_t) e, - (AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 ) + 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", 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 ) + 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 ); #endif - } cache_entry_private_destroy(e); @@ -380,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; @@ -451,19 +368,18 @@ cache_update_entry( assert( e->e_private ); if ( avl_insert( &cache->c_dntree, (caddr_t) e, - (AVL_CMP) entry_dn_cmp, avl_dup_error ) != 0 ) + 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 ); @@ -471,32 +387,30 @@ cache_update_entry( /* id tree */ if ( avl_insert( &cache->c_idtree, (caddr_t) e, - (AVL_CMP) entry_id_cmp, avl_dup_error ) != 0 ) + 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 ) + 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 */ @@ -504,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; @@ -552,35 +465,11 @@ cache_update_entry( return( 0 ); } -/* - * cache_find_entry_dn2id - find an entry in the cache, given dn - */ - -ID -cache_find_entry_dn2id( - Backend *be, - Cache *cache, - const char *dn -) -{ - char *ndn; - ID id; - - ndn = ch_strdup( dn ); - (void) dn_normalize( ndn ); - - id = cache_find_entry_ndn2id( be, cache, ndn ); - - free( ndn ); - - return ( id ); -} - ID cache_find_entry_ndn2id( Backend *be, Cache *cache, - const char *ndn + struct berval *ndn ) { Entry e, *ep; @@ -588,14 +477,14 @@ cache_find_entry_ndn2id( int count = 0; /* this function is always called with normalized DN */ - e.e_ndn = (char *)ndn; + e.e_nname = *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, - (AVL_CMP) entry_dn_cmp )) != NULL ) + entry_dn_cmp )) != NULL ) { int state; count++; @@ -605,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 */ @@ -622,16 +510,15 @@ try_again: ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_INFO, - "cache_find_entry_dn2id: (%s)%ld not ready: %d\n", - dn, id, state )); + 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", - ndn, id, state); + ndn->bv_val, id, state); #endif - ldap_pvt_thread_yield(); goto try_again; } @@ -644,20 +531,18 @@ try_again: ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); #ifdef NEW_LOGGING - LDAP_LOG(( "cache", LDAP_LEVEL_DETAIL1, - "cache_find_entry_dn2id: (%s)%ld %d tries\n", - dn, id, count )); + 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", - ndn, id, count); + ndn->bv_val, id, count); #endif - } else { /* free cache mutex */ ldap_pvt_thread_mutex_unlock( &cache->c_mutex ); - id = NOID; } @@ -686,7 +571,7 @@ try_again: ldap_pvt_thread_mutex_lock( &cache->c_mutex ); if ( (ep = (Entry *) avl_find( cache->c_idtree, (caddr_t) &e, - (AVL_CMP) entry_id_cmp )) != NULL ) + entry_id_cmp )) != NULL ) { int state; ID ep_id; @@ -702,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(( "caceh", 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, @@ -719,32 +603,6 @@ try_again: id, ep_id, state); #endif - - 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 ); - -#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; } @@ -759,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 ); } @@ -803,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 */ @@ -827,15 +683,13 @@ cache_delete_entry_internal( int rc = 0; /* return code */ /* dn tree */ - if ( avl_delete( &cache->c_dntree, (caddr_t) e, (AVL_CMP) entry_dn_cmp ) - == NULL ) + if ( avl_delete( &cache->c_dntree, (caddr_t) e, entry_dn_cmp ) == NULL ) { rc = -1; } /* id tree */ - if ( avl_delete( &cache->c_idtree, (caddr_t) e, (AVL_CMP) entry_id_cmp ) - == NULL ) + if ( avl_delete( &cache->c_idtree, (caddr_t) e, entry_id_cmp ) == NULL ) { rc = -1; } @@ -866,18 +720,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 ); @@ -887,12 +736,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 */ @@ -900,7 +748,6 @@ cache_release_all( Cache *cache ) } #ifdef LDAP_DEBUG - static void lru_print( Cache *cache ) { @@ -917,6 +764,4 @@ lru_print( Cache *cache ) e->e_dn, e->e_id, LEI(e)->lei_refcnt ); } } - #endif -