Fix for dynamic adds

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 24805df0ab7ca5ed9d3dbbcc82deeec435bdb6dd..b5b2f3d1e661b180962917607614e7a74be17893 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
 #endif
 
 static ldap_pvt_thread_mutex_t slap_op_mutex;
-static LDAP_STAILQ_HEAD(s_o, slap_op)  slap_free_ops;
+static LDAP_STAILQ_HEAD(s_o, Operation)        slap_free_ops;
 static time_t last_time;
 static int last_incr;
 
@@ -60,9 +60,22 @@ void slap_op_destroy(void)
        ldap_pvt_thread_mutex_destroy( &slap_op_mutex );
 }
 
+void
+slap_op_groups_free( Operation *op )
+{
+       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;
+}
+
 void
 slap_op_free( Operation *op )
 {
+       OperationBuffer *opbuf;
+
        assert( LDAP_STAILQ_NEXT(op, o_next) == NULL );
 
        if ( op->o_ber != NULL ) {
@@ -87,39 +100,48 @@ slap_op_free( Operation *op )
        }
 #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 ( op->o_groups ) {
+               slap_op_groups_free( op );
        }
 
 #if defined( LDAP_SLAPI )
-       if ( SLAPI_OPERATION_PBLOCK( op ) ) {
-               slapi_pblock_destroy( SLAPI_OPERATION_PBLOCK( op ) );
+       if ( slapi_plugins_used ) {
                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);
+       opbuf = (OperationBuffer *) op;
+       memset( opbuf, 0, sizeof(*opbuf) );
+       op->o_hdr = &opbuf->ob_hdr;
+       op->o_controls = opbuf->ob_controls;
 
        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 );
 }
 
+void
+slap_op_time(time_t *t, int *nop)
+{
+       *t = slap_get_time();
+       ldap_pvt_thread_mutex_lock( &slap_op_mutex );
+       if ( *t == last_time ) {
+               *nop = ++last_incr;
+       } else {
+               last_time = *t;
+               last_incr = 0;
+               *nop = 0;
+       }
+       ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
+}
+
 Operation *
 slap_op_alloc(
     BerElement         *ber,
     ber_int_t  msgid,
     ber_tag_t  tag,
-    ber_int_t  id
-)
+    ber_int_t  id )
 {
        Operation       *op;
 
@@ -130,32 +152,53 @@ slap_op_alloc(
        ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
 
        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 = (Operation *) ch_calloc( 1, sizeof(OperationBuffer) );
+               op->o_hdr = &((OperationBuffer *) op)->ob_hdr;
+               op->o_controls = ((OperationBuffer *) op)->ob_controls;
        }
 
        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 */
-       }
+       slap_op_time( &op->o_time, &op->o_tincr );
        op->o_opid = id;
        op->o_res_ber = NULL;
 
 #if defined( LDAP_SLAPI )
        if ( slapi_plugins_used ) {
-               SLAPI_OPERATION_PBLOCK( op ) = slapi_pblock_new();
                slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
        }
 #endif /* defined( LDAP_SLAPI ) */
 
        return( op );
 }
+
+slap_op_t
+slap_req2op( ber_tag_t tag )
+{
+       switch ( tag ) {
+       case LDAP_REQ_BIND:
+               return SLAP_OP_BIND;
+       case LDAP_REQ_UNBIND:
+               return SLAP_OP_UNBIND;
+       case LDAP_REQ_ADD:
+               return SLAP_OP_ADD;
+       case LDAP_REQ_DELETE:
+               return SLAP_OP_DELETE;
+       case LDAP_REQ_MODRDN:
+               return SLAP_OP_MODRDN;
+       case LDAP_REQ_MODIFY:
+               return SLAP_OP_MODIFY;
+       case LDAP_REQ_COMPARE:
+               return SLAP_OP_COMPARE;
+       case LDAP_REQ_SEARCH:
+               return SLAP_OP_SEARCH;
+       case LDAP_REQ_ABANDON:
+               return SLAP_OP_ABANDON;
+       case LDAP_REQ_EXTENDED:
+               return SLAP_OP_EXTENDED;
+       }
+
+       return SLAP_OP_LAST;
+}