X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperation.c;h=b6a4ae0e54c969a0584b87fcfd85db5d3a2f189a;hb=46fab059977aed107f53c96ced0f35cfff8c7836;hp=859a88acee99a33ee6dbe50449693835c71e7336;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap
diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 859a88acee..b6a4ae0e54 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-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * 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
+ * .
+ */
+/* 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,86 @@
#include "slap.h"
+#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
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 ( op->o_dn.bv_val != NULL ) {
+ if ( !BER_BVISNULL( &op->o_dn ) ) {
free( op->o_dn.bv_val );
}
- if ( op->o_ndn.bv_val != NULL ) {
+ if ( !BER_BVISNULL( &op->o_ndn ) ) {
free( op->o_ndn.bv_val );
}
- if ( op->o_authmech != NULL ) {
- free( op->o_authmech );
+ if ( !BER_BVISNULL( &op->o_authmech ) ) {
+ free( op->o_authmech.bv_val );
}
if ( op->o_ctrls != NULL ) {
- ldap_controls_free( op->o_ctrls );
+ slap_free_ctrls( op, op->o_ctrls );
}
- ldap_pvt_thread_mutex_destroy( &op->o_abandonmutex );
+#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 ) */
- free( (char *) op );
+
+ 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 *
@@ -50,73 +124,41 @@ slap_op_alloc(
)
{
Operation *op;
+ struct berval slap_empty_bv_dup;
- op = (Operation *) ch_calloc( 1, sizeof(Operation) );
+ 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 );
- ldap_pvt_thread_mutex_init( &op->o_abandonmutex );
+ 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();
- op->o_opid = id;
-
- return( op );
-}
-
-#if 0
-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 ( 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;
- *tmp = (*tmp)->o_next;
- op->o_next = NULL;
-
- return 0;
-}
-
-Operation * slap_op_pop( Operation **olist )
-{
- Operation *tmp = *olist;
-
- if(tmp != NULL) {
- *olist = tmp->o_next;
- tmp->o_next = 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 ) */
- return tmp;
+ return( op );
}
-#endif