From 3d2c9efcd725f6ee66d39762fce36c101cec294c Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Mon, 6 Feb 2017 10:19:19 +1100
Subject: [PATCH] No messages should be postponed any more to increase chance
 of local block submission and smooth out packet sizes.

---
 src/stratifier.c | 45 +++------------------------------------------
 1 file changed, 3 insertions(+), 42 deletions(-)

diff --git a/src/stratifier.c b/src/stratifier.c
index 2a3f5c3f..2b35af76 100644
--- a/src/stratifier.c
+++ b/src/stratifier.c
@@ -512,7 +512,6 @@ struct stratifier_data {
 	ckmsgq_t *sshareq;	// Stratum share sends
 	ckmsgq_t *sauthq;	// Stratum authorisations
 	ckmsgq_t *stxnq;	// Transaction requests
-	ckmsg_t *postponed;	// List of messages postponed till next update
 
 	int user_instance_id;
 
@@ -881,32 +880,6 @@ static void ssend_bulk_prepend(sdata_t *sdata, ckmsg_t *bulk_send, const int mes
 	mutex_unlock(ssends->lock);
 }
 
-/* List of messages we intentionally want to postpone till after the next bulk
- * update - eg. workinfo which is large and we don't want to delay updates */
-static void ssend_bulk_postpone(sdata_t *sdata, ckmsg_t *bulk_send, const int messages)
-{
-	ckmsgq_t *ssends = sdata->ssends;
-
-	mutex_lock(ssends->lock);
-	DL_CONCAT(sdata->postponed, bulk_send);
-	ssends->messages += messages;
-	mutex_unlock(ssends->lock);
-}
-
-/* Send any postponed bulk messages */
-static void send_postponed(sdata_t *sdata)
-{
-	ckmsgq_t *ssends = sdata->ssends;
-
-	mutex_lock(ssends->lock);
-	if (sdata->postponed) {
-		DL_CONCAT(ssends->msgs, sdata->postponed);
-		sdata->postponed = NULL;
-		pthread_cond_signal(ssends->cond);
-	}
-	mutex_unlock(ssends->lock);
-}
-
 /* Strip fields that will be recreated upstream or won't be used to minimise
  * bandwidth. */
 static void strip_fields(ckpool_t *ckp, json_t *val)
@@ -1017,15 +990,9 @@ static void send_node_workinfo(ckpool_t *ckp, sdata_t *sdata, const workbase_t *
 
 	json_decref(wb_val);
 
-	/* We send workinfo postponed till after the stratum updates are sent
-	 * out to minimise any lag seen by clients getting updates. It means
-	 * the remote node will know about the block change later which will
-	 * make it think clients are sending invalid shares (which won't count)
-	 * and potentially not be able to submit a block locally if it doesn't
-	 * have the workinfo in time. */
 	if (bulk_send) {
 		LOGINFO("Sending workinfo to mining nodes");
-		ssend_bulk_postpone(sdata, bulk_send, messages);
+		ssend_bulk_append(sdata, bulk_send, messages);
 	}
 }
 
@@ -1589,7 +1556,6 @@ out:
 
 #define SSEND_PREPEND	0
 #define SSEND_APPEND	1
-#define SSEND_POSTPONE	2
 
 /* Downstream a json message to all remote servers except for the one matching
  * client_id */
@@ -1629,9 +1595,6 @@ static void downstream_json(sdata_t *sdata, const json_t *val, const int64_t cli
 			case SSEND_APPEND:
 				ssend_bulk_append(sdata, bulk_send, messages);
 				break;
-			case SSEND_POSTPONE:
-				ssend_bulk_postpone(sdata, bulk_send, messages);
-				break;
 		}
 	}
 }
@@ -1651,7 +1614,7 @@ static void request_txns(ckpool_t *ckp, sdata_t *sdata, json_t *txns)
 		/* We don't know which remote sent the transaction hash so ask
 		 * all of them for it */
 		json_set_string(val, "method", stratum_msgs[SM_REQTXNS]);
-		downstream_json(sdata, val, 0, SSEND_POSTPONE);
+		downstream_json(sdata, val, 0, SSEND_APPEND);
 	}
 }
 
@@ -1890,7 +1853,7 @@ static void add_remote_base(ckpool_t *ckp, sdata_t *sdata, workbase_t *wb)
 
 	if (bulk_send) {
 		LOGINFO("Sending remote workinfo to %d other remote servers", messages);
-		ssend_bulk_postpone(sdata, bulk_send, messages);
+		ssend_bulk_append(sdata, bulk_send, messages);
 	}
 
 	ckdbq_add(ckp, ID_WORKINFO, val);
@@ -3571,8 +3534,6 @@ static void stratum_broadcast(sdata_t *sdata, json_t *val, const int msg_type)
 
 	if (likely(bulk_send))
 		ssend_bulk_append(sdata, bulk_send, messages);
-	if (msg_type == SM_UPDATE)
-		send_postponed(sdata);
 }
 
 static void stratum_add_send(sdata_t *sdata, json_t *val, const int64_t client_id,