MINOR: peers: Track number of applets run by thread
Maintain number of peers applets run on all threads. It will be used
in next patch for least loaded thread selection.
diff --git a/include/haproxy/peers-t.h b/include/haproxy/peers-t.h
index 6a2e749..6a1c215 100644
--- a/include/haproxy/peers-t.h
+++ b/include/haproxy/peers-t.h
@@ -102,6 +102,7 @@
unsigned int resync_timeout; /* resync timeout timer */
int count; /* total of peers */
int disabled; /* peers proxy disabled if >0 */
+ int applet_count[MAX_THREADS]; /* applet count per thread */
};
/* LRU cache for dictionaies */
diff --git a/src/peers.c b/src/peers.c
index 0e48004..d46afcf 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -1035,10 +1035,14 @@
void __peer_session_deinit(struct peer *peer)
{
struct peers *peers = peer->peers;
+ int thr;
if (!peers || !peer->appctx)
return;
+ thr = my_ffsl(peer->appctx->t->thread_mask) - 1;
+ HA_ATOMIC_DEC(&peers->applet_count[thr]);
+
if (peer->appctx->st0 == PEER_SESS_ST_WAITMSG)
HA_ATOMIC_DEC(&connected_peers);
@@ -3192,6 +3196,7 @@
static struct appctx *peer_session_create(struct peers *peers, struct peer *peer)
{
struct appctx *appctx;
+ unsigned int thr = tid;
peer->new_conn++;
peer->reconnect = tick_add(now_ms, MS_TO_TICKS(PEER_RECONNECT_TIMEOUT));
@@ -3210,6 +3215,7 @@
if (appctx_init(appctx) == -1)
goto out_free_appctx;
+ HA_ATOMIC_INC(&peers->applet_count[thr]);
return appctx;
/* Error unrolling */
@@ -3492,6 +3498,7 @@
if (!peers->sync_task)
return 0;
+ memset(peers->applet_count, 0, sizeof(peers->applet_count));
peers->sync_task->process = process_peer_sync;
peers->sync_task->context = (void *)peers;
peers->sighandler = signal_register_task(0, peers->sync_task, 0);