X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperation.c;h=024139db7da9e4bfca18a2691cddce62c2a47007;hb=9767c87531d193a4bef19286b77623aff18590fb;hp=0dd9c1f334fdd7c2105ad7fe81016ab6416a9c79;hpb=2f3399265caf72d81ba192a86d63a7a96b0c837b;p=openldap

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 0dd9c1f334..024139db7d 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -1,8 +1,27 @@
 /* operation.c - routines to deal with pending ldap operations */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2009 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
@@ -14,31 +33,117 @@
 
 #include "slap.h"
 
+#ifdef LDAP_SLAPI
+#include "slapi/slapi.h"
+#endif
+
+static ldap_pvt_thread_mutex_t	slap_op_mutex;
+static time_t last_time;
+static int last_incr;
+
+void slap_op_init(void)
+{
+	ldap_pvt_thread_mutex_init( &slap_op_mutex );
+}
+
+void slap_op_destroy(void)
+{
+	ldap_pvt_thread_mutex_destroy( &slap_op_mutex );
+}
+
+static void
+slap_op_q_destroy( void *key, void *data )
+{
+	Operation *op, *op2;
+	for ( op = data; op; op = op2 ) {
+		op2 = LDAP_STAILQ_NEXT( op, o_next );
+		ber_memfree_x( op, NULL );
+	}
+}
 
 void
-slap_op_free( Operation *op )
+slap_op_groups_free( Operation *op )
 {
-	assert( op->o_next == NULL );
+	GroupAssertion *g, *n;
+	for ( g = op->o_groups; g; g = n ) {
+		n = g->ga_next;
+		slap_sl_free( g, op->o_tmpmemctx );
+	}
+	op->o_groups = NULL;
+}
+
+void
+slap_op_free( Operation *op, void *ctx )
+{
+	OperationBuffer *opbuf;
+
+	assert( LDAP_STAILQ_NEXT(op, o_next) == NULL );
 
 	if ( op->o_ber != NULL ) {
 		ber_free( op->o_ber, 1 );
 	}
-	if ( op->o_dn.bv_val != NULL ) {
-		free( op->o_dn.bv_val );
+	if ( !BER_BVISNULL( &op->o_dn ) ) {
+		ch_free( op->o_dn.bv_val );
 	}
-	if ( op->o_ndn.bv_val != NULL ) {
-		free( op->o_ndn.bv_val );
+	if ( !BER_BVISNULL( &op->o_ndn ) ) {
+		ch_free( op->o_ndn.bv_val );
 	}
-	if ( op->o_authmech != NULL ) {
-		free( op->o_authmech );
+	if ( !BER_BVISNULL( &op->o_authmech ) ) {
+		ch_free( op->o_authmech.bv_val );
 	}
 	if ( op->o_ctrls != NULL ) {
-		ldap_controls_free( op->o_ctrls );
+		slap_free_ctrls( op, op->o_ctrls );
+	}
+
+#ifdef LDAP_CONNECTIONLESS
+	if ( op->o_res_ber != NULL ) {
+		ber_free( op->o_res_ber, 1 );
+	}
+#endif
+
+	if ( op->o_groups ) {
+		slap_op_groups_free( op );
+	}
+
+#if defined( LDAP_SLAPI )
+	if ( slapi_plugins_used ) {
+		slapi_int_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
+	}
+#endif /* defined( LDAP_SLAPI ) */
+
+	if ( !BER_BVISNULL( &op->o_csn ) ) {
+		op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx );
+		BER_BVZERO( &op->o_csn );
 	}
 
-	ldap_pvt_thread_mutex_destroy( &op->o_abandonmutex );
+	opbuf = (OperationBuffer *) op;
+	memset( opbuf, 0, sizeof(*opbuf) );
+	op->o_hdr = &opbuf->ob_hdr;
+	op->o_controls = opbuf->ob_controls;
+
+	if ( ctx ) {
+		void *op2 = NULL;
+		ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free,
+			op, slap_op_q_destroy, &op2, NULL );
+		LDAP_STAILQ_NEXT( op, o_next ) = op2;
+	} else {
+		ber_memfree_x( op, NULL );
+	}
+}
 
-	free( (char *) op );
+void
+slap_op_time(time_t *t, int *nop)
+{
+	ldap_pvt_thread_mutex_lock( &slap_op_mutex );
+	*t = slap_get_time();
+	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 *
@@ -46,85 +151,69 @@ slap_op_alloc(
     BerElement		*ber,
     ber_int_t	msgid,
     ber_tag_t	tag,
-    ber_int_t	id
-)
+    ber_int_t	id,
+	void *ctx )
 {
-	Operation	*op;
-
-	op = (Operation *) ch_calloc( 1, sizeof(Operation) );
-
-	ldap_pvt_thread_mutex_init( &op->o_abandonmutex );
-	op->o_abandon = 0;
+	Operation	*op = NULL;
+
+	if ( ctx ) {
+		void *otmp = NULL;
+		ldap_pvt_thread_pool_getkey( ctx, (void *)slap_op_free, &otmp, NULL );
+		if ( otmp ) {
+			op = otmp;
+			otmp = LDAP_STAILQ_NEXT( op, o_next );
+			ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free,
+				otmp, slap_op_q_destroy, NULL, NULL );
+		}
+	}
+	if (!op) {
+		op = (Operation *) ch_calloc( 1, sizeof(OperationBuffer) );
+		op->o_hdr = &((OperationBuffer *) op)->ob_hdr;
+		op->o_controls = ((OperationBuffer *) op)->ob_controls;
+	}
 
 	op->o_ber = ber;
 	op->o_msgid = msgid;
 	op->o_tag = tag;
 
-	op->o_dn.bv_val = NULL;
-	op->o_dn.bv_len = 0;
-	op->o_ndn.bv_val = NULL;
-	op->o_ndn.bv_len = 0;
-	op->o_authmech = NULL;
-	op->o_ctrls = NULL;
-
-	op->o_time = slap_get_time();
+	slap_op_time( &op->o_time, &op->o_tincr );
 	op->o_opid = id;
-	op->o_next = NULL;
-
-	return( op );
-}
+	op->o_res_ber = NULL;
 
