Reuse connection_walk for client matters

diff --git a/servers/lloadd/client.c b/servers/lloadd/client.c
index 1b4f62a385b9369df0dbcafda74a468e324afa94..b7903d3d45960d32e3bd3bf047370ec72dc47ba5 100644 (file)
--- a/servers/lloadd/client.c
+++ b/servers/lloadd/client.c
@@ -554,39 +554,10 @@ client_destroy( LloadConnection *c )
 }
 
 void
-clients_destroy( void )
+clients_destroy( int gentle )
 {
     ldap_pvt_thread_mutex_lock( &clients_mutex );
-    while ( !LDAP_CIRCLEQ_EMPTY( &clients ) ) {
-        LloadConnection *c = LDAP_CIRCLEQ_FIRST( &clients );
-
-        ldap_pvt_thread_mutex_unlock( &clients_mutex );
-        CONNECTION_LOCK(c);
-        /* We have shut down all processing, a dying connection connection
-         * should have been reclaimed by now! */
-        assert( c->c_live );
-        /* Upstream connections have already been destroyed, there should be no
-         * ops left */
-        assert( !c->c_ops );
-        CONNECTION_DESTROY(c);
-        ldap_pvt_thread_mutex_lock( &clients_mutex );
-    }
-    ldap_pvt_thread_mutex_unlock( &clients_mutex );
-}
-
-void
-clients_walk( CONNCB apply, void *argv )
-{
-    LloadConnection *c;
-    ldap_pvt_thread_mutex_lock( &clients_mutex );
-    if ( LDAP_CIRCLEQ_EMPTY( &clients ) ) {
-        ldap_pvt_thread_mutex_unlock( &clients_mutex );
-        return;
-    }
-
-    /* Todo is it possible to do this without holding this lock? */
-    LDAP_CIRCLEQ_FOREACH ( c, &clients, c_next ) {
-        apply( c, argv );
-    }
+    connections_walk(
+            &clients_mutex, &clients, lload_connection_close, &gentle );
     ldap_pvt_thread_mutex_unlock( &clients_mutex );
 }

diff --git a/servers/lloadd/daemon.c b/servers/lloadd/daemon.c
index 4d4a8c4423b15f4b43b47ae67df4354077705673..35d9470e51eb73e9fc227b559f8bda8bb95cdebc 100644 (file)
--- a/servers/lloadd/daemon.c
+++ b/servers/lloadd/daemon.c
@@ -1396,6 +1396,9 @@ lloadd_daemon( struct event_base *daemon_base )
         ldap_pvt_thread_mutex_unlock( &b->b_mutex );
     }
 
+    /* Do the same for clients */
+    clients_destroy( 1 );
+
     for ( i = 0; i < lload_daemon_threads; i++ ) {
         /*
          * https://github.com/libevent/libevent/issues/623
@@ -1420,7 +1423,7 @@ lloadd_daemon( struct event_base *daemon_base )
 #endif
 
     lload_backends_destroy();
-    clients_destroy();
+    clients_destroy( 0 );
     lload_bindconf_free( &bindconf );
     evdns_base_free( dnsbase, 0 );
 

diff --git a/servers/lloadd/monitor.c b/servers/lloadd/monitor.c
index 176a33d4a908b807bf5d06f134cb361d3f68f428..28354cb9436c0d589b36cdbe7f32e3277d91bf41 100644 (file)
--- a/servers/lloadd/monitor.c
+++ b/servers/lloadd/monitor.c
@@ -548,7 +548,10 @@ lload_monitor_in_conn_create(
     mp_parent = e_parent->e_private;
     arg.ms = (monitor_subsys_t *)mp_parent->mp_info;
 
-    clients_walk( lload_monitor_in_conn_entry, &arg );
+    ldap_pvt_thread_mutex_lock( &clients_mutex );
+    connections_walk(
+            &clients_mutex, &clients, lload_monitor_in_conn_entry, &arg );
+    ldap_pvt_thread_mutex_unlock( &clients_mutex );
 
     return 0;
 }
@@ -935,8 +938,12 @@ lload_monitor_update_global_stats( void *ctx, void *arg )
 
     Debug( LDAP_DEBUG_TRACE, "lload_monitor_update_global_stats: "
             "updating stats\n" );
+
     /* count incoming connections */
-    clients_walk( lload_monitor_incoming_count, &tmp_stats );
+    ldap_pvt_thread_mutex_lock( &clients_mutex );
+    connections_walk( &clients_mutex, &clients, lload_monitor_incoming_count,
+            &tmp_stats );
+    ldap_pvt_thread_mutex_unlock( &clients_mutex );
 
     LDAP_CIRCLEQ_FOREACH ( b, &backend, b_next ) {
         ldap_pvt_thread_mutex_lock( &b->b_mutex );

diff --git a/servers/lloadd/proto-lload.h b/servers/lloadd/proto-lload.h
index accf5e2863c20aa9cf07ba87469818992228a3be..21885319e233e513ba0bc3c69bd00fd7ae17b545 100644 (file)
--- a/servers/lloadd/proto-lload.h
+++ b/servers/lloadd/proto-lload.h
@@ -63,8 +63,7 @@ LDAP_SLAPD_F (void) client_tls_handshake_cb( evutil_socket_t s, short what, void
 LDAP_SLAPD_F (LloadConnection *) client_init( ber_socket_t s, LloadListener *url, const char *peername, struct event_base *base, int use_tls );
 LDAP_SLAPD_F (void) client_reset( LloadConnection *c );
 LDAP_SLAPD_F (void) client_destroy( LloadConnection *c );
-LDAP_SLAPD_F (void) clients_destroy( void );
-LDAP_SLAPD_F (void) clients_walk( CONNCB apply, void *argv );
+LDAP_SLAPD_F (void) clients_destroy( int gentle );
 
 /*
  * config.c