/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
{
/* c_mutex must be locked by caller */
- Operation *o;
-
- LDAP_STAILQ_FOREACH(o, &c->c_ops, o_next) {
+ Operation *o, *next, op = {0};
+ Opheader ohdr = {0};
+ SlapReply rs = {0};
+
+ op.o_hdr = &ohdr;
+ op.o_conn = c;
+ op.o_connid = c->c_connid;
+ op.o_tag = LDAP_REQ_ABANDON;
+ for ( o = LDAP_STAILQ_FIRST( &c->c_ops ); o; o=next ) {
+ next = LDAP_STAILQ_NEXT( o, o_next );
+ op.orn_msgid = o->o_msgid;
o->o_abandon = 1;
+ op.o_bd = frontendDB;
+ frontendDB->be_abandon( &op, &rs );
}
/* remove pending operations */
} while (0)
#else /* !SLAPD_MONITOR */
#define INCR_OP_INITIATED(index)
-#define INCR_OP_COMPLETED(index)
+#define INCR_OP_COMPLETED(index) \
+ do { \
+ ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex ); \
+ ldap_pvt_mp_add_ulong(slap_counters.sc_ops_completed, 1); \
+ ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex ); \
+ } while (0)
#endif /* !SLAPD_MONITOR */
+/*
+ * NOTE: keep in sync with enum in slapd.h
+ */
+static int (*opfun[])( Operation *op, SlapReply *rs ) = {
+ do_bind,
+ do_unbind,
+ do_add,
+ do_delete,
+ do_modrdn,
+ do_modify,
+ do_compare,
+ do_search,
+ do_abandon,
+ do_extended,
+ NULL
+};
+
static void *
connection_operation( void *ctx, void *arg_v )
{
Operation *op = arg_v;
SlapReply rs = {REP_RESULT};
ber_tag_t tag = op->o_tag;
-#ifdef SLAPD_MONITOR
- ber_tag_t oldtag = tag;
-#endif /* SLAPD_MONITOR */
+ int opidx = -1;
Connection *conn = op->o_conn;
void *memctx = NULL;
void *memctx_null = NULL;
case LDAP_REQ_UNBIND:
case LDAP_REQ_ADD:
case LDAP_REQ_DELETE:
- case LDAP_REQ_MODRDN:
+ case LDAP_REQ_MODDN:
case LDAP_REQ_MODIFY:
case LDAP_REQ_COMPARE:
case LDAP_REQ_SEARCH:
#endif
memsiz = SLAP_SLAB_SIZE;
- memctx = slap_sl_mem_create( memsiz, ctx );
+ memctx = slap_sl_mem_create( memsiz, SLAP_SLAB_STACK, ctx );
op->o_tmpmemctx = memctx;
op->o_tmpmfuncs = &slap_sl_mfuncs;
if ( tag != LDAP_REQ_ADD && tag != LDAP_REQ_MODIFY ) {
switch ( tag ) {
case LDAP_REQ_BIND:
- INCR_OP_INITIATED(SLAP_OP_BIND);
- rc = do_bind( op, &rs );
+ opidx = SLAP_OP_BIND;
break;
case LDAP_REQ_UNBIND:
- INCR_OP_INITIATED(SLAP_OP_UNBIND);
- rc = do_unbind( op, &rs );
+ opidx = SLAP_OP_UNBIND;
break;
case LDAP_REQ_ADD:
- INCR_OP_INITIATED(SLAP_OP_ADD);
- rc = do_add( op, &rs );
+ opidx = SLAP_OP_ADD;
break;
case LDAP_REQ_DELETE:
- INCR_OP_INITIATED(SLAP_OP_DELETE);
- rc = do_delete( op, &rs );
+ opidx = SLAP_OP_DELETE;
break;
case LDAP_REQ_MODRDN:
- INCR_OP_INITIATED(SLAP_OP_MODRDN);
- rc = do_modrdn( op, &rs );
+ opidx = SLAP_OP_MODRDN;
break;
case LDAP_REQ_MODIFY:
- INCR_OP_INITIATED(SLAP_OP_MODIFY);
- rc = do_modify( op, &rs );
+ opidx = SLAP_OP_MODIFY;
break;
case LDAP_REQ_COMPARE:
- INCR_OP_INITIATED(SLAP_OP_COMPARE);
- rc = do_compare( op, &rs );
+ opidx = SLAP_OP_COMPARE;
break;
case LDAP_REQ_SEARCH:
- INCR_OP_INITIATED(SLAP_OP_SEARCH);
- rc = do_search( op, &rs );
+ opidx = SLAP_OP_SEARCH;
break;
case LDAP_REQ_ABANDON:
- INCR_OP_INITIATED(SLAP_OP_ABANDON);
- rc = do_abandon( op, &rs );
+ opidx = SLAP_OP_ABANDON;
break;
case LDAP_REQ_EXTENDED:
- INCR_OP_INITIATED(SLAP_OP_EXTENDED);
- rc = do_extended( op, &rs );
+ opidx = SLAP_OP_EXTENDED;
break;
default:
assert( 0 );
}
+ assert( opidx > -1 );
+ INCR_OP_INITIATED( opidx );
+ rc = (*(opfun[opidx]))( op, &rs );
+
operations_error:
- if( rc == SLAPD_DISCONNECT ) tag = LBER_ERROR;
+ if ( rc == SLAPD_DISCONNECT ) {
+ tag = LBER_ERROR;
-#ifdef SLAPD_MONITOR
- switch (oldtag) {
- case LDAP_REQ_BIND:
- INCR_OP_COMPLETED(SLAP_OP_BIND);
- break;
- case LDAP_REQ_UNBIND:
- INCR_OP_COMPLETED(SLAP_OP_UNBIND);
- break;
- case LDAP_REQ_ADD:
- INCR_OP_COMPLETED(SLAP_OP_ADD);
- break;
- case LDAP_REQ_DELETE:
- INCR_OP_COMPLETED(SLAP_OP_DELETE);
- break;
- case LDAP_REQ_MODRDN:
- INCR_OP_COMPLETED(SLAP_OP_MODRDN);
- break;
- case LDAP_REQ_MODIFY:
- INCR_OP_COMPLETED(SLAP_OP_MODIFY);
- break;
- case LDAP_REQ_COMPARE:
- INCR_OP_COMPLETED(SLAP_OP_COMPARE);
- break;
- case LDAP_REQ_SEARCH:
- INCR_OP_COMPLETED(SLAP_OP_SEARCH);
- break;
- case LDAP_REQ_ABANDON:
- INCR_OP_COMPLETED(SLAP_OP_ABANDON);
- break;
- case LDAP_REQ_EXTENDED:
- INCR_OP_COMPLETED(SLAP_OP_EXTENDED);
- break;
- default:
- /* not reachable */
- assert( 0 );
+ } else if ( opidx > -1 ) {
+ /* increment completed operations count
+ * only if operation was initiated
+ * and rc != SLAPD_DISCONNECT */
+ INCR_OP_COMPLETED( opidx );
}
-#endif /* SLAPD_MONITOR */
- ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex );
if ( op->o_cancel == SLAP_CANCEL_REQ ) {
op->o_cancel = LDAP_TOO_LATE;
ber_set_option( op->o_ber, LBER_OPT_BER_MEMCTX, &memctx_null );
- if ( op->o_cancel != SLAP_CANCEL_ACK &&
- ( op->o_sync_mode & SLAP_SYNC_PERSIST ) )
- {
- slap_sl_mem_detach( ctx, memctx );
-
- } else if ( op->o_sync_slog_size != -1 ) {
- slap_sl_mem_detach( ctx, memctx );
- LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
- LDAP_STAILQ_NEXT(op, o_next) = NULL;
- conn->c_n_ops_executing--;
- conn->c_n_ops_completed++;
-
- } else {
- LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
- LDAP_STAILQ_NEXT(op, o_next) = NULL;
- slap_op_free( op );
- conn->c_n_ops_executing--;
- conn->c_n_ops_completed++;
- }
+ LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
+ LDAP_STAILQ_NEXT(op, o_next) = NULL;
+ slap_op_free( op );
+ conn->c_n_ops_executing--;
+ conn->c_n_ops_completed++;
switch( tag ) {
case LBER_ERROR:
}
#endif
if(tag == LDAP_REQ_BIND) {
- /* immediately abandon all exiting operations upon BIND */
+ /* immediately abandon all existing operations upon BIND */
connection_abandon( conn );
}
ber_socket_t sd;
ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_GET_FD, &sd );
- /* us trylock to avoid possible deadlock */
+ /* use trylock to avoid possible deadlock */
rc = ldap_pvt_thread_mutex_trylock( &connections_mutex );
if( rc ) {
c = connection_get( s );
- slapd_clr_write( s, 0);
-
if( c == NULL ) {
Debug( LDAP_DEBUG_ANY,
"connection_write(%ld): no connection!\n",
return -1;
}
+ slapd_clr_write( s, 0);
+
c->c_n_write++;
Debug( LDAP_DEBUG_TRACE,
conn->c_peer_domain = slap_empty_bv;
conn->c_peer_name = slap_empty_bv;
+ memset(op, 0, OPERATION_BUFFER_SIZE);
+ op->o_hdr = (Opheader *)(op+1);
+ op->o_controls = (void **)(op->o_hdr+1);
/* set memory context */
- op->o_tmpmemctx = slap_sl_mem_create( SLAP_SLAB_SIZE, ctx );
+ op->o_tmpmemctx = slap_sl_mem_create(SLAP_SLAB_SIZE, SLAP_SLAB_STACK, ctx);
op->o_tmpmfuncs = &slap_sl_mfuncs;
op->o_threadctx = ctx;
projects / openldap / blobdiff