mirror of
https://github.com/GOSTSec/sgminer
synced 2025-02-02 10:04:33 +00:00
Ensure the correct pool information goes with the longpoll work item.
This commit is contained in:
parent
ae78620292
commit
291f1749d0
6
main.c
6
main.c
@ -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 {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user