Moved IDL cache code to standalone functions.

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index b08d67929840f6e0a4b5f326664aef1d23b04529..95e28288b5882ab35f5b0b1596b94d8f410d9107 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -1,4 +1,9 @@
 /* operation.c - routines to deal with pending ldap operations */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -9,69 +14,112 @@
 
 #include "slap.h"
 
-extern time_t          currenttime;
-extern pthread_mutex_t currenttime_mutex;
+#ifdef LDAP_SLAPI
+#include "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
-op_free( Operation *op )
+slap_op_free( Operation *op )
 {
-       if ( op->o_ber != NULL )
+       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 ( 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_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
+#ifdef LDAP_CLIENT_UPDATE
+       if ( op->o_clientupdate_state.bv_val != NULL ) {
+               free( op->o_clientupdate_state.bv_val );
+       }
+#endif
+#ifdef LDAP_SYNC
+       if ( op->o_sync_state.bv_val != NULL ) {
+               free( op->o_sync_state.bv_val );
+       }
+#endif
+
+#if defined( LDAP_SLAPI )
+       if ( op->o_pb != NULL ) {
+               slapi_pblock_destroy( (Slapi_PBlock *)op->o_pb );
+       }
+#endif /* defined( LDAP_SLAPI ) */
+
+       memset( op, 0, sizeof(Operation) );
+       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;
 
-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) );
 
-       if ( *tmp == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %d\n",
-                   op->o_msgid, 0, 0 );
-               return; 
-       }
+       op->o_ber = ber;
+       op->o_msgid = msgid;
+       op->o_tag = tag;
+
+       op->o_time = slap_get_time();
+       op->o_opid = id;
+#ifdef LDAP_CONNECTIONLESS
+       op->o_res_ber = NULL;
+#endif
+
+#if defined( LDAP_SLAPI )
+       op->o_pb = slapi_pblock_new();
+#endif /* defined( LDAP_SLAPI ) */
 
-       *tmp = (*tmp)->o_next;
-       op_free( op );
+       return( op );
 }