From 344935a932acdc58ae395126964c6e31897b89e1 Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Sat, 27 Feb 2016 09:24:43 +1100
Subject: [PATCH] Reinstate "Microoptimise ckdbq_process"

This reverts commit f35f54a6428a99bacad6daedbd7cd8367c985242.
---
 src/stratifier.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/stratifier.c b/src/stratifier.c
index 95567f70..f55825a1 100644
--- a/src/stratifier.c
+++ b/src/stratifier.c
@@ -6779,7 +6779,7 @@ static bool test_and_clear(bool *val, mutex_t *lock)
 static void ckdbq_process(ckpool_t *ckp, char *msg)
 {
 	sdata_t *sdata = ckp->sdata;
-	size_t responselen = 0;
+	size_t responselen;
 	char *buf = NULL;
 
 	while (!buf) {
@@ -6799,16 +6799,15 @@ static void ckdbq_process(ckpool_t *ckp, char *msg)
 
 	/* Process any requests from ckdb that are heartbeat responses with
 	 * specific requests. */
-	if (likely(buf))
-		responselen = strlen(buf);
-	if (likely(responselen > 0)) {
+	responselen = strlen(buf);
+	if (likely(responselen > 1)) {
 		char *response = alloca(responselen);
 		int offset = 0;
 
 		memset(response, 0, responselen);
-		if (sscanf(buf, "%*d.%*d.%c%n", response, &offset) > 0) {
-			strcpy(response+1, buf+offset);
-			if (safecmp(response, "ok")) {
+		if (likely(sscanf(buf, "%*d.%*d.%c%n", response, &offset) > 0)) {
+			strcpy(response + 1, buf + offset);
+			if (likely(safecmp(response, "ok"))) {
 				char *cmd;
 
 				cmd = response;
@@ -6822,8 +6821,8 @@ static void ckdbq_process(ckpool_t *ckp, char *msg)
 				LOGWARNING("Got ckdb failure response: %s", buf);
 		} else
 			LOGWARNING("Got bad ckdb response: %s", buf);
-		free(buf);
 	}
+	free(buf);
 }
 
 static int transactions_by_jobid(sdata_t *sdata, const int64_t id)