Add start of discussion of strings in LDAP/X.500 and OpenLDAP.

[openldap] / servers / slapd / back-bdb / attribute.c

diff --git a/servers/slapd/back-bdb/attribute.c b/servers/slapd/back-bdb/attribute.c
index 38203b994d3e245290427b0d29eb1e30a4962c8e..b41177b4e74fdb4750091ca0a8c567b27646af43 100644 (file)
--- a/servers/slapd/back-bdb/attribute.c
+++ b/servers/slapd/back-bdb/attribute.c
@@ -39,14 +39,16 @@ bdb_attribute(
        const char *entry_at_name = entry_at->ad_cname.bv_val;
        AccessControlState acl_state = ACL_STATE_INIT;
 
+       u_int32_t       locker;
+       DB_LOCK         lock;
+
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
-               "bdb_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val ));
-       LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
-               "bdb_attribute: at: \"%s\"\n", entry_at_name));
-       LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
-               "bdb_attribute: tr dn: \"%s\"\n",
-               target ? target->e_ndn : "" ));
+       LDAP_LOG( BACK_BDB, ARGS, 
+               "bdb_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val, 0, 0 );
+       LDAP_LOG( BACK_BDB, ARGS, 
+               "bdb_attribute: at: \"%s\"\n", entry_at_name, 0, 0);
+       LDAP_LOG( BACK_BDB, ARGS, "bdb_attribute: tr dn: \"%s\"\n",
+               target ? target->e_ndn : "", 0, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS,
                "=> bdb_attribute: gr dn: \"%s\"\n",
@@ -65,13 +67,17 @@ bdb_attribute(
                txn = boi->boi_txn;
        }
 
+       if ( txn != NULL )
+               locker = TXN_ID ( txn );
+       else
+               LOCK_ID ( bdb->bi_dbenv, &locker );
+
        if (target != NULL && dn_match(&target->e_nname, entry_ndn)) {
                /* we already have a LOCKED copy of the entry */
                e = target;
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                       "bdb_attribute: target is LOCKED (%s)\n",
-                       entry_ndn->bv_val ));
+               LDAP_LOG( BACK_BDB, DETAIL1, 
+                       "bdb_attribute: target is LOCKED (%s)\n", entry_ndn->bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ARGS,
                        "=> bdb_attribute: target is entry: \"%s\"\n",
@@ -80,35 +86,44 @@ bdb_attribute(
 
 
        } else {
+dn2entry_retry:
                /* can we find entry */
-               rc = bdb_dn2entry_r( be, NULL, entry_ndn, &e, NULL, 0 );
+               rc = bdb_dn2entry_r( be, NULL, entry_ndn, &e, NULL, 0, locker, &lock );
                switch( rc ) {
                case DB_NOTFOUND:
                case 0:
                        break;
+               case DB_LOCK_DEADLOCK:
+               case DB_LOCK_NOTGRANTED:
+                       goto dn2entry_retry;
                default:
                        if( txn != NULL ) {
                                boi->boi_err = rc;
                        }
+                       else {
+                               LOCK_ID_FREE( bdb->bi_dbenv, locker );
+                       }
                        return (rc != LDAP_BUSY) ? LDAP_OTHER : LDAP_BUSY;
                }
                if (e == NULL) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                               "bdb_attribute: cannot find entry (%s)\n",
-                               entry_ndn->bv_val ));
+                       LDAP_LOG( BACK_BDB, INFO, 
+                               "bdb_attribute: cannot find entry (%s)\n", 
+                               entry_ndn->bv_val, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ACL,
                                "=> bdb_attribute: cannot find entry: \"%s\"\n",
                                        entry_ndn->bv_val, 0, 0 ); 
 #endif
+                       if ( txn == NULL ) {
+                               LOCK_ID_FREE( bdb->bi_dbenv, locker );
+                       }
                        return LDAP_NO_SUCH_OBJECT; 
                }
                
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                       "bdb_attribute: found entry (%s)\n",
-                       entry_ndn->bv_val ));
+               LDAP_LOG( BACK_BDB, DETAIL1, "bdb_attribute: found entry (%s)\n",
+                       entry_ndn->bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "=> bdb_attribute: found entry: \"%s\"\n",
@@ -120,8 +135,8 @@ bdb_attribute(
        /* find attribute values */
        if( is_entry_alias( e ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "bdb_attribute: entry (%s) is an alias\n", e->e_dn ));
+               LDAP_LOG( BACK_BDB, INFO, 
+                       "bdb_attribute: entry (%s) is an alias\n", e->e_dn, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_attribute: entry is an alias\n", 0, 0, 0 );
@@ -133,8 +148,8 @@ bdb_attribute(
 
        if( is_entry_referral( e ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "bdb_attribute: entry (%s) is a referral.\n", e->e_dn ));
+               LDAP_LOG( BACK_BDB, INFO, 
+                       "bdb_attribute: entry (%s) is a referral.\n", e->e_dn, 0, 0);
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_attribute: entry is a referral\n", 0, 0, 0 );
@@ -153,8 +168,8 @@ bdb_attribute(
 
        if ((attr = attr_find(e->e_attrs, entry_at)) == NULL) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "bdb_attribute: failed to find %s.\n", entry_at_name ));
+               LDAP_LOG( BACK_BDB, INFO, 
+                       "bdb_attribute: failed to find %s.\n", entry_at_name, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_attribute: failed to find %s\n",
@@ -205,13 +220,15 @@ bdb_attribute(
 return_results:
        if( target != e ) {
                /* free entry */
-               bdb_cache_return_entry_r(&bdb->bi_cache, e);
+               bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
+       }
+
+       if ( txn == NULL ) {
+               LOCK_ID_FREE( bdb->bi_dbenv, locker );
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-               "bdb_attribute: rc=%d nvals=%d.\n",
-               rc, j ));
+       LDAP_LOG( BACK_BDB, ENTRY, "bdb_attribute: rc=%d nvals=%d.\n", rc, j, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE,
                "bdb_attribute: rc=%d nvals=%d\n",