static ldap_pvt_thread_mutex_t* connections_mutex;
static Connection **connections = NULL;
-/* set to the number of processors */
+/* set to the number of processors (round up to a power of 2) */
# define NUM_CONNECTION_ARRAY 4
/* partition the array in a modulo manner */
# define MCA_conn_array_id(fd) ((int)(fd)%NUM_CONNECTION_ARRAY)
# define MCA_conn_array_element_id(fd) ((int)(fd)/NUM_CONNECTION_ARRAY)
-# define MCA_GET_CONNECTION(fd) (&(connections[MCA_conn_array_id(fd)])\
+# define MCA_GET_CONNECTION(fd) (&(connections[MCA_conn_array_id(fd)]) \
[MCA_conn_array_element_id(fd)])
# define MCA_GET_CONN_MUTEX(fd) (&connections_mutex[MCA_conn_array_id(fd)])
static Connection* connection_get( ber_socket_t s );
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
static int connection_input( Connection *c, Operation** op );
#else
static int connection_input( Connection *c );
static void connection_close( Connection *c );
static int connection_op_activate( Operation *op );
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
static void connection_op_queue( Operation *op );
#endif
static int connection_resched( Connection *conn );
return -1;
}
- connections_mutex = (ldap_pvt_thread_mutex_t*) ch_calloc( NUM_CONNECTION_ARRAY, sizeof(ldap_pvt_thread_mutex_t) );
+ connections_mutex = (ldap_pvt_thread_mutex_t*) ch_calloc(
+ NUM_CONNECTION_ARRAY, sizeof(ldap_pvt_thread_mutex_t) );
if( connections_mutex == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "connections_init: allocation of connection mutex[%d] failed\n", i, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "connections_init: "
+ "allocation of connection mutex[%d] failed\n", i, 0, 0 );
return -1;
}
- connections = (Connection**) ch_calloc( NUM_CONNECTION_ARRAY, sizeof(Connection*));
+ connections = (Connection**) ch_calloc(
+ NUM_CONNECTION_ARRAY, sizeof(Connection*));
if( connections == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "connections_init: allocation of connection[%d] failed\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "connections_init: "
+ "allocation of connection[%d] failed\n", 0, 0, 0 );
return -1;
}
for ( i = 0; i < NUM_CONNECTION_ARRAY; i++ ) {
ldap_pvt_thread_mutex_init( connections_mutex+i );
- connections[i] = (Connection*) ch_calloc( (dtblsize/NUM_CONNECTION_ARRAY), sizeof(Connection) );
+ connections[i] = (Connection*) ch_calloc(
+ dtblsize/NUM_CONNECTION_ARRAY, sizeof(Connection) );
if( connections[i] == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "connections_init: allocation (%d*%ld) of connection array[%d] failed\n",
+ Debug( LDAP_DEBUG_ANY, "connections_init: "
+ "allocation (%d*%ld) of connection array[%d] failed\n",
dtblsize, (long) sizeof(Connection), i );
return -1;
}
ldap_pvt_thread_mutex_init( &conn_nextid_mutex );
assert( connections[0]->c_struct_state == SLAP_C_UNINITIALIZED );
- assert( connections[NUM_CONNECTION_ARRAY-1]->c_struct_state == SLAP_C_UNINITIALIZED );
+ assert( connections[NUM_CONNECTION_ARRAY-1]->c_struct_state ==
+ SLAP_C_UNINITIALIZED );
for ( i = 0; i < NUM_CONNECTION_ARRAY; i++ ) {
conn = connections[i];
connections = (Connection *) ch_calloc( dtblsize, sizeof(Connection) );
if( connections == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "connections_init: allocation (%d*%ld) of connection array failed\n",
+ Debug( LDAP_DEBUG_ANY, "connections_init: "
+ "allocation (%d*%ld) of connection array failed\n",
dtblsize, (long) sizeof(Connection), 0 );
return -1;
}
{
/* Don't timeout a slow-running request or a persistent
* outbound connection */
- if( c->c_n_ops_executing ||
- c->c_conn_state == SLAP_C_CLIENT ) continue;
+ if( c->c_n_ops_executing || c->c_conn_state == SLAP_C_CLIENT ) {
+ continue;
+ }
if( difftime( c->c_activitytime+global_idletimeout, now) < 0 ) {
/* close it */
assert( connections != NULL );
- if(s == AC_SOCKET_INVALID) {
- return NULL;
- }
+ if(s == AC_SOCKET_INVALID) return NULL;
#ifndef HAVE_WINSOCK
c = MCA_GET_CONNECTION(s);
break;
}
- if( connections[i].c_conn_state == SLAP_C_CLIENT ) {
- continue;
- }
+ if( connections[i].c_conn_state == SLAP_C_CLIENT ) continue;
assert( connections[i].c_struct_state == SLAP_C_USED );
assert( connections[i].c_conn_state != SLAP_C_INVALID );
assert( index != NULL );
assert( *index <= (dtblsize/NUM_CONNECTION_ARRAY) );
- if( c != NULL ) {
- ldap_pvt_thread_mutex_unlock( &c->c_mutex );
- }
+ if( c != NULL ) ldap_pvt_thread_mutex_unlock( &c->c_mutex );
c = NULL;
assert( conn->c_conn_state == SLAP_C_INVALID );
}
- if( c != NULL ) {
- ldap_pvt_thread_mutex_lock( &c->c_mutex );
- }
+ if( c != NULL ) ldap_pvt_thread_mutex_lock( &c->c_mutex );
return c;
assert( index != NULL );
assert( *index <= dtblsize );
- if( c != NULL ) {
- ldap_pvt_thread_mutex_unlock( &c->c_mutex );
- }
+ if( c != NULL ) ldap_pvt_thread_mutex_unlock( &c->c_mutex );
c = NULL;
assert( connections[*index].c_conn_state == SLAP_C_INVALID );
}
- if( c != NULL ) {
- ldap_pvt_thread_mutex_lock( &c->c_mutex );
- }
-
+ if( c != NULL ) ldap_pvt_thread_mutex_lock( &c->c_mutex );
return c;
}
#endif
assert( connections != NULL );
- if( c != NULL ) {
- ldap_pvt_thread_mutex_unlock( &c->c_mutex );
- }
+ if( c != NULL ) ldap_pvt_thread_mutex_unlock( &c->c_mutex );
#ifdef SLAP_MULTI_CONN_ARRAY
for ( conn_array_id = 0;
}
if ( op->o_cancel == SLAP_CANCEL_REQ ) {
- if ( rc == SLAPD_ABANDON )
+ if ( rc == SLAPD_ABANDON ) {
op->o_cancel = SLAP_CANCEL_ACK;
- else
+ } else {
op->o_cancel = LDAP_TOO_LATE;
+ }
}
while ( op->o_cancel != SLAP_CANCEL_NONE &&
op->o_cancel != SLAP_CANCEL_DONE )
case LBER_ERROR:
case LDAP_REQ_UNBIND:
/* c_mutex is locked */
- connection_closing(
- conn, tag == LDAP_REQ_UNBIND ? NULL : "operations error" );
+ connection_closing( conn,
+ tag == LDAP_REQ_UNBIND ? NULL : "operations error" );
break;
case LDAP_REQ_BIND:
c = connection_get( s );
c->c_clientfunc = func;
c->c_clientarg = arg;
- connection_return( c );
+
slapd_add_internal( s, 0 );
slapd_set_read( s, 1 );
+ connection_return( c );
return 0;
}
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
- connection_return( c );
slapd_remove( s, 0, 1 );
+ connection_return( c );
}
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
+static int connection_read( ber_socket_t s, Operation** op );
+
static void* connection_read_thread( void* ctx, void* argv )
{
int rc ;
int connection_read_activate( ber_socket_t s )
{
- int status;
+ int rc;
/*
* suspend reading on this file descriptor until a connection processing
* thread reads data on it. Otherwise the listener thread will repeatedly
* submit the same event on it to the pool.
*/
- if( !slapd_suspend( s ) ) return 0;
+ slapd_clr_read( s, 0 );
- status = ldap_pvt_thread_pool_submit( &connection_pool,
+ rc = ldap_pvt_thread_pool_submit( &connection_pool,
connection_read_thread, (void *) s );
- if( status != 0 ) {
- Debug( LDAP_DEBUG_ANY, "connection_processing_activiate(%d): "
- "ldap_pvt_thread_pool_submit failed\n",
- s, 0, 0 );
- return -1;
+ if( rc != 0 ) {
+ Debug( LDAP_DEBUG_ANY,
+ "connection_read_activiate(%d): submit failed (%d)\n",
+ s, rc, 0 );
}
- return 1;
+ return rc;
}
#endif
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
-int connection_read( ber_socket_t s, Operation** op )
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
+static int
+connection_read( ber_socket_t s, Operation** op )
#else
int connection_read(ber_socket_t s)
#endif
{
int rc = 0;
Connection *c;
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
- int need_resume = 1;
-#endif
assert( connections != NULL );
Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): closing, ignoring input for id=%lu\n",
s, c->c_connid, 0 );
- connection_return( c );
- ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
- slapd_resume( s );
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
+ slapd_set_read( s, 1 );
#endif
+ connection_return( c );
+ ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
return 0;
}
if ( c->c_conn_state == SLAP_C_CLIENT ) {
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
- slapd_resume( s );
-#endif
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
+ /* read should already be cleared */
+#else
slapd_clr_read( s, 0 );
+#endif
ldap_pvt_thread_pool_submit( &connection_pool,
c->c_clientfunc, c->c_clientarg );
rc = ldap_pvt_tls_accept( c->c_sb, slap_tls_ctx );
if ( rc < 0 ) {
Debug( LDAP_DEBUG_TRACE,
- "connection_read(%d): TLS accept error "
+ "connection_read(%d): TLS accept failure "
"error=%d id=%lu, closing\n",
s, rc, c->c_connid );
#endif
connection_close( c );
+ connection_return( c );
+ ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
+ return 0;
} else if ( rc == 0 ) {
void *ssl;
if( rc != 0 ||
!ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DATA_READY, NULL ) )
{
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
+ slapd_set_read( s, 1 );
+#endif
+
connection_return( c );
ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
-
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
- slapd_resume( s );
-#endif
return 0;
}
}
if ( c->c_sasl_layers ) {
/* If previous layer is not removed yet, give up for now */
if ( !c->c_sasl_sockctx ) {
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
+ slapd_set_read( s, 1 );
+#endif
+
connection_return( c );
ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
-
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
- slapd_resume( s );
-#endif
return 0;
}
s, rc, c->c_connid );
/* connections_mutex and c_mutex are locked */
-
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
- slapd_resume( s );
-#endif
connection_closing( c, "SASL layer install failure" );
connection_close( c );
connection_return( c );
do {
/* How do we do this without getting into a busy loop ? */
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
rc = connection_input( c, op );
#else
rc = connection_input( c );
#endif
-
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
- if( *op && (*op)->o_tag == LDAP_REQ_UNBIND ) {
- /*
- * After the reception of an unbind request,
- * no more incoming requests via the connection
- * is expected. Therefore, don't resume connection reading.
- */
- need_resume = 0;
- }
-#endif
}
#ifdef DATA_READY_LOOP
while( !rc && ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DATA_READY, NULL ));
return 0;
}
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
- if ( need_resume ) slapd_resume( s );
-#endif
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
+ if ( ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_NEEDS_WRITE, NULL ) ) {
+ slapd_set_write( s, 0 );
+ }
+ slapd_set_read( s, 1 );
+#else
if ( ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_NEEDS_READ, NULL ) ) {
slapd_set_read( s, 1 );
}
if ( ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_NEEDS_WRITE, NULL ) ) {
slapd_set_write( s, 1 );
}
+#endif
connection_return( c );
ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
}
static int
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
connection_input( Connection *conn , Operation** c_op )
#else
connection_input( Connection *conn )
} else {
conn->c_n_ops_executing++;
-#ifdef SLAP_LIGHTWEIGHT_LISTENER
+#if 0
/*
* The first op will be processed in the same thread context,
* Subsequent ops will be submitted to the pool by
static int connection_op_activate( Operation *op )
{
- int status;
+ int rc;
ber_tag_t tag = op->o_tag;
connection_op_queue( op );
- status = ldap_pvt_thread_pool_submit( &connection_pool,
+ rc = ldap_pvt_thread_pool_submit( &connection_pool,
connection_operation, (void *) op );
- if ( status != 0 ) {
+ if ( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "ldap_pvt_thread_pool_submit: failed (%d) for conn=%lu\n",
- status, op->o_connid, 0 );
+ "connection_op_activate: submit failed (%d) for conn=%lu\n",
+ rc, op->o_connid, 0 );
/* should move op to pending list */
}
- return status;
+ return rc;
}
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
+int connection_write_activate( ber_socket_t s )
+{
+ int rc;
+
+ /*
+ * suspend reading on this file descriptor until a connection processing
+ * thread write data on it. Otherwise the listener thread will repeatedly
+ * submit the same event on it to the pool.
+ */
+
+#ifndef SLAP_LIGHTWEIGHT_DISPATCHER
+ slapd_clr_write( s, 0);
+ c->c_n_write++;
+#endif
+
+ rc = ldap_pvt_thread_pool_submit( &connection_pool,
+ connection_read_thread, (void *) s );
+
+ if( rc != 0 ) {
+ Debug( LDAP_DEBUG_ANY,
+ "connection_write_activiate(%d): submit failed (%d)\n",
+ (int) s, rc, 0 );
+ }
+ return rc;
+}
+
+static
+#endif
int connection_write(ber_socket_t s)
{
Connection *c;
return -1;
}
+#ifndef SLAP_LIGHTWEIGHT_DISPATCHER
slapd_clr_write( s, 0);
c->c_n_write++;
+#endif
Debug( LDAP_DEBUG_TRACE,
"connection_write(%d): waking output for id=%lu\n",
break;
}
- connection_return( c );
+ connection_return( c );
ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
-
return 0;
}
projects / openldap / blobdiff