Browse Source

Remove EOS marker in userstats in preparation for moving from client to worker stats

master
Con Kolivas 10 years ago
parent
commit
f85089eeec
  1. 13
      src/stratifier.c

13
src/stratifier.c

@ -3173,9 +3173,9 @@ out:
static void update_userstats(ckpool_t *ckp) static void update_userstats(ckpool_t *ckp)
{ {
stratum_instance_t *client, *tmp; stratum_instance_t *client, *tmp;
json_t *val = NULL;
char cdfield[64]; char cdfield[64];
time_t now_t; time_t now_t;
json_t *val;
ts_t ts_now; ts_t ts_now;
if (++stats.userstats_cycle > 0x1f) if (++stats.userstats_cycle > 0x1f)
@ -3204,11 +3204,6 @@ static void update_userstats(ckpool_t *ckp)
if (cycle_mask != stats.userstats_cycle) if (cycle_mask != stats.userstats_cycle)
continue; continue;
if (val) {
json_set_bool(val,"eos", false);
ckdbq_add(ckp, ID_USERSTATS, val);
val = NULL;
}
elapsed = now_t - client->start_time; elapsed = now_t - client->start_time;
ghs1 = client->dsps1 * nonces; ghs1 = client->dsps1 * nonces;
ghs5 = client->dsps5 * nonces; ghs5 = client->dsps5 * nonces;
@ -3230,12 +3225,8 @@ static void update_userstats(ckpool_t *ckp)
"createcode", __func__, "createcode", __func__,
"createinet", ckp->serverurl); "createinet", ckp->serverurl);
client->notified_idle = client->idle; client->notified_idle = client->idle;
}
/* Mark the last userstats sent on this pass of stats with an end of
* stats marker. */
if (val) {
json_set_bool(val,"eos", true);
ckdbq_add(ckp, ID_USERSTATS, val); ckdbq_add(ckp, ID_USERSTATS, val);
val = NULL;
} }
ck_runlock(&instance_lock); ck_runlock(&instance_lock);
} }

Loading…
Cancel
Save