upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 23:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reuse connection walking in monitor for upstreams too

Browse source
This commit is contained in:
Ondřej Kuzník 2019-04-16 17:12:51 +01:00
parent 3bd2d7483e
commit 63efcd63eb
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
servers/lloadd/monitor.c
View file

@ -637,9 +637,11 @@ lload_monitor_up_conn_create(
{ {
monitor_entry_t *mp_parent; monitor_entry_t *mp_parent;
monitor_subsys_t *ms; monitor_subsys_t *ms;
LloadConnection *c;
LloadBackend *b; LloadBackend *b;
struct lload_monitor_conn_arg *arg; struct lload_monitor_conn_arg arg = {
.op = op,
.ep = ep,
};
assert( e_parent->e_private != NULL ); assert( e_parent->e_private != NULL );
@ -651,23 +653,16 @@ lload_monitor_up_conn_create(
return -1; return -1;
} }
arg = ch_calloc( 1, sizeof(struct lload_monitor_conn_arg) ); arg.ms = ms;
arg->op = op;
arg->ep = ep;
arg->ms = ms;
/* How to avoid this long lock? */
ldap_pvt_thread_mutex_lock( &b->b_mutex ); ldap_pvt_thread_mutex_lock( &b->b_mutex );
LDAP_CIRCLEQ_FOREACH ( c, &b->b_conns, c_next ) { connections_walk_last( &b->b_mutex, &b->b_conns, b->b_last_conn,
lload_monitor_up_conn_entry( c, arg ); lload_monitor_up_conn_entry, &arg );
}
LDAP_CIRCLEQ_FOREACH ( c, &b->b_bindconns, c_next ) { connections_walk_last( &b->b_mutex, &b->b_bindconns, b->b_last_bindconn,
lload_monitor_up_conn_entry( c, arg ); lload_monitor_up_conn_entry, &arg );
}
ldap_pvt_thread_mutex_unlock( &b->b_mutex ); ldap_pvt_thread_mutex_unlock( &b->b_mutex );
ch_free( arg );
return 0; return 0;
} }