mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Experimental fix for deadlock

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-09-02 00:19:06 +00:00
parent 5518aefda0
commit 309c458ed4
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
servers/slapd/connection.c
View File

@ -1099,14 +1099,33 @@ connection_resched( Connection *conn )
if( conn->c_conn_state == SLAP_C_CLOSING ) {
ber_socket_t sd;
ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_GET_FD, &sd );
Debug( LDAP_DEBUG_TRACE,
"connection_resched: attempting closing conn=%ld sd=%d\n",
"connection_resched: reaquiring locks conn=%ld sd=%d\n",
conn->c_connid, sd, 0 );
/* reaquire locks in the right order... this may
* allow another thread to close this connection,
* so recheck state
*/
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
ldap_pvt_thread_mutex_lock( &connections_mutex );
connection_close( conn );
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
if( conn->c_conn_state != SLAP_C_CLOSING ) {
Debug( LDAP_DEBUG_TRACE,
"connection_resched: closed by other thread conn=%ld sd=%d\n",
conn->c_connid, sd, 0 );
} else {
Debug( LDAP_DEBUG_TRACE,
"connection_resched: attempting closing conn=%ld sd=%d\n",
conn->c_connid, sd, 0 );
connection_close( conn );
}
ldap_pvt_thread_mutex_unlock( &connections_mutex );
return 0;
}