ITS#4310 seems to affect also back-ldbm

[openldap] / servers / slapd / back-ldbm / cache.c

diff --git a/servers/slapd/back-ldbm/cache.c b/servers/slapd/back-ldbm/cache.c
index 6e649d56a9d0ff27e525d63669c5933cee28a58d..0ebd320184bdc037025bcaf983986765517cdd78 100644 (file)
--- a/servers/slapd/back-ldbm/cache.c
+++ b/servers/slapd/back-ldbm/cache.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,8 +48,10 @@ typedef struct ldbm_entry_info {
 
 static int     cache_delete_entry_internal(Cache *cache, Entry *e);
 #ifdef LDAP_DEBUG
+#ifdef SLAPD_UNUSED
 static void    lru_print(Cache *cache);
 #endif
+#endif
 
 static int
 cache_entry_private_init( Entry*e )
@@ -75,8 +77,8 @@ cache_entry_private_init( Entry*e )
 void
 cache_entry_commit( Entry *e )
 {
-       assert( e );
-       assert( e->e_private );
+       assert( e != NULL );
+       assert( e->e_private != NULL );
        assert( LEI(e)->lei_state == CACHE_ENTRY_CREATING );
        /* assert( LEI(e)->lei_refcnt == 1 ); */
 
@@ -86,7 +88,7 @@ cache_entry_commit( Entry *e )
 static int
 cache_entry_private_destroy( Entry*e )
 {
-       assert( e->e_private );
+       assert( e->e_private != NULL );
 
        free( e->e_private );
        e->e_private = NULL;
@@ -99,10 +101,14 @@ cache_return_entry_rw( Cache *cache, Entry *e, int rw )
        ID id;
        int refcnt, freeit = 1;
 
+       if ( slapMode != SLAP_SERVER_MODE ) {
+               return;
+       }
+
        /* set cache mutex */
        ldap_pvt_thread_mutex_lock( &cache->c_mutex );
 
-       assert( e->e_private );
+       assert( e->e_private != NULL );
 
        id = e->e_id;
        refcnt = --LEI(e)->lei_refcnt;
@@ -124,30 +130,18 @@ cache_return_entry_rw( Cache *cache, Entry *e, int rw )
                /* 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 );
@@ -158,29 +152,18 @@ cache_return_entry_rw( Cache *cache, Entry *e, int rw )
                        /* 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
        }
 }
 
@@ -225,11 +208,6 @@ 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 );
 
@@ -239,15 +217,9 @@ 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 );
        }
@@ -258,15 +230,9 @@ 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);
 
@@ -277,28 +243,16 @@ cache_add_entry_rw(
        if ( avl_insert( &cache->c_idtree, (caddr_t) e,
                         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,
                                 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);
@@ -374,20 +328,14 @@ cache_update_entry(
        /* set cache mutex */
        ldap_pvt_thread_mutex_lock( &cache->c_mutex );
 
-       assert( e->e_private );
+       assert( e->e_private != NULL );
 
        if ( avl_insert( &cache->c_dntree, (caddr_t) e,
                         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 );
@@ -398,28 +346,16 @@ cache_update_entry(
        if ( avl_insert( &cache->c_idtree, (caddr_t) e,
                         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,
                                 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 */
@@ -503,7 +439,7 @@ try_again:
                 * we do not need to lock the entry if we only
                 * check the state, refcnt, LRU, and id.
                 */
-               assert( ep->e_private );
+               assert( ep->e_private != NULL );
 
                /* save id */
                id = ep->e_id;
@@ -518,15 +454,9 @@ try_again:
                        /* free cache mutex */
                        ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
 
-#ifdef NEW_LOGGING
-                       LDAP_LOG( CACHE, INFO, 
-                                  "cache_find_entry_ndn2id: (%s) %ld not ready: %d\n",
-                                  ndn->bv_val, id, state );
-#else
                        Debug(LDAP_DEBUG_TRACE,
                                "====> cache_find_entry_ndn2id(\"%s\"): %ld (not ready) %d\n",
                                ndn->bv_val, id, state);
-#endif
 
                        ldap_pvt_thread_yield();
                        goto try_again;
@@ -539,15 +469,9 @@ try_again:
                /* free cache mutex */
                ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
 
-#ifdef NEW_LOGGING
-               LDAP_LOG( CACHE, DETAIL1, 
-                          "cache_find_entry_ndn2id: (%s): %ld %d tries\n",
-                          ndn->bv_val, id, count );
-#else
                Debug(LDAP_DEBUG_TRACE,
                        "====> cache_find_entry_ndn2id(\"%s\"): %ld (%d tries)\n",
                        ndn->bv_val, id, count);
-#endif
 
        } else {
                /* free cache mutex */
@@ -587,7 +511,7 @@ try_again:
 
                count++;
 
-               assert( ep->e_private );
+               assert( ep->e_private != NULL );
 
                ep_id = ep->e_id; 
                state = LEI(ep)->lei_state;
@@ -601,16 +525,9 @@ try_again:
                        /* 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);
-#endif
 
                        ldap_pvt_thread_yield();
                        goto try_again;
@@ -625,15 +542,9 @@ try_again:
                /* 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 );
        }
@@ -666,15 +577,10 @@ cache_delete_entry(
        /* set cache mutex */
        ldap_pvt_thread_mutex_lock( &cache->c_mutex );
 
-       assert( e->e_private );
+       assert( e->e_private != NULL );
 
-#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 );
 
@@ -728,11 +634,7 @@ 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 ) {
@@ -744,12 +646,7 @@ 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 */
@@ -757,6 +654,7 @@ cache_release_all( Cache *cache )
 }
 
 #ifdef LDAP_DEBUG
+#ifdef SLAPD_UNUSED
 static void
 lru_print( Cache *cache )
 {
@@ -774,3 +672,4 @@ lru_print( Cache *cache )
        }
 }
 #endif
+#endif