More changes to let BDB build without LDBM.

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 56085eeb736cc60b7f8048b17a1517192681475d..159b57278c7fd4c6498a2b46eecede80f63f5197 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-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -13,27 +18,63 @@
 void
 slap_op_free( Operation *op )
 {
-       if ( op->o_ber != NULL )
+       assert( 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_ndn != NULL ) {
                free( op->o_ndn );
        }
-       /* pthread_mutex_destroy( &op->o_abandonmutex ); */
+       if ( op->o_authmech != NULL ) {
+               free( op->o_authmech );
+       }
+       if ( op->o_ctrls != NULL ) {
+               ldap_controls_free( op->o_ctrls );
+       }
+
+       ldap_pvt_thread_mutex_destroy( &op->o_abandonmutex );
+
        free( (char *) op );
 }
 
 Operation *
-slap_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       *op;
+
+       op = (Operation *) ch_calloc( 1, sizeof(Operation) );
+
+       ldap_pvt_thread_mutex_init( &op->o_abandonmutex );
+       op->o_abandon = 0;
+
+       op->o_ber = ber;
+       op->o_msgid = msgid;
+       op->o_tag = tag;
+
+       op->o_dn = NULL;
+       op->o_ndn = NULL;
+       op->o_authmech = NULL;
+       op->o_ctrls = 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;
@@ -41,29 +82,13 @@ slap_op_add(
        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 = ch_strdup( dn != NULL ? dn : "" );
-       (*tmp)->o_ndn = dn_normalize_case( ch_strdup( (*tmp)->o_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 );
+       *tmp = op;
+
+       return 0;
 }
 
-void
-slap_op_delete( Operation **olist, Operation *op )
+int
+slap_op_remove( Operation **olist, Operation *op )
 {
        Operation       **tmp;
 
@@ -71,11 +96,33 @@ slap_op_delete( Operation **olist, Operation *op )
                ;       /* 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",
-                   op->o_msgid, 0, 0 );
-               return; 
+                      (long) op->o_msgid, 0, 0 );
+#endif
+
+               return -1; 
        }
 
        *tmp = (*tmp)->o_next;
-       slap_op_free( op );
+       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;
+}
+