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

Add API_KHS endpoint.

Browse Source 
Fix multiplying before double cast.

Add endpoint to response.

Fix API response function.

Fix var name.

Add KHS to API summary.
This commit is contained in:
Perry Huang 2014-01-31 01:43:30 -06:00
parent d7c8d1d300
commit 8bd980dbbd
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api.c
View File

@ -756,6 +756,7 @@ static struct api_data *api_add_data_full(struct api_data *root, char *name, enu
case API_DOUBLE:
case API_ELAPSED:
case API_MHS:
case API_KHS:
case API_MHTOTAL:
case API_UTILITY:
case API_FREQ:
@ -868,6 +869,11 @@ struct api_data *api_add_mhs(struct api_data *root, char *name, double *data, bo
return api_add_data_full(root, name, API_MHS, (void *)data, copy_data);
}
struct api_data *api_add_khs(struct api_data *root, char *name, double *data, bool copy_data)
{
return api_add_data_full(root, name, API_KHS, (void *)data, copy_data);
}
struct api_data *api_add_mhtotal(struct api_data *root, char *name, double *data, bool copy_data)
{
return api_add_data_full(root, name, API_MHTOTAL, (void *)data, copy_data);
@ -983,6 +989,9 @@ static struct api_data *print_data(struct api_data *root, char *buf, bool isjson
case API_MHS:
sprintf(buf, "%.4f", *((double *)(root->data)));
break;
case API_KHS:
sprintf(buf, "%.0f", *((double *)(root->data)));
break;
case API_VOLTS:
sprintf(buf, "%.3f", *((float *)(root->data)));
break;
@ -1672,6 +1681,12 @@ static void gpustatus(struct io_data *io_data, int gpu, bool isjson, bool precom
char mhsname[27];
sprintf(mhsname, "MHS %ds", opt_log_interval);
root = api_add_mhs(root, mhsname, &(cgpu->rolling), false);
double khs_avg = mhs * 1000.0;
double khs_rolling = cgpu->rolling * 1000.0;
root = api_add_khs(root, "KHS av", &khs_avg, false);
char khsname[27];
sprintf(khsname, "KHS %ds", opt_log_interval);
root = api_add_khs(root, khsname, &khs_rolling, false);
root = api_add_int(root, "Accepted", &(cgpu->accepted), false);
root = api_add_int(root, "Rejected", &(cgpu->rejected), false);
root = api_add_int(root, "Hardware Errors", &(cgpu->hw_errors), false);
@ -1879,6 +1894,12 @@ static void summary(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __mayb
char mhsname[27];
sprintf(mhsname, "MHS %ds", opt_log_interval);
root = api_add_mhs(root, mhsname, &(total_rolling), false);
double khs_avg = mhs * 1000.0;
double khs_rolling = total_rolling * 1000.0;
root = api_add_khs(root, "KHS av", &khs_avg, false);
char khsname[27];
sprintf(khsname, "KHS %ds", opt_log_interval);
root = api_add_khs(root, khsname, &khs_rolling, false);
root = api_add_uint(root, "Found Blocks", &(found_blocks), true);
root = api_add_int(root, "Getworks", &(total_getworks), true);
root = api_add_int(root, "Accepted", &(total_accepted), true);

1
miner.h
View File

@ -1437,6 +1437,7 @@ enum api_data_type {
API_TIMEVAL,
API_TIME,
API_MHS,
API_KHS,
API_MHTOTAL,
API_TEMP,
API_UTILITY,