More unifdef SLAPD_MULTIMASTER cleanup

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 4946c772fd2986676a0aa633b99c883ff2995100..28054793f1504472ca8ddcd2f132a0b2a226054b 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,8 @@
 
 static ldap_pvt_thread_mutex_t slap_op_mutex;
 static LDAP_STAILQ_HEAD(s_o, slap_op)  slap_free_ops;
+static time_t last_time;
+static int last_incr;
 
 void slap_op_init(void)
 {
@@ -61,21 +63,19 @@ void slap_op_destroy(void)
 void
 slap_op_free( Operation *op )
 {
-       struct berval slap_empty_bv_dup;
-
        assert( LDAP_STAILQ_NEXT(op, o_next) == NULL );
 
        if ( op->o_ber != NULL ) {
                ber_free( op->o_ber, 1 );
        }
        if ( !BER_BVISNULL( &op->o_dn ) ) {
-               free( op->o_dn.bv_val );
+               ch_free( op->o_dn.bv_val );
        }
        if ( !BER_BVISNULL( &op->o_ndn ) ) {
-               free( op->o_ndn.bv_val );
+               ch_free( op->o_ndn.bv_val );
        }
        if ( !BER_BVISNULL( &op->o_authmech ) ) {
-               free( op->o_authmech.bv_val );
+               ch_free( op->o_authmech.bv_val );
        }
        if ( op->o_ctrls != NULL ) {
                slap_free_ctrls( op, op->o_ctrls );
@@ -97,8 +97,7 @@ slap_op_free( Operation *op )
        }
 
 #if defined( LDAP_SLAPI )
-       if ( op->o_pb != NULL ) {
-               slapi_pblock_destroy( (Slapi_PBlock *)op->o_pb );
+       if ( slapi_plugins_used ) {
                slapi_int_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
        }
 #endif /* defined( LDAP_SLAPI ) */
@@ -113,6 +112,21 @@ slap_op_free( Operation *op )
        ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
 }
 
+void
+slap_op_time(time_t *t, int *nop)
+{
+       *t = slap_get_time();
+       ldap_pvt_thread_mutex_lock( &slap_op_mutex );
+       if ( *t == last_time ) {
+               *nop = ++last_incr;
+       } else {
+               last_time = *t;
+               last_incr = 0;
+               *nop = 0;
+       }
+       ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
+}
+
 Operation *
 slap_op_alloc(
     BerElement         *ber,
@@ -122,7 +136,6 @@ slap_op_alloc(
 )
 {
        Operation       *op;
-       struct berval slap_empty_bv_dup;
 
        ldap_pvt_thread_mutex_lock( &slap_op_mutex );
        if ((op = LDAP_STAILQ_FIRST( &slap_free_ops ))) {
@@ -141,13 +154,12 @@ slap_op_alloc(
        op->o_msgid = msgid;
        op->o_tag = tag;
 
-       op->o_time = slap_get_time();
+       slap_op_time( &op->o_time, &op->o_tincr );
        op->o_opid = id;
        op->o_res_ber = NULL;
 
 #if defined( LDAP_SLAPI )
        if ( slapi_plugins_used ) {
-               op->o_pb = slapi_pblock_new();
                slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
        }
 #endif /* defined( LDAP_SLAPI ) */