From e800f104eedb7d8623ef3fdb6c709d565cf41bc1 Mon Sep 17 00:00:00 2001 From: ckolivas Date: Thu, 14 Jan 2016 10:02:09 +1100 Subject: [PATCH] Make node passthrough clients inherit their passthrough node latency --- src/stratifier.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/stratifier.c b/src/stratifier.c index 54ca017c..9e38cc07 100644 --- a/src/stratifier.c +++ b/src/stratifier.c @@ -2435,6 +2435,12 @@ static stratum_instance_t *__recruit_stratum_instance(sdata_t *sdata) return client; } +/* passthrough subclients have client_ids in the high bits */ +static inline bool passthrough_subclient(const int64_t client_id) +{ + return (client_id > 0xffffffffll); +} + /* Enter with write instance_lock held */ static stratum_instance_t *__stratum_add_instance(ckpool_t *ckp, const int64_t id, const char *address, int server) @@ -2458,6 +2464,17 @@ static stratum_instance_t *__stratum_add_instance(ckpool_t *ckp, const int64_t i /* Points to ckp sdata in ckpool mode, but is changed later in proxy * mode . */ client->sdata = sdata; + if (passthrough_subclient(id)) { + stratum_instance_t *passthrough; + int64_t pass_id = id >> 32; + + passthrough = __instance_by_id(sdata, pass_id); + if (passthrough && passthrough->node) { + client->latency = passthrough->latency; + LOGINFO("Client %"PRId64" inherited node latency of %d", + id, client->latency); + } + } return client; } @@ -2501,12 +2518,6 @@ static void connector_test_client(ckpool_t *ckp, const int64_t id) send_proc(ckp->connector, buf); } -/* passthrough subclients have client_ids in the high bits */ -static inline bool passthrough_subclient(const int64_t client_id) -{ - return (client_id > 0xffffffffll); -} - /* For creating a list of sends without locking that can then be concatenated * to the stratum_sends list. Minimises locking and avoids taking recursive * locks. Sends only to sdata bound clients (everyone in ckpool) */