X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperation.c;h=28054793f1504472ca8ddcd2f132a0b2a226054b;hb=543c588772b22a029b60e72e45e68032935ecd54;hp=24805df0ab7ca5ed9d3dbbcc82deeec435bdb6dd;hpb=de10624dc36ac71a76b4f86a9dc30e2bf9325be4;p=openldap

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 24805df0ab..28054793f1 100644
--- 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
@@ -97,8 +97,7 @@ slap_op_free( Operation *op )
 	}
 
 #if defined( LDAP_SLAPI )
-	if ( SLAPI_OPERATION_PBLOCK( op ) ) {
-		slapi_pblock_destroy( SLAPI_OPERATION_PBLOCK( op ) );
+	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,
@@ -140,19 +154,12 @@ slap_op_alloc(
 	op->o_msgid = msgid;
 	op->o_tag = tag;
 
-	op->o_time = slap_get_time();
-	if ( op->o_time == last_time ) {
-		op->o_tincr = ++last_incr;
-	} else {
-		last_time = op->o_time;
-		last_incr = 0;	/* o_tincr is alredy zero */
-	}
+	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 ) {
-		SLAPI_OPERATION_PBLOCK( op ) = slapi_pblock_new();
 		slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
 	}
 #endif /* defined( LDAP_SLAPI ) */