Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index f42985f7cd758824cdd5c30451a1d1e596706664..5858496b14d093d41f20e4c6012f7f878bd71526 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2012 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -286,6 +286,7 @@ static long send_ldap_ber(
        Connection *conn = op->o_conn;
        ber_len_t bytes;
        long ret = 0;
+       char *close_reason;
 
        ber_get_option( ber, LBER_OPT_BER_BYTES_TO_WRITE, &bytes );
 
@@ -300,7 +301,9 @@ static long send_ldap_ber(
        conn->c_writers++;
 
        while ( conn->c_writers > 0 && conn->c_writing ) {
+               ldap_pvt_thread_pool_idle( &connection_pool );
                ldap_pvt_thread_cond_wait( &conn->c_write1_cv, &conn->c_write1_mutex );
+               ldap_pvt_thread_pool_unidle( &connection_pool );
        }
 
        /* connection was closed under us */
@@ -320,23 +323,7 @@ static long send_ldap_ber(
        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 ) {
-                               ret = 0;
-                               break;
-                       }
-                       continue;
-               }
-
                if ( ber_flush2( conn->c_sb, ber, LBER_FLUSH_FREE_NEVER ) == 0 ) {
-                       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
                        ret = bytes;
                        break;
                }
@@ -353,28 +340,36 @@ static long send_ldap_ber(
                    err, sock_errstr(err), 0 );
 
                if ( err != EWOULDBLOCK && err != EAGAIN ) {
+                       close_reason = "connection lost on write";
+fail:
                        conn->c_writers--;
                        conn->c_writing = 0;
                        ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex );
-                       connection_closing( conn, "connection lost on write" );
-
+                       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+                       connection_closing( conn, close_reason );
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
                        return -1;
                }
 
                /* wait for socket to be write-ready */
-               ldap_pvt_thread_mutex_lock( &conn->c_write2_mutex );
                conn->c_writewaiter = 1;
-               slapd_set_write( conn->c_sd, 2 );
-
                ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex );
-               ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
                ldap_pvt_thread_pool_idle( &connection_pool );
-               ldap_pvt_thread_cond_wait( &conn->c_write2_cv, &conn->c_write2_mutex );
+               err = slapd_wait_writer( conn->c_sd );
                conn->c_writewaiter = 0;
-               ldap_pvt_thread_mutex_unlock( &conn->c_write2_mutex );
                ldap_pvt_thread_pool_unidle( &connection_pool );
                ldap_pvt_thread_mutex_lock( &conn->c_write1_mutex );
+               /* 0 is timeout, so we close it.
+                * -1 is an error, close it.
+                */
+               if ( err <= 0 ) {
+                       if ( err == 0 )
+                               close_reason = "writetimeout";
+                       else
+                               close_reason = "connection lost on writewait";
+                       goto fail;
+               }
+
                if ( conn->c_writers < 0 ) {
                        ret = 0;
                        break;