From 1ca5fe851f6d4f21658364b8b68af2bf890d39d8 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 1 Jul 2009 03:01:08 +0000 Subject: [PATCH] ITS#5836, #6089 fix c_writers counting --- servers/slapd/result.c | 26 +++++++++++++++++--------- servers/slapd/slap.h | 1 + 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/servers/slapd/result.c b/servers/slapd/result.c index 4b222da640..3ce9e29bd9 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -139,40 +139,46 @@ static long send_ldap_ber( Connection *conn = op->o_conn; ber_len_t bytes; long ret = 0; - int closing = 0; ber_get_option( ber, LBER_OPT_BER_BYTES_TO_WRITE, &bytes ); /* write only one pdu at a time - wait til it's our turn */ ldap_pvt_thread_mutex_lock( &conn->c_write1_mutex ); - if (( op->o_abandon && !op->o_cancel ) || !connection_valid( conn )) { + if (( op->o_abandon && !op->o_cancel ) || !connection_valid( conn ) || + conn->c_writers < 0 ) { ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex ); return 0; } - while ( conn->c_writers > 0 ) { + + conn->c_writers++; + + while ( conn->c_writers > 0 && conn->c_writing ) { ldap_pvt_thread_cond_wait( &conn->c_write1_cv, &conn->c_write1_mutex ); } + /* connection was closed under us */ if ( conn->c_writers < 0 ) { - closing = 1; /* we're the last waiter, let the closer continue */ if ( conn->c_writers == -1 ) ldap_pvt_thread_cond_signal( &conn->c_write1_cv ); - } - - conn->c_writers++; - - if ( closing ) { + conn->c_writers++; ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex ); return 0; } + /* Our turn */ + conn->c_writing = 1; + /* write the pdu */ while( 1 ) { int err; /* lock the connection */ if ( ldap_pvt_thread_mutex_trylock( &conn->c_mutex )) { + if ( !connection_valid(conn)) { + ret = 0; + break; + } ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex ); ldap_pvt_thread_mutex_lock( &conn->c_write1_mutex ); if ( conn->c_writers < 0 ) { @@ -201,6 +207,7 @@ static long send_ldap_ber( if ( err != EWOULDBLOCK && err != EAGAIN ) { conn->c_writers--; + conn->c_writing = 0; ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex ); connection_closing( conn, "connection lost on write" ); @@ -225,6 +232,7 @@ static long send_ldap_ber( } } + conn->c_writing = 0; if ( conn->c_writers < 0 ) { conn->c_writers++; if ( !conn->c_writers ) diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index fa87f66608..f5002c6039 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -2809,6 +2809,7 @@ struct Connection { BerElement *c_currentber; /* ber we're attempting to read */ int c_writers; /* number of writers waiting */ + char c_writing; /* someone is writing */ char c_sasl_bind_in_progress; /* multi-op bind in progress */ char c_writewaiter; /* true if blocked on write */ -- 2.39.5