fix previous commit (ITS#5819)

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 957662fde75bcd0d98cbf263d9f2c70ab6db3850..22dbd8513e4e1cb913f44cb3ebbe5ada9933fa53 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -423,8 +423,10 @@ Connection * connection_init(
 
        if ( flags & CONN_IS_CLIENT ) {
                c->c_connid = 0;
+               ldap_pvt_thread_mutex_lock( &connections_mutex );
                c->c_conn_state = SLAP_C_CLIENT;
                c->c_struct_state = SLAP_C_USED;
+               ldap_pvt_thread_mutex_unlock( &connections_mutex );
                c->c_close_reason = "?";                        /* should never be needed */
                ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_FD, &sfd );
                ldap_pvt_thread_mutex_unlock( &c->c_mutex );
@@ -508,8 +510,10 @@ Connection * connection_init(
        id = c->c_connid = conn_nextid++;
        ldap_pvt_thread_mutex_unlock( &conn_nextid_mutex );
 
+       ldap_pvt_thread_mutex_lock( &connections_mutex );
        c->c_conn_state = SLAP_C_INACTIVE;
        c->c_struct_state = SLAP_C_USED;
+       ldap_pvt_thread_mutex_unlock( &connections_mutex );
        c->c_close_reason = "?";                        /* should never be needed */
 
        c->c_ssf = c->c_transport_ssf = ssf;
@@ -843,12 +847,12 @@ Connection* connection_next( Connection *c, ber_socket_t *index )
        for(; *index < dtblsize; (*index)++) {
                int c_struct;
                if( connections[*index].c_struct_state == SLAP_C_UNINITIALIZED ) {
+                       /* FIXME: accessing c_conn_state without locking c_mutex */
                        assert( connections[*index].c_conn_state == SLAP_C_INVALID );
                        continue;
                }
 
                if( connections[*index].c_struct_state == SLAP_C_USED ) {
-                       assert( connections[*index].c_conn_state != SLAP_C_INVALID );
                        c = &connections[(*index)++];
                        if ( ldap_pvt_thread_mutex_trylock( &c->c_mutex )) {
                                /* avoid deadlock */
@@ -861,6 +865,7 @@ Connection* connection_next( Connection *c, ber_socket_t *index )
                                        continue;
                                }
                        }
+                       assert( c->c_conn_state != SLAP_C_INVALID );
                        break;
                }
 
@@ -868,6 +873,7 @@ Connection* connection_next( Connection *c, ber_socket_t *index )
                if ( c_struct == SLAP_C_PENDING )
                        continue;
                assert( c_struct == SLAP_C_UNUSED );
+               /* FIXME: accessing c_conn_state without locking c_mutex */
                assert( connections[*index].c_conn_state == SLAP_C_INVALID );
        }
 
@@ -971,12 +977,13 @@ conn_counter_init( Operation *op, void *ctx )
        slap_counters_t *sc;
        void *vsc = NULL;
 
-       if ( ldap_pvt_thread_pool_getkey( ctx, conn_counter_init, &vsc, NULL ) || !vsc ) {
+       if ( ldap_pvt_thread_pool_getkey(
+                       ctx, (void *)conn_counter_init, &vsc, NULL ) || !vsc ) {
                vsc = ch_malloc( sizeof( slap_counters_t ));
                sc = vsc;
                slap_counters_init( sc );
-               ldap_pvt_thread_pool_setkey( ctx, conn_counter_init, vsc,
-                       conn_counter_destroy );
+               ldap_pvt_thread_pool_setkey( ctx, (void*)conn_counter_init, vsc,
+                       conn_counter_destroy, NULL, NULL );
 
                ldap_pvt_thread_mutex_lock( &slap_counters.sc_mutex );
                sc->sc_next = slap_counters.sc_next;
@@ -1149,7 +1156,6 @@ Connection *connection_client_setup(
                c->c_clientarg = arg;
 
                slapd_add_internal( sfd, 0 );
-               slapd_set_read( sfd, 1 );
        }
        return c;
 }
@@ -1620,6 +1626,9 @@ connection_resched( Connection *conn )
 {
        Operation *op;
 
+       if( conn->c_writewaiter )
+               return 0;
+
        if( conn->c_conn_state == SLAP_C_CLOSING ) {
                Debug( LDAP_DEBUG_TRACE, "connection_resched: "
                        "attempting closing conn=%lu sd=%d\n",
@@ -1628,7 +1637,7 @@ connection_resched( Connection *conn )
                return 0;
        }
 
-       if( conn->c_conn_state != SLAP_C_ACTIVE || conn->c_writewaiter ) {
+       if( conn->c_conn_state != SLAP_C_ACTIVE ) {
                /* other states need different handling */
                return 0;
        }
@@ -1946,15 +1955,15 @@ connection_fake_init2(
                void *ebx = NULL;
 
                /* Use thread keys to make sure these eventually get cleaned up */
-               if ( ldap_pvt_thread_pool_getkey( ctx, connection_fake_init, &ebx,
-                       NULL )) {
+               if ( ldap_pvt_thread_pool_getkey( ctx, (void *)connection_fake_init,
+                               &ebx, NULL )) {
                        eb = ch_malloc( sizeof( *eb ));
                        slapi_int_create_object_extensions( SLAPI_X_EXT_CONNECTION, conn );
                        slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
                        eb->eb_conn = conn->c_extensions;
                        eb->eb_op = op->o_hdr->oh_extensions;
-                       ldap_pvt_thread_pool_setkey( ctx, connection_fake_init, eb,
-                               connection_fake_destroy );
+                       ldap_pvt_thread_pool_setkey( ctx, (void *)connection_fake_init,
+                               eb, connection_fake_destroy, NULL, NULL );
                } else {
                        eb = ebx;
                        conn->c_extensions = eb->eb_conn;