]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldbm/cache.c
Initial round of changes for 2.3 beta
[openldap] / servers / slapd / back-ldbm / cache.c
index 9453a26571c72268fc3993f5c22c12540a318be0..4cc80c455b022063da98150f0bff2f5e1063736a 100644 (file)
@@ -1,8 +1,17 @@
 /* cache.c - routines to maintain an in-core cache of entries */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
 
 /* 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
@@ -45,75 +51,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,12 +63,6 @@ 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;
 }
 
@@ -157,8 +88,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;
@@ -170,13 +99,15 @@ 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 );
 
-       cache_entry_rdwr_unlock(e, rw);
-
        id = e->e_id;
        refcnt = --LEI(e)->lei_refcnt;
 
@@ -197,32 +128,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", LDAP_LEVEL_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", LDAP_LEVEL_DETAIL1,
-                                  "cache_return_entry_rw: %ld, delete pending (%d).\n",
-                                  id, refcnt ));
-#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 );
@@ -233,32 +150,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", LDAP_LEVEL_DETAIL1,
-                                  "cache_return_entry_rw: (%ld): deleted (%d)\n",
-                                  id, refcnt ));
-#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", LDAP_LEVEL_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
-
        }
 }
 
@@ -303,11 +206,6 @@ cache_add_entry_rw(
        int     i, rc;
        Entry   *ee;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
-                  "cache_add_entry_rw: add (%s):%s to cache\n",
-                  e->e_dn, rw ? "w" : "r" ));
-#endif
        /* set cache mutex */
        ldap_pvt_thread_mutex_lock( &cache->c_mutex );
 
@@ -317,36 +215,22 @@ cache_add_entry_rw(
                /* free cache mutex */
                ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
 
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_ERR,
-                          "cache_add_entry_rw: add (%s):%ld private init failed!\n",
-                          e->e_dn, e->e_id ));
-#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 ));
-#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);
 
@@ -355,33 +239,18 @@ 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 ));
-#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 ));
-#else
                        Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n",
                            0, 0, 0 );
-#endif
-
                }
 
                cache_entry_private_destroy(e);
@@ -391,8 +260,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;
@@ -462,18 +329,11 @@ 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,
-                          "cache_update_entry: (%s):%ld already in dn cache\n",
-                          e->e_dn, e->e_id ));
-#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 );
@@ -482,32 +342,18 @@ 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,
-                          "cache_update_entry: (%s)%ld already in id cache\n",
-                          e->e_dn, e->e_id ));
-#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 ));
-#else
                        Debug( LDAP_DEBUG_ANY, "====> can't delete from dn cache\n",
                            0, 0, 0 );
-#endif
-
                }
 
                /* free cache mutex */
@@ -515,7 +361,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;
@@ -563,41 +408,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
-)
-{
-       int rc;
-       struct berval bv;
-       struct berval ndn;
-       ID id;
-
-       bv.bv_val = (char *)dn;
-       bv.bv_len = strlen( dn );
-
-       rc = dnNormalize2( NULL, &bv, &ndn );
-       if( rc != LDAP_SUCCESS ) {
-               return NOID;
-       }
-
-       id = cache_find_entry_ndn2id( be, cache, ndn.bv_val );
-
-       free( ndn.bv_val );
-       return ( id );
-}
-
 ID
 cache_find_entry_ndn2id(
        Backend         *be,
     Cache      *cache,
-    const char         *ndn
+    struct berval      *ndn
 )
 {
        Entry           e, *ep;
@@ -605,14 +420,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++;
@@ -622,7 +437,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 */
@@ -638,16 +452,9 @@ 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_dn2id: (%s) %ld not ready: %d\n",
-                                  ndn, id, state ));
-#else
                        Debug(LDAP_DEBUG_TRACE,
-                               "====> cache_find_entry_dn2id(\"%s\"): %ld (not ready) %d\n",
-                               ndn, id, state);
-#endif
-
+                               "====> cache_find_entry_ndn2id(\"%s\"): %ld (not ready) %d\n",
+                               ndn->bv_val, id, state);
 
                        ldap_pvt_thread_yield();
                        goto try_again;
@@ -660,21 +467,13 @@ try_again:
                /* free cache mutex */
                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",
-                          ndn, id, count ));
-#else
                Debug(LDAP_DEBUG_TRACE,
-                       "====> cache_find_entry_dn2id(\"%s\"): %ld (%d tries)\n",
-                       ndn, id, count);
-#endif
-
+                       "====> cache_find_entry_ndn2id(\"%s\"): %ld (%d tries)\n",
+                       ndn->bv_val, id, count);
 
        } else {
                /* free cache mutex */
                ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
-
                id = NOID;
        }
 
@@ -703,7 +502,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;
@@ -719,48 +518,14 @@ 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,
-                                  "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;
-               }
-
-               /* 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;
@@ -775,16 +540,9 @@ try_again:
                /* free cache mutex */
                ldap_pvt_thread_mutex_unlock( &cache->c_mutex );
 
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "cache", LDAP_LEVEL_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 );
        }
@@ -819,14 +577,8 @@ 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 ));
-#else
        Debug( LDAP_DEBUG_TRACE, "====> cache_delete_entry( %ld )\n",
                e->e_id, 0, 0 );
-#endif
-
 
        rc = cache_delete_entry_internal( cache, e );
 
@@ -844,15 +596,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;
        }
@@ -882,19 +632,10 @@ cache_release_all( Cache *cache )
        /* set cache mutex */
        ldap_pvt_thread_mutex_lock( &cache->c_mutex );
 
-#ifdef NEW_LOGGING
-       LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
-                  "cache_release_all: enter\n" ));
-#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 );
@@ -903,13 +644,7 @@ 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" ));
-#else
                Debug( LDAP_DEBUG_TRACE, "Entry-cache could not be emptied\n", 0, 0, 0 );
-#endif
-
        }
 
        /* free cache mutex */
@@ -917,7 +652,6 @@ cache_release_all( Cache *cache )
 }
 
 #ifdef LDAP_DEBUG
-
 static void
 lru_print( Cache *cache )
 {
@@ -934,6 +668,4 @@ lru_print( Cache *cache )
                        e->e_dn, e->e_id, LEI(e)->lei_refcnt );
        }
 }
-
 #endif
-