-int slap_op_add(
-    Operation		**olist,
-	Operation		*op
-)
-{
-	Operation	**tmp;
-
-	for ( tmp = olist; *tmp != NULL; tmp = &(*tmp)->o_next )
-		;	/* NULL */
-
-	*tmp = op;
-
-	return 0;
-}
-
-int
-slap_op_remove( Operation **olist, Operation *op )
-{
-	Operation	**tmp;
-
-	for ( tmp = olist; *tmp != NULL && *tmp != op; tmp = &(*tmp)->o_next )
-		;	/* NULL */
-
-	if ( *tmp == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			   "slap_op_remove: can't find op %ld.\n",
-			   (long)op->o_msgid ));
-#else
-		Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %ld\n",
-		       (long) op->o_msgid, 0, 0 );
-#endif
-
-		return -1; 
+#if defined( LDAP_SLAPI )
+	if ( slapi_plugins_used ) {
+		slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
 	}
+#endif /* defined( LDAP_SLAPI ) */
 
-	*tmp = (*tmp)->o_next;
-	op->o_next = NULL;
-
-	return 0;
+	return( op );
 }
 
-Operation * slap_op_pop( Operation **olist )
+slap_op_t
+slap_req2op( ber_tag_t tag )
 {
-	Operation *tmp = *olist;
-
-	if(tmp != NULL) {
-		*olist = tmp->o_next;
-		tmp->o_next = NULL;
+	switch ( tag ) {
+	case LDAP_REQ_BIND:
+		return SLAP_OP_BIND;
+	case LDAP_REQ_UNBIND:
+		return SLAP_OP_UNBIND;
+	case LDAP_REQ_ADD:
+		return SLAP_OP_ADD;
+	case LDAP_REQ_DELETE:
+		return SLAP_OP_DELETE;
+	case LDAP_REQ_MODRDN:
+		return SLAP_OP_MODRDN;
+	case LDAP_REQ_MODIFY:
+		return SLAP_OP_MODIFY;
+	case LDAP_REQ_COMPARE:
+		return SLAP_OP_COMPARE;
+	case LDAP_REQ_SEARCH:
+		return SLAP_OP_SEARCH;
+	case LDAP_REQ_ABANDON:
+		return SLAP_OP_ABANDON;
+	case LDAP_REQ_EXTENDED:
+		return SLAP_OP_EXTENDED;
 	}
 
-	return tmp;
+	return SLAP_OP_LAST;
 }
-