X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperation.c;h=b6a4ae0e54c969a0584b87fcfd85db5d3a2f189a;hb=46fab059977aed107f53c96ced0f35cfff8c7836;hp=0c62e219ece0041aede5f999440faa54f87664e2;hpb=42e0d83cb3a1a1c5b25183f1ab74ce7edbe25de7;p=openldap

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 0c62e219ec..b6a4ae0e54 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -1,74 +1,164 @@
 /* operation.c - routines to deal with pending ldap operations */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 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"
 
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 
-extern time_t		currenttime;
-extern pthread_mutex_t	currenttime_mutex;
+#ifdef LDAP_SLAPI
+#include "slapi/slapi.h"
+#endif
+
+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)
+{
+	ldap_pvt_thread_mutex_init( &slap_op_mutex );
+	LDAP_STAILQ_INIT(&slap_free_ops);
+}
+
+void slap_op_destroy(void)
+{
+	Operation *o;
+
+	while ( (o = LDAP_STAILQ_FIRST( &slap_free_ops )) != NULL) {
+		LDAP_STAILQ_REMOVE_HEAD( &slap_free_ops, o_next );
+		LDAP_STAILQ_NEXT(o, o_next) = NULL;
+		ch_free( o );
+	}
+	ldap_pvt_thread_mutex_destroy( &slap_op_mutex );
+}
 
 void
-op_free( Operation *op )
+slap_op_free( Operation *op )
 {
-	if ( op->o_ber != NULL )
+	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 ( op->o_dn != NULL ) {
-		free( op->o_dn );
 	}
-	/* pthread_mutex_destroy( &op->o_abandonmutex ); */
-	free( (char *) op );
+	if ( !BER_BVISNULL( &op->o_dn ) ) {
+		free( op->o_dn.bv_val );
+	}
+	if ( !BER_BVISNULL( &op->o_ndn ) ) {
+		free( op->o_ndn.bv_val );
+	}
+	if ( !BER_BVISNULL( &op->o_authmech ) ) {
+		free( op->o_authmech.bv_val );
+	}
+	if ( op->o_ctrls != NULL ) {
+		slap_free_ctrls( op, op->o_ctrls );
+	}
+
+#ifdef LDAP_CONNECTIONLESS
+	if ( op->o_res_ber != NULL ) {
+		ber_free( op->o_res_ber, 1 );
+	}
+#endif
+
+	{
+		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;
+	}
+
+#if defined( LDAP_SLAPI )
+	if ( op->o_pb != NULL ) {
+		slapi_pblock_destroy( (Slapi_PBlock *)op->o_pb );
+		slapi_int_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
+	}
+#endif /* defined( LDAP_SLAPI ) */
+
+
+	memset( op, 0, sizeof(Operation) + sizeof(Opheader) + SLAP_MAX_CIDS * sizeof(void *) );
+	op->o_hdr = (Opheader *)(op+1);
+	op->o_controls = (void **)(op->o_hdr+1);
+
+	ldap_pvt_thread_mutex_lock( &slap_op_mutex );
+	LDAP_STAILQ_INSERT_HEAD( &slap_free_ops, op, o_next );
+	ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
 }
 
 Operation *
-op_add(
-    Operation		**olist,
+slap_op_alloc(
     BerElement		*ber,
-    unsigned long	msgid,
-    unsigned long	tag,
-    char			*dn,
-    int				id,
-    int				connid
+    ber_int_t	msgid,
+    ber_tag_t	tag,
+    ber_int_t	id
 )
 {
-	Operation	**tmp;
-
-	for ( tmp = olist; *tmp != NULL; tmp = &(*tmp)->o_next )
-		;	/* NULL */
-
-	*tmp = (Operation *) calloc( 1, sizeof(Operation) );
-	pthread_mutex_init( &(*tmp)->o_abandonmutex,
-	    pthread_mutexattr_default );
-	(*tmp)->o_ber = ber;
-	(*tmp)->o_msgid = msgid;
-	(*tmp)->o_tag = tag;
-	(*tmp)->o_abandon = 0;
-	(*tmp)->o_dn = strdup( dn != NULL ? dn : "" );
-	pthread_mutex_lock( &currenttime_mutex );
-	(*tmp)->o_time = currenttime;
-	pthread_mutex_unlock( &currenttime_mutex );
-	(*tmp)->o_opid = id;
-	(*tmp)->o_connid = connid;
-	(*tmp)->o_next = NULL;
-
-	return( *tmp );
-}
+	Operation	*op;
+	struct berval slap_empty_bv_dup;
 
-void
-op_delete( Operation **olist, Operation *op )
-{
-	Operation	**tmp;
+	ldap_pvt_thread_mutex_lock( &slap_op_mutex );
+	if ((op = LDAP_STAILQ_FIRST( &slap_free_ops ))) {
+		LDAP_STAILQ_REMOVE_HEAD( &slap_free_ops, o_next );
+	}
+	ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
 
-	for ( tmp = olist; *tmp != NULL && *tmp != op; tmp = &(*tmp)->o_next )
-		;	/* NULL */
+	if (!op) {
+		op = (Operation *) ch_calloc( 1, sizeof(Operation)
+			+ sizeof(Opheader) + SLAP_MAX_CIDS * sizeof(void *) );
+		op->o_hdr = (Opheader *)(op + 1);
+		op->o_controls = (void **)(op->o_hdr+1);
+	}
+
+	op->o_ber = ber;
+	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 */
+	}
+	op->o_opid = id;
+	op->o_res_ber = NULL;
 
-	if ( *tmp == NULL ) {
-		Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %d\n",
-		    op->o_msgid, 0, 0 );
-		return; 
+#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 ) */
 
-	*tmp = (*tmp)->o_next;
-	op_free( op );
+	return( op );
 }