Added overlay objects

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 1f87393182191f24f05599c87afd41d16eadf46b..c2efc492fd8dc75a0f76a1f7872098e3451c280a 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -381,11 +381,15 @@ send_ldap_response(
        {
                if ( rs->sr_rspoid != NULL ) {
                        rc = ber_printf( ber, "ts",
-                               LDAP_TAG_EXOP_RES_OID, rs->sr_rspoid );
+                               rs->sr_type == REP_EXTENDED
+                                       ? LDAP_TAG_EXOP_RES_OID : LDAP_TAG_IM_RES_OID,
+                               rs->sr_rspoid );
                }
                if( rc != -1 && rs->sr_rspdata != NULL ) {
                        rc = ber_printf( ber, "tO",
-                               LDAP_TAG_EXOP_RES_VALUE, rs->sr_rspdata );
+                               rs->sr_type == REP_EXTENDED
+                                       ? LDAP_TAG_EXOP_RES_VALUE : LDAP_TAG_IM_RES_VALUE,
+                               rs->sr_rspdata );
                }
        }
 
@@ -448,13 +452,8 @@ send_ldap_response(
 #endif /* LDAP_SLAPI */
 
        ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex );
-#ifdef HAVE_GMP
-       mpz_add_ui( slap_counters.sc_pdu, slap_counters.sc_pdu, 1 );
-       mpz_add_ui( slap_counters.sc_bytes, slap_counters.sc_bytes, bytes );
-#else /* ! HAVE_GMP */
-       slap_counters.sc_bytes += bytes;
-       slap_counters.sc_pdu++;
-#endif /* ! HAVE_GMP */
+       ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 );
+       ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes );
        ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex );
 
 cleanup:;
@@ -527,9 +526,9 @@ send_ldap_disconnect( Operation     *op, SlapReply *rs )
 
        if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
                Statslog( LDAP_DEBUG_STATS,
-                       "conn=%lu op=%lu DISCONNECT tag=%lu err=%d text=%s\n",
-                       op->o_connid, op->o_opid, rs->sr_tag, rs->sr_err,
-                       rs->sr_text ? rs->sr_text : "" );
+                       "%s DISCONNECT tag=%lu err=%d text=%s\n",
+                       op->o_log_prefix, rs->sr_tag, rs->sr_err,
+                       rs->sr_text ? rs->sr_text : "", 0 );
        }
 }
 
@@ -545,8 +544,8 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
        assert( !LDAP_API_ERROR( rs->sr_err ));
 
        Debug( LDAP_DEBUG_TRACE,
-               "send_ldap_result: conn=%lu op=%lu p=%d\n",
-               op->o_connid, op->o_opid, op->o_protocol );
+               "send_ldap_result: %s p=%d\n",
+               op->o_log_prefix, op->o_protocol, 0 );
 
        Debug( LDAP_DEBUG_ARGS,
                "send_ldap_result: err=%d matched=\"%s\" text=\"%s\"\n",
@@ -612,14 +611,14 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
                                rs->sr_err, rs->sr_nentries );
 
                        Statslog( LDAP_DEBUG_STATS,
-                       "conn=%lu op=%lu SEARCH RESULT tag=%lu err=%s text=%s\n",
-                               op->o_connid, op->o_opid, rs->sr_tag, nbuf,
-                               rs->sr_text ? rs->sr_text : "" );
+                       "%s SEARCH RESULT tag=%lu err=%s text=%s\n",
+                               op->o_log_prefix, rs->sr_tag, nbuf,
+                               rs->sr_text ? rs->sr_text : "", 0 );
                } else {
                        Statslog( LDAP_DEBUG_STATS,
-                               "conn=%lu op=%lu RESULT tag=%lu err=%d text=%s\n",
-                               op->o_connid, op->o_opid, rs->sr_tag, rs->sr_err,
-                               rs->sr_text ? rs->sr_text : "" );
+                               "%s RESULT tag=%lu err=%d text=%s\n",
+                               op->o_log_prefix, rs->sr_tag, rs->sr_err,
+                               rs->sr_text ? rs->sr_text : "", 0 );
                }
        }
 
@@ -1181,20 +1180,14 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                rs->sr_nentries++;
 
                ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex );
-#ifdef HAVE_GMP
-               mpz_add_ui( slap_counters.sc_bytes, slap_counters.sc_bytes, bytes );
-               mpz_add_ui( slap_counters.sc_entries, slap_counters.sc_entries, 1 );
-               mpz_add_ui( slap_counters.sc_pdu, slap_counters.sc_pdu, 1 );
-#else /* ! HAVE_GMP */
-               slap_counters.sc_bytes += bytes;
-               slap_counters.sc_entries++;
-               slap_counters.sc_pdu++;
-#endif /* ! HAVE_GMP */
+               ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes );
+               ldap_pvt_mp_add_ulong( slap_counters.sc_entries, 1 );
+               ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 );
                ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex );
        }
 
-       Statslog( LDAP_DEBUG_STATS2, "conn=%lu op=%lu ENTRY dn=\"%s\"\n",
-           op->o_connid, op->o_opid, rs->sr_entry->e_dn, 0, 0 );
+       Statslog( LDAP_DEBUG_STATS2, "%s ENTRY dn=\"%s\"\n",
+           op->o_log_prefix, rs->sr_entry->e_dn, 0, 0, 0 );
 
        Debug( LDAP_DEBUG_TRACE,
                "<= send_search_entry: conn %lu exit.\n", op->o_connid, 0, 0 );
@@ -1376,22 +1369,17 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
        ber_free_buf( ber );
 
        ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex );
-#ifdef HAVE_GMP
-       mpz_add_ui( slap_counters.sc_bytes, slap_counters.sc_bytes, bytes );
-       mpz_add_ui( slap_counters.sc_refs, slap_counters.sc_refs, 1 );
-       mpz_add_ui( slap_counters.sc_pdu, slap_counters.sc_pdu, 1 );
-#else /* ! HAVE_GMP */
-       slap_counters.sc_bytes += bytes;
-       slap_counters.sc_refs++;
-       slap_counters.sc_pdu++;
-#endif /* ! HAVE_GMP */
+       ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes );
+       ldap_pvt_mp_add_ulong( slap_counters.sc_refs, 1 );
+       ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 );
        ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex );
 #ifdef LDAP_CONNECTIONLESS
        }
 #endif
 
-       Statslog( LDAP_DEBUG_STATS2, "conn=%lu op=%lu REF dn=\"%s\"\n",
-               op->o_connid, op->o_opid, rs->sr_entry ? rs->sr_entry->e_dn : "(null)", 0, 0 );
+       Statslog( LDAP_DEBUG_STATS2, "%s REF dn=\"%s\"\n",
+               op->o_log_prefix, rs->sr_entry ? rs->sr_entry->e_dn : "(null)",
+               0, 0, 0 );
 
        Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 );
 
@@ -1522,7 +1510,7 @@ int slap_read_controls(
                *ctrl = (LDAPControl *) slap_sl_calloc( 1, sizeof(LDAPControl), NULL );
        } else {
                /* retry: free previous try */
-               slap_sl_free( (*ctrl)->ldctl_value.bv_val, &op->o_tmpmemctx );
+               slap_sl_free( (*ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
        }
 
        **ctrl = c;