GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-02 18:14:20 +00:00
Code Issues Releases Wiki Activity

Decode work in separate functions for getwork vs gbt.

Browse Source
This commit is contained in:
Con Kolivas 2012-11-01 15:40:07 +11:00
parent 26e0115030
commit 56b16953a9
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cgminer.c
View File

@ -1357,19 +1357,11 @@ static void calc_midstate(struct work *work)
#endif #endif
} }
static bool work_decode(struct pool *pool, struct work *work, json_t *val) static bool getwork_decode(json_t *res_val, struct work *work)
{ {
json_t *res_val = json_object_get(val, "result");
bool ret = false;
if (pool->has_gbt) {
work->gbt = true;
goto out;
}
if (unlikely(!jobj_binary(res_val, "data", work->data, sizeof(work->data), true))) { if (unlikely(!jobj_binary(res_val, "data", work->data, sizeof(work->data), true))) {
applog(LOG_ERR, "JSON inval data"); applog(LOG_ERR, "JSON inval data");
goto out; return false;
} }
if (!jobj_binary(res_val, "midstate", work->midstate, sizeof(work->midstate), false)) { if (!jobj_binary(res_val, "midstate", work->midstate, sizeof(work->midstate), false)) {
@ -1385,9 +1377,24 @@ static bool work_decode(struct pool *pool, struct work *work, json_t *val)
if (unlikely(!jobj_binary(res_val, "target", work->target, sizeof(work->target), true))) { if (unlikely(!jobj_binary(res_val, "target", work->target, sizeof(work->target), true))) {
applog(LOG_ERR, "JSON inval target"); applog(LOG_ERR, "JSON inval target");
return false;
}
return true;
}
static bool work_decode(struct pool *pool, struct work *work, json_t *val)
{
json_t *res_val = json_object_get(val, "result");
bool ret = false;
if (pool->has_gbt) {
work->gbt = true;
goto out; goto out;
} }
if (unlikely(!getwork_decode(res_val, work)))
goto out;
memset(work->hash, 0, sizeof(work->hash)); memset(work->hash, 0, sizeof(work->hash));
gettimeofday(&work->tv_staged, NULL); gettimeofday(&work->tv_staged, NULL);