Experimental code that uses one locker ID per thread. Seems to work OK,

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 5d222c5af0a81a920c87ad5f7610e94770339e58..6e7cb7e443f8dfb347f8074eae08d96cf7ee60ce 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -50,8 +50,7 @@ do_add( Connection *conn, Operation *op )
        int     manageDSAit;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                  "do_add: conn %d enter\n", conn->c_connid ));
+       LDAP_LOG( OPERATION, ENTRY, "do_add: conn %d enter\n", conn->c_connid,0,0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
 #endif
@@ -70,8 +69,8 @@ do_add( Connection *conn, Operation *op )
        /* get the name */
        if ( ber_scanf( ber, "{m", /*}*/ &dn ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_add: conn %d ber_scanf failed\n", conn->c_connid ));
+               LDAP_LOG( OPERATION, ERR, 
+                       "do_add: conn %d ber_scanf failed\n", conn->c_connid,0,0 );
 #else
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -86,9 +85,8 @@ do_add( Connection *conn, Operation *op )
 
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_add: conn %d invalid dn (%s)\n", conn->c_connid,
-                               dn.bv_val ));
+               LDAP_LOG( OPERATION, ERR, 
+                       "do_add: conn %d invalid dn (%s)\n", conn->c_connid, dn.bv_val, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn.bv_val, 0, 0 );
 #endif
@@ -98,8 +96,8 @@ do_add( Connection *conn, Operation *op )
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-               "do_add: conn %d  dn (%s)\n", conn->c_connid, e->e_dn ));
+       LDAP_LOG( OPERATION, ARGS, 
+               "do_add: conn %d  dn (%s)\n", conn->c_connid, e->e_dn, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS, "do_add: dn (%s)\n", e->e_dn, 0, 0 );
 #endif
@@ -115,8 +113,8 @@ do_add( Connection *conn, Operation *op )
 
                if ( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                                  "do_add: conn %d      decoding error \n", conn->c_connid ));
+                       LDAP_LOG( OPERATION, ERR, 
+                                  "do_add: conn %d      decoding error \n", conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
 #endif
@@ -128,16 +126,15 @@ do_add( Connection *conn, Operation *op )
 
                if ( tmp.sml_bvalues == NULL ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                       LDAP_LOG( OPERATION, INFO, 
                                "do_add: conn %d         no values for type %s\n",
-                               conn->c_connid, tmp.sml_type.bv_val ));
+                               conn->c_connid, tmp.sml_type.bv_val, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
                                tmp.sml_type.bv_val, 0, 0 );
 #endif
                        send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
                                NULL, "no values for attribute type", NULL, NULL );
-                       free( tmp.sml_type.bv_val );
                        goto done;
                }
                mod  = (Modifications *) ch_malloc( sizeof(Modifications) );
@@ -154,8 +151,8 @@ do_add( Connection *conn, Operation *op )
 
        if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_add: conn %d ber_scanf failed\n", conn->c_connid ));
+               LDAP_LOG( OPERATION, ERR, 
+                       "do_add: conn %d ber_scanf failed\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -167,8 +164,8 @@ do_add( Connection *conn, Operation *op )
 
        if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "do_add: conn %d get_ctrls failed\n", conn->c_connid ));
+               LDAP_LOG( OPERATION, INFO, 
+                       "do_add: conn %d get_ctrls failed\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
 #endif
@@ -181,7 +178,7 @@ do_add( Connection *conn, Operation *op )
                goto done;
        }
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d ADD dn=\"%s\"\n",
+       Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu ADD dn=\"%s\"\n",
            op->o_connid, op->o_opid, e->e_dn, 0, 0 );
 
        if( e->e_nname.bv_len == 0 ) {
@@ -192,7 +189,7 @@ do_add( Connection *conn, Operation *op )
                goto done;
 
 #if defined( SLAPD_SCHEMA_DN )
-       } else if ( strcasecmp( e->e_ndn, SLAPD_SCHEMA_DN ) == 0 ) {
+       } else if ( bvmatch( &e->e_nname, &global_schemandn ) ) {
                send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
                        NULL, "subschema subentry already exists",
                        NULL, NULL );
@@ -259,7 +256,7 @@ do_add( Connection *conn, Operation *op )
                                goto done;
                        }
 
-                       if ( SLAP_LASTMOD(be) && !repl_user ) {
+                       if ( !repl_user ) {
                                for( modtail = &modlist;
                                        *modtail != NULL;
                                        modtail = &(*modtail)->sml_next )
@@ -267,7 +264,7 @@ do_add( Connection *conn, Operation *op )
                                        assert( (*modtail)->sml_op == LDAP_MOD_ADD );
                                        assert( (*modtail)->sml_desc != NULL );
                                }
-                               rc = slap_mods_opattrs( op, modlist, modtail, &text,
+                               rc = slap_mods_opattrs( be, op, modlist, modtail, &text,
                                        textbuf, textlen );
                                if( rc != LDAP_SUCCESS ) {
                                        send_ldap_result( conn, op, rc,
@@ -310,8 +307,8 @@ do_add( Connection *conn, Operation *op )
                }
        } else {
 #ifdef NEW_LOGGING
-           LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                      "do_add: conn %d  no backend support\n", conn->c_connid ));
+           LDAP_LOG( OPERATION, INFO, 
+                      "do_add: conn %d  no backend support\n", conn->c_connid, 0, 0 );
 #else
            Debug( LDAP_DEBUG_ARGS, "    do_add: no backend support\n", 0, 0, 0 );
 #endif