/* $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
#include "portable.h"
#include <stdio.h>
+#ifdef HAVE_LIMITS_H
#include <limits.h>
+#endif
#include <ac/socket.h>
#include <ac/errno.h>
ldap_pvt_thread_mutex_init( &connections_mutex );
ldap_pvt_thread_mutex_init( &conn_nextid_mutex );
- connections = (Connection *) ch_calloc( SLAPD_GLOBAL(dtblsize), sizeof(Connection) );
+ connections = (Connection *) ch_calloc( dtblsize, sizeof(Connection) );
if( connections == NULL ) {
Debug( LDAP_DEBUG_ANY,
"connections_init: allocation (%d*%ld) of connection array failed\n",
- SLAPD_GLOBAL(dtblsize), (long) sizeof(Connection), 0 );
+ dtblsize, (long) sizeof(Connection), 0 );
return -1;
}
assert( connections[0].c_struct_state == SLAP_C_UNINITIALIZED );
- assert( connections[SLAPD_GLOBAL(dtblsize)-1].c_struct_state == SLAP_C_UNINITIALIZED );
+ assert( connections[dtblsize-1].c_struct_state == SLAP_C_UNINITIALIZED );
- for (i=0; i<SLAPD_GLOBAL(dtblsize); i++) connections[i].c_conn_idx = i;
+ for (i=0; i<dtblsize; i++) connections[i].c_conn_idx = i;
/*
* per entry initialization of the Connection array initialization
return -1;
}
- for ( i = 0; i < SLAPD_GLOBAL(dtblsize); i++ ) {
+ for ( i = 0; i < dtblsize; i++ ) {
if( connections[i].c_struct_state != SLAP_C_UNINITIALIZED ) {
ber_sockbuf_free( connections[i].c_sb );
ldap_pvt_thread_mutex_destroy( &connections[i].c_mutex );
ldap_pvt_thread_mutex_destroy( &connections[i].c_write_mutex );
ldap_pvt_thread_cond_destroy( &connections[i].c_write_cv );
#ifdef LDAP_SLAPI
- if ( SLAPD_GLOBAL(slapi_plugins_used) ) {
+ if ( slapi_plugins_used ) {
slapi_int_free_object_extensions( SLAPI_X_EXT_CONNECTION, &connections[i] );
}
#endif
ldap_pvt_thread_mutex_lock( &connections_mutex );
- for ( i = 0; i < SLAPD_GLOBAL(dtblsize); i++ ) {
+ for ( i = 0; i < dtblsize; i++ ) {
if( connections[i].c_struct_state != SLAP_C_USED ) {
continue;
}
/* give persistent clients a chance to cleanup */
if( connections[i].c_conn_state == SLAP_C_CLIENT ) {
- ldap_pvt_thread_pool_submit( &SLAPD_GLOBAL(connection_pool),
+ ldap_pvt_thread_pool_submit( &connection_pool,
connections[i].c_clientfunc, connections[i].c_clientarg );
continue;
}
if( c->c_n_ops_executing ||
c->c_conn_state == SLAP_C_CLIENT ) continue;
- if( difftime( c->c_activitytime+SLAPD_GLOBAL(idletimeout), now) < 0 ) {
+ if( difftime( c->c_activitytime+global_idletimeout, now) < 0 ) {
/* close it */
connection_closing( c );
connection_close( c );
{
ber_socket_t i, sd;
- for(i=0; i<SLAPD_GLOBAL(dtblsize); i++) {
+ for(i=0; i<dtblsize; i++) {
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
assert( connections[i].c_conn_state == SLAP_C_INVALID );
assert( connections[i].c_sb == 0 );
assert( sd != AC_SOCKET_INVALID );
#ifndef SLAPD_MONITOR
- if ( SLAPD_GLOBAL(idletimeout) > 0 )
+ if ( global_idletimeout > 0 )
#endif /* ! SLAPD_MONITOR */
{
c->c_activitytime = slap_get_time();
assert( s >= 0 );
#ifndef HAVE_WINSOCK
- assert( s < SLAPD_GLOBAL(dtblsize) );
+ assert( s < dtblsize );
#endif
ldap_pvt_thread_mutex_lock( &connections_mutex );
ber_socket_t i;
c = NULL;
- for( i=0; i < SLAPD_GLOBAL(dtblsize); i++) {
+ for( i=0; i < dtblsize; i++) {
ber_socket_t sd;
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
if( c == NULL ) {
Debug( LDAP_DEBUG_ANY,
"connection_init(%d): connection table full "
- "(%d/%d)\n", s, i, SLAPD_GLOBAL(dtblsize));
+ "(%d/%d)\n", s, i, dtblsize);
ldap_pvt_thread_mutex_unlock( &connections_mutex );
return -1;
}
c->c_sb = ber_sockbuf_alloc( );
{
- ber_len_t max = SLAPD_GLOBAL(sockbuf_max_incoming);
+ ber_len_t max = sockbuf_max_incoming;
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
ldap_pvt_thread_cond_init( &c->c_write_cv );
#ifdef LDAP_SLAPI
- if ( SLAPD_GLOBAL(slapi_plugins_used) ) {
+ if ( slapi_plugins_used ) {
slapi_int_create_object_extensions( SLAPI_X_EXT_CONNECTION, c );
}
#endif
c->c_protocol = 0;
#ifndef SLAPD_MONITOR
- if ( SLAPD_GLOBAL(idletimeout) > 0 )
+ if ( global_idletimeout > 0 )
#endif /* ! SLAPD_MONITOR */
{
c->c_activitytime = c->c_starttime = slap_get_time();
assert( c != NULL );
{
- ber_len_t max = SLAPD_GLOBAL(sockbuf_max_incoming);
+ ber_len_t max = sockbuf_max_incoming;
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
free(c->c_ndn.bv_val);
}
BER_BVZERO( &c->c_ndn );
+ if(c->c_sasl_authz_dn.bv_val != NULL) {
+ free(c->c_sasl_authz_dn.bv_val);
+ }
+ BER_BVZERO( &c->c_sasl_authz_dn );
c->c_authz_backend = NULL;
}
c->c_sb = ber_sockbuf_alloc( );
{
- ber_len_t max = SLAPD_GLOBAL(sockbuf_max_incoming);
+ ber_len_t max = sockbuf_max_incoming;
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
#ifdef LDAP_SLAPI
/* call destructors, then constructors; avoids unnecessary allocation */
- if ( SLAPD_GLOBAL(slapi_plugins_used) ) {
+ if ( slapi_plugins_used ) {
slapi_int_clear_object_extensions( SLAPI_X_EXT_CONNECTION, c );
}
#endif
{
/* 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 */
/* wake write blocked operations */
slapd_clr_write( sd, 1 );
- ldap_pvt_thread_cond_signal( &c->c_write_cv );
+ if ( c->c_writewaiter ) {
+ ldap_pvt_thread_cond_signal( &c->c_write_cv );
+ ldap_pvt_thread_mutex_unlock( &c->c_mutex );
+ ldap_pvt_thread_yield();
+ ldap_pvt_thread_mutex_lock( &c->c_mutex );
+ }
}
}
{
assert( connections != NULL );
assert( index != NULL );
- assert( *index <= SLAPD_GLOBAL(dtblsize) );
+ assert( *index <= dtblsize );
if( c != NULL ) {
ldap_pvt_thread_mutex_unlock( &c->c_mutex );
c = NULL;
- for(; *index < SLAPD_GLOBAL(dtblsize); (*index)++) {
+ for(; *index < dtblsize; (*index)++) {
if( connections[*index].c_struct_state == SLAP_C_UNINITIALIZED ) {
assert( connections[*index].c_conn_state == SLAP_C_INVALID );
#ifndef HAVE_WINSOCK
/* FIXME: returns 0 in case of failure */
#define INCR_OP_INITIATED(index) \
do { \
- ldap_pvt_thread_mutex_lock( &SLAPD_GLOBAL(counters).sc_ops_mutex ); \
- ldap_pvt_mp_add_ulong(SLAPD_GLOBAL(counters).sc_ops_initiated_[(index)], 1); \
- ldap_pvt_thread_mutex_unlock( &SLAPD_GLOBAL(counters).sc_ops_mutex ); \
+ ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex ); \
+ ldap_pvt_mp_add_ulong(slap_counters.sc_ops_initiated_[(index)], 1); \
+ ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex ); \
} while (0)
#define INCR_OP_COMPLETED(index) \
do { \
- ldap_pvt_thread_mutex_lock( &SLAPD_GLOBAL(counters).sc_ops_mutex ); \
- ldap_pvt_mp_add_ulong(SLAPD_GLOBAL(counters).sc_ops_completed, 1); \
- ldap_pvt_mp_add_ulong(SLAPD_GLOBAL(counters).sc_ops_completed_[(index)], 1); \
- ldap_pvt_thread_mutex_unlock( &SLAPD_GLOBAL(counters).sc_ops_mutex ); \
+ ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex ); \
+ ldap_pvt_mp_add_ulong(slap_counters.sc_ops_completed, 1); \
+ ldap_pvt_mp_add_ulong(slap_counters.sc_ops_completed_[(index)], 1); \
+ ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex ); \
} 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;
ber_len_t memsiz;
- ldap_pvt_thread_mutex_lock( &SLAPD_GLOBAL(counters).sc_ops_mutex );
+ ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex );
/* FIXME: returns 0 in case of failure */
- ldap_pvt_mp_add_ulong(SLAPD_GLOBAL(counters).sc_ops_initiated, 1);
- ldap_pvt_thread_mutex_unlock( &SLAPD_GLOBAL(counters).sc_ops_mutex );
+ ldap_pvt_mp_add_ulong(slap_counters.sc_ops_initiated, 1);
+ ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex );
op->o_threadctx = ctx;
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( &SLAPD_GLOBAL(counters).sc_ops_mutex );
if ( op->o_cancel == SLAP_CANCEL_REQ ) {
- op->o_cancel = LDAP_TOO_LATE;
+ if ( rc == SLAPD_ABANDON )
+ op->o_cancel = SLAP_CANCEL_ACK;
+ else
+ op->o_cancel = LDAP_TOO_LATE;
}
while ( op->o_cancel != SLAP_CANCEL_NONE &&
op->o_cancel != SLAP_CANCEL_DONE )
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:
if ( c->c_conn_state == SLAP_C_CLIENT ) {
slapd_clr_read( s, 0 );
- ldap_pvt_thread_pool_submit( &SLAPD_GLOBAL(connection_pool),
+ ldap_pvt_thread_pool_submit( &connection_pool,
c->c_clientfunc, c->c_clientarg );
connection_return( c );
ldap_pvt_thread_mutex_unlock( &connections_mutex );
#ifdef HAVE_TLS
if ( c->c_is_tls && c->c_needs_tls_accept ) {
- rc = ldap_pvt_tls_accept( c->c_sb, SLAPD_GLOBAL(tls_ctx) );
+ rc = ldap_pvt_tls_accept( c->c_sb, slap_tls_ctx );
if ( rc < 0 ) {
#if 0 /* required by next #if 0 */
struct timeval tv;
}
#endif
if(tag == LDAP_REQ_BIND) {
- /* immediately abandon all exiting operations upon BIND */
+ /* immediately abandon all existing operations upon BIND */
connection_abandon( conn );
}
op = slap_op_alloc( ber, msgid, tag, conn->c_n_ops_received++ );
op->o_conn = conn;
- op->o_assertion = NULL;
- op->o_preread_attrs = NULL;
- op->o_postread_attrs = NULL;
- op->o_vrFilter = NULL;
/* clear state if the connection is being reused from inactive */
if ( conn->c_conn_state == SLAP_C_INACTIVE ) {
memset( &conn->c_pagedresults_state, 0, sizeof( conn->c_pagedresults_state ) );
}
- op->o_pagedresults_state = conn->c_pagedresults_state;
op->o_res_ber = NULL;
* already pending ops, let them go first. Abandon operations
* get exceptions to some, but not all, cases.
*/
- if (tag != LDAP_REQ_ABANDON && conn->c_conn_state == SLAP_C_CLOSING) {
- defer = "closing";
- } else if (tag != LDAP_REQ_ABANDON && conn->c_writewaiter) {
- defer = "awaiting write";
- } else if (conn->c_n_ops_executing >= SLAPD_GLOBAL(connection_pool_max)/2) {
- defer = "too many executing";
- } else if (conn->c_conn_state == SLAP_C_BINDING) {
- defer = "binding";
- } else if (tag != LDAP_REQ_ABANDON && conn->c_n_ops_pending) {
- defer = "pending operations";
+ switch( tag ){
+ default:
+ /* Abandon and Unbind are exempt from these checks */
+ if (conn->c_conn_state == SLAP_C_CLOSING) {
+ defer = "closing";
+ break;
+ } else if (conn->c_writewaiter) {
+ defer = "awaiting write";
+ break;
+ } else if (conn->c_n_ops_pending) {
+ defer = "pending operations";
+ break;
+ }
+ /* FALLTHRU */
+ case LDAP_REQ_ABANDON:
+ /* Unbind is exempt from these checks */
+ if (conn->c_n_ops_executing >= connection_pool_max/2) {
+ defer = "too many executing";
+ break;
+ } else if (conn->c_conn_state == SLAP_C_BINDING) {
+ defer = "binding";
+ break;
+ }
+ /* FALLTHRU */
+ case LDAP_REQ_UNBIND:
+ break;
}
if( defer ) {
int max = conn->c_dn.bv_len
- ? SLAPD_GLOBAL(conn_max_pending_auth)
- : SLAPD_GLOBAL(conn_max_pending);
+ ? slap_conn_max_pending_auth
+ : slap_conn_max_pending;
Debug( LDAP_DEBUG_ANY,
"connection_input: conn=%lu deferring operation: %s\n",
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 ) {
}
while ((op = LDAP_STAILQ_FIRST( &conn->c_pending_ops )) != NULL) {
- if ( conn->c_n_ops_executing > SLAPD_GLOBAL(connection_pool_max)/2 ) {
+ if ( conn->c_n_ops_executing > connection_pool_max/2 ) {
break;
}
LDAP_STAILQ_REMOVE_HEAD( &conn->c_pending_ops, o_next );
if (!op->o_dn.bv_len) {
op->o_authz = op->o_conn->c_authz;
- ber_dupbv( &op->o_dn, &op->o_conn->c_dn );
- ber_dupbv( &op->o_ndn, &op->o_conn->c_ndn );
+ if ( BER_BVISNULL( &op->o_conn->c_sasl_authz_dn )) {
+ ber_dupbv( &op->o_dn, &op->o_conn->c_dn );
+ ber_dupbv( &op->o_ndn, &op->o_conn->c_ndn );
+ } else {
+ ber_dupbv( &op->o_dn, &op->o_conn->c_sasl_authz_dn );
+ ber_dupbv( &op->o_ndn, &op->o_conn->c_sasl_authz_dn );
+ }
}
op->o_authtype = op->o_conn->c_authtype;
ber_dupbv( &op->o_authmech, &op->o_conn->c_authmech );
LDAP_STAILQ_INSERT_TAIL( &op->o_conn->c_ops, op, o_next );
- status = ldap_pvt_thread_pool_submit( &SLAPD_GLOBAL(connection_pool),
+ status = ldap_pvt_thread_pool_submit( &connection_pool,
connection_operation, (void *) op );
if ( status != 0 ) {
int connection_write(ber_socket_t s)
{
Connection *c;
+ Operation *op;
assert( connections != NULL );
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,
if ( ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_NEEDS_WRITE, NULL ) ) {
slapd_set_write( s, 1 );
}
+ /* If there are ops pending because of a writewaiter, start
+ * one up.
+ */
+ while ((op = LDAP_STAILQ_FIRST( &c->c_pending_ops )) != NULL) {
+ if ( !c->c_writewaiter ) break;
+ if ( c->c_n_ops_executing > connection_pool_max/2 ) {
+ break;
+ }
+ LDAP_STAILQ_REMOVE_HEAD( &c->c_pending_ops, o_next );
+ LDAP_STAILQ_NEXT(op, o_next) = NULL;
+ /* pending operations should not be marked for abandonment */
+ assert(!op->o_abandon);
+
+ c->c_n_ops_pending--;
+ c->c_n_ops_executing++;
+
+ connection_op_activate( op );
+
+ break;
+ }
connection_return( c );
ldap_pvt_thread_mutex_unlock( &connections_mutex );
return 0;
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