|
|
@ -676,7 +676,6 @@ static uint64_t icarus_scanhash(struct thr_info *thr, struct work *work, |
|
|
|
return hash_count; |
|
|
|
return hash_count; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//static void icarus_api_stats(char *buf, struct cgpu_info *cgpu, bool isjson)
|
|
|
|
|
|
|
|
static struct api_data *icarus_api_stats(struct cgpu_info *cgpu) |
|
|
|
static struct api_data *icarus_api_stats(struct cgpu_info *cgpu) |
|
|
|
{ |
|
|
|
{ |
|
|
|
struct api_data *root = NULL; |
|
|
|
struct api_data *root = NULL; |
|
|
@ -699,18 +698,6 @@ static struct api_data *icarus_api_stats(struct cgpu_info *cgpu) |
|
|
|
root = api_add_uint(root, "timing_values", &(info->history[0].values), false); |
|
|
|
root = api_add_uint(root, "timing_values", &(info->history[0].values), false); |
|
|
|
root = api_add_const(root, "timing_mode", timing_mode_str(info->timing_mode), false); |
|
|
|
root = api_add_const(root, "timing_mode", timing_mode_str(info->timing_mode), false); |
|
|
|
root = api_add_bool(root, "is_timing", &(info->do_icarus_timing), false); |
|
|
|
root = api_add_bool(root, "is_timing", &(info->do_icarus_timing), false); |
|
|
|
/*
|
|
|
|
|
|
|
|
sprintf(buf, isjson |
|
|
|
|
|
|
|
? "\"read_count\":%d,\"fullnonce\":%f,\"count\":%d,\"Hs\":%.15f,\"W\":%f,\"total_values\":%u,\"range\":%"PRIu64",\"history_count\":%"PRIu64",\"history_time\":%f,\"min_data_count\":%u,\"timing_values\":%u" |
|
|
|
|
|
|
|
: "read_count=%d,fullnonce=%f,count=%d,Hs=%.15f,W=%f,total_values=%u,range=%"PRIu64",history_count=%"PRIu64",history_time=%f,min_data_count=%u,timing_values=%u", |
|
|
|
|
|
|
|
info->read_count, info->fullnonce, |
|
|
|
|
|
|
|
info->count, info->Hs, info->W, |
|
|
|
|
|
|
|
info->values, info->hash_count_range, |
|
|
|
|
|
|
|
info->history_count, |
|
|
|
|
|
|
|
(double)(info->history_time.tv_sec) |
|
|
|
|
|
|
|
+ ((double)(info->history_time.tv_usec))/((double)1000000), |
|
|
|
|
|
|
|
info->min_data_count, info->history[0].values); |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return root; |
|
|
|
return root; |
|
|
|
} |
|
|
|
} |
|
|
|