write waiter handling cleanup

Follow on to commit 88d22a1ca3b28e10e6557e8aebbd75dd61fed511

Remove dead code

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 1baa4042a62819af50d88090a0721a116a5d67c9..0b542bf8d83fee3d27814fe07a4faea3175889ca 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -2929,8 +2929,6 @@ struct Connection {
 
        ldap_pvt_thread_mutex_t c_write1_mutex; /* only one pdu written at a time */
        ldap_pvt_thread_cond_t  c_write1_cv;    /* only one pdu written at a time */
-       ldap_pvt_thread_mutex_t c_write2_mutex; /* used to wait for sd write-ready */
-       ldap_pvt_thread_cond_t  c_write2_cv;    /* used to wait for sd write-ready*/
 
        BerElement      *c_currentber;  /* ber we're attempting to read */
        int                     c_writers;              /* number of writers waiting */

diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index 44d562265be7acacd58840b391902801e576274a..d01ee7777a13f80b0c6225d64c806b189f3f3e19 100644 (file)
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -225,9 +225,7 @@ slapi_int_connection_init_pb( Slapi_PBlock *pb, ber_tag_t tag )
        /* should check status of thread calls */
        ldap_pvt_thread_mutex_init( &conn->c_mutex );
        ldap_pvt_thread_mutex_init( &conn->c_write1_mutex );
-       ldap_pvt_thread_mutex_init( &conn->c_write2_mutex );
        ldap_pvt_thread_cond_init( &conn->c_write1_cv );
-       ldap_pvt_thread_cond_init( &conn->c_write2_cv );
 
        ldap_pvt_thread_mutex_lock( &conn->c_mutex );