From: Quanah Gibson-Mount Date: Thu, 7 Mar 2019 23:31:44 +0000 (+0000) Subject: write waiter handling cleanup X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~67^2~94 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a32cab8b7295d96078a50fdf5688ddd674c4b7ee;p=thirdparty%2Fopenldap.git 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 1baa4042a6..0b542bf8d8 100644 --- 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 44d562265b..d01ee7777a 100644 --- 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 );