From 4cd432475db93cacbceb19c89731b586910bf2a7 Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Tue, 3 Jan 2017 12:59:54 +1100
Subject: [PATCH] Decrease the parent's recruit count after sending the
 stratifier the new subscribe so it can get an accurate headroom count before
 requesting more proxies.

---
 src/generator.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/generator.c b/src/generator.c
index a9a534db..6df23ef5 100644
--- a/src/generator.c
+++ b/src/generator.c
@@ -569,7 +569,6 @@ static bool parse_subscribe(connsock_t *cs, proxy_instance_t *proxi)
 {
 	json_t *val = NULL, *res_val, *notify_val, *tmp;
 	bool parsed, ret = false;
-	proxy_instance_t *parent;
 	int retries = 0, size;
 	const char *string;
 	char *buf, *old;
@@ -654,13 +653,6 @@ retry:
 	}
 	proxi->nonce2len = size;
 	proxi->clients_per_proxy = 1ll << ((size - 3) * 8);
-	parent = proxi->parent;
-
-	mutex_lock(&parent->proxy_lock);
-	parent->recruit -= proxi->clients_per_proxy;
-	if (parent->recruit < 0)
-		parent->recruit = 0;
-	mutex_unlock(&parent->proxy_lock);
 
 	LOGNOTICE("Found notify for new proxy %d:%d with enonce %s nonce2len %d", proxi->id,
 		proxi->subid, proxi->enonce1, proxi->nonce2len);
@@ -2004,6 +1996,19 @@ out:
 	proxi->alive = ret;
 	cksem_post(&cs->sem);
 
+	/* Decrease the parent's recruit count after sending the stratifier the
+	 * new subscribe so it can get an accurate headroom count before
+	 * requesting more proxies. */
+	if (ret) {
+		proxy_instance_t *parent = proxi->parent;
+
+		mutex_lock(&parent->proxy_lock);
+		parent->recruit -= proxi->clients_per_proxy;
+		if (parent->recruit < 0)
+			parent->recruit = 0;
+		mutex_unlock(&parent->proxy_lock);
+	}
+
 	return ret;
 }