]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/operation.c
internal operation return value processing cleanup
[openldap] / servers / slapd / operation.c
index 6f6ab510ef6ce7feedb074f974a16562af971f8a..27ec820fac32f2215de249a76bf0c04c7a1f5bb9 100644 (file)
@@ -1,4 +1,28 @@
 /* operation.c - routines to deal with pending ldap operations */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 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 "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;
+
+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 )
 {
-       assert( op->o_next == 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 );
+       if ( op->o_dn.bv_val != NULL ) {
+               free( op->o_dn.bv_val );
+       }
+       if ( op->o_ndn.bv_val != NULL ) {
+               free( op->o_ndn.bv_val );
+       }
+       if ( op->o_authmech.bv_val != NULL ) {
+               free( op->o_authmech.bv_val );
        }
-       if ( op->o_ndn != NULL ) {
-               free( op->o_ndn );
+       if ( op->o_ctrls != NULL ) {
+               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
+
+       slap_sync_cookie_free( &op->o_sync_state, 0 );
+
+       {
+               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 );
+       if ( op->o_sync_csn.bv_val != NULL ) {
+               ch_free( op->o_sync_csn.bv_val );
+       }
+
+       memset( op, 0, sizeof(Operation) );
+
+       op->o_sync_state.sid = -1;
+       op->o_sync_slog_size = -1;
+       op->o_sync_state.rid = -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 *
@@ -39,70 +128,38 @@ 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 );
-       op->o_abandon = 0;
+       if (!op) {
+               op = (Operation *) ch_calloc( 1, sizeof(Operation) );
+       }
 
        op->o_ber = ber;
        op->o_msgid = msgid;
        op->o_tag = tag;
 
-       op->o_dn = NULL;
-       op->o_ndn = NULL;
-
        op->o_time = slap_get_time();
        op->o_opid = id;
-       op->o_next = NULL;
-
-       return( op );
-}
-
-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 ) {
-               Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %ld\n",
-                   op->o_msgid, 0, 0 );
-               return -1; 
+       op->o_res_ber = NULL;
+
+       op->o_sync_state.sid = -1;
+       op->o_sync_slog_size = -1;
+       op->o_sync_state.rid = -1;
+       LDAP_STAILQ_FIRST( &op->o_sync_slog_list ) = NULL;
+       op->o_sync_slog_list.stqh_last = &LDAP_STAILQ_FIRST( &op->o_sync_slog_list );
+
+#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->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;
-       }
-
-       return tmp;
+       return( op );
 }
-