]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/operation.c
ITS#6944 limit op cache to 10 ops per thread
[openldap] / servers / slapd / operation.c
index 17d4e4efaaaca442b45782821dceace943d9523e..ae7b4a8a7271e78c910873a33431ba71eb32a73b 100644 (file)
@@ -1,8 +1,27 @@
 /* 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
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2011 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.h"
+#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;
+       ldap_pvt_thread_mutex_destroy( &slap_op_mutex );
+}
 
-       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 );
+static void
+slap_op_q_destroy( void *key, void *data )
+{
+       Operation *op, *op2;
+       for ( op = data; op; op = op2 ) {
+               op2 = LDAP_STAILQ_NEXT( op, o_next );
+               ber_memfree_x( op, NULL );
        }
-       ldap_pvt_thread_mutex_destroy( &slap_op_mutex );
 }
 
 void
-slap_op_free( Operation *op )
+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, void *ctx )
+{
+       OperationBuffer *opbuf;
+
        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 ) {
-               free( op->o_dn.bv_val );
+       if ( !BER_BVISNULL( &op->o_dn ) ) {
+               ch_free( op->o_dn.bv_val );
        }
-       if ( op->o_ndn.bv_val != NULL ) {
-               free( op->o_ndn.bv_val );
+       if ( !BER_BVISNULL( &op->o_ndn ) ) {
+               ch_free( op->o_ndn.bv_val );
        }
-       if ( op->o_authmech.bv_val != NULL ) {
-               free( op->o_authmech.bv_val );
+       if ( !BER_BVISNULL( &op->o_authmech ) ) {
+               ch_free( op->o_authmech.bv_val );
        }
        if ( op->o_ctrls != NULL ) {
                slap_free_ctrls( op, op->o_ctrls );
@@ -65,20 +100,65 @@ slap_op_free( Operation *op )
                ber_free( op->o_res_ber, 1 );
        }
 #endif
-       if ( op->o_sync_state.bv_val != NULL ) {
-               free( op->o_sync_state.bv_val );
+
+       if ( op->o_groups ) {
+               slap_op_groups_free( op );
        }
 
 #if defined( LDAP_SLAPI )
-       if ( op->o_pb != NULL ) {
-               slapi_pblock_destroy( (Slapi_PBlock *)op->o_pb );
+       if ( slapi_plugins_used ) {
+               slapi_int_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
        }
-       slapi_x_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
 #endif /* defined( LDAP_SLAPI ) */
 
-       memset( op, 0, sizeof(Operation) );
+       if ( !BER_BVISNULL( &op->o_csn ) ) {
+               op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx );
+               BER_BVZERO( &op->o_csn );
+       }
+
+       if ( op->o_pagedresults_state != NULL ) {
+               op->o_tmpfree( op->o_pagedresults_state, op->o_tmpmemctx );
+               op->o_pagedresults_state = NULL;
+       }
+
+       opbuf = (OperationBuffer *) op;
+       memset( opbuf, 0, sizeof(*opbuf) );
+       op->o_hdr = &opbuf->ob_hdr;
+       op->o_controls = opbuf->ob_controls;
+
+       if ( ctx ) {
+               Operation *op2 = NULL;
+               ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free,
+                       op, slap_op_q_destroy, &op2, NULL );
+               LDAP_STAILQ_NEXT( op, o_next ) = op2;
+               if ( op2 ) {
+                       op->o_tincr = op2->o_tincr + 1;
+                       /* No more than 10 ops on per-thread free list */
+                       if ( op->o_tincr > 10 ) {
+                               ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free,
+                                       op2, slap_op_q_destroy, NULL, NULL );
+                               ber_memfree_x( op, NULL );
+                       }
+               } else {
+                       op->o_tincr = 1;
+               }
+       } else {
+               ber_memfree_x( op, NULL );
+       }
+}
+
+void
+slap_op_time(time_t *t, int *nop)
+{
        ldap_pvt_thread_mutex_lock( &slap_op_mutex );
-       LDAP_STAILQ_INSERT_HEAD( &slap_free_ops, op, o_next );
+       *t = slap_get_time();
+       if ( *t == last_time ) {
+               *nop = ++last_incr;
+       } else {
+               last_time = *t;
+               last_incr = 0;
+               *nop = 0;
+       }
        ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
 }
 
@@ -87,32 +167,69 @@ slap_op_alloc(
     BerElement         *ber,
     ber_int_t  msgid,
     ber_tag_t  tag,
-    ber_int_t  id
-)
+    ber_int_t  id,
+       void *ctx )
 {
-       Operation       *op;
-
-       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 );
+       Operation       *op = NULL;
+
+       if ( ctx ) {
+               void *otmp = NULL;
+               ldap_pvt_thread_pool_getkey( ctx, (void *)slap_op_free, &otmp, NULL );
+               if ( otmp ) {
+                       op = otmp;
+                       otmp = LDAP_STAILQ_NEXT( op, o_next );
+                       ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free,
+                               otmp, slap_op_q_destroy, NULL, NULL );
+               }
+       }
+       if (!op) {
+               op = (Operation *) ch_calloc( 1, sizeof(OperationBuffer) );
+               op->o_hdr = &((OperationBuffer *) op)->ob_hdr;
+               op->o_controls = ((OperationBuffer *) op)->ob_controls;
        }
-       ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
-
-       if (!op)
-               op = (Operation *) ch_calloc( 1, sizeof(Operation) );
 
        op->o_ber = ber;
        op->o_msgid = msgid;
        op->o_tag = tag;
 
-       op->o_time = slap_get_time();
+       slap_op_time( &op->o_time, &op->o_tincr );
        op->o_opid = id;
        op->o_res_ber = NULL;
 
 #if defined( LDAP_SLAPI )
-       op->o_pb = slapi_pblock_new();
-       slapi_x_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
+       if ( slapi_plugins_used ) {
+               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;
+}