Commit 18e5e729 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Resched changes struct state without lock to avoid deadlock.

Hence connection_get must recheck struct state after obtaining
c_mutex to detect close.
parent 35e91be4
......@@ -158,14 +158,6 @@ static Connection* connection_get( int s )
assert( c->c_struct_state != SLAP_C_UNINITIALIZED );
if( c->c_struct_state != SLAP_C_USED ) {
/* connection must have been closed */
assert( c->c_conn_state == SLAP_C_INVALID );
assert( !ber_pvt_sb_in_use( c->c_sb ) );
return NULL;
}
#else
c = NULL;
{
......@@ -199,7 +191,18 @@ static Connection* connection_get( int s )
if( c != NULL ) {
ldap_pvt_thread_mutex_lock( &c->c_mutex );
/* we do this AFTER locking to aid in debugging */
if( c->c_struct_state != SLAP_C_USED ) {
/* connection must have been closed due to resched */
assert( c->c_conn_state == SLAP_C_INVALID );
assert( !ber_pvt_sb_in_use( c->c_sb ) );
Debug( LDAP_DEBUG_TRACE,
"connection_get(%d): connection not used.\n",
s, c->c_connid, 0 );
return NULL;
}
Debug( LDAP_DEBUG_TRACE,
"connection_get(%d): got connid=%ld\n",
s, c->c_connid, 0 );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment