GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Ensure the correct pool information goes with the longpoll work item.

nfactor-troky
Con Kolivas 13 years ago
parent
ae78620292
commit
291f1749d0
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      main.c

6
main.c
Unescape View File

@ -4846,7 +4846,7 @@ out:
#endif /* HAVE_OPENCL */ #endif /* HAVE_OPENCL */
/* Stage another work item from the work returned in a longpoll */ /* Stage another work item from the work returned in a longpoll */
static void convert_to_work(json_t *val, bool rolltime) static void convert_to_work(json_t *val, bool rolltime, struct pool *pool)
{ {
struct work *work; struct work *work;
bool rc; bool rc;
@ -4858,7 +4858,7 @@ static void convert_to_work(json_t *val, bool rolltime)
applog(LOG_ERR, "Could not convert longpoll data to work"); applog(LOG_ERR, "Could not convert longpoll data to work");
return; return;
} }
work->pool = current_pool(); work->pool = pool;
work->rolltime = rolltime; work->rolltime = rolltime;
/* We'll be checking this work item twice, but we already know it's /* We'll be checking this work item twice, but we already know it's
* from a new block so explicitly force the new block detection now * from a new block so explicitly force the new block detection now
@ -4951,7 +4951,7 @@ static void *longpoll_thread(void *userdata)
val = json_rpc_call(curl, lp_url, pool->rpc_userpass, rpc_req, val = json_rpc_call(curl, lp_url, pool->rpc_userpass, rpc_req,
false, true, &rolltime, pool); false, true, &rolltime, pool);
if (likely(val)) { if (likely(val)) {
convert_to_work(val, rolltime); convert_to_work(val, rolltime, pool);
failures = 0; failures = 0;
json_decref(val); json_decref(val);
} else { } else {

Write Preview
Loading…
Cancel
Save