diff --git a/API-README b/API-README index ee9a7047..450b1aa8 100644 --- a/API-README +++ b/API-README @@ -333,7 +333,15 @@ miner.php - an example web page to access the API Feature Changelog for external applications using the API: -API V1.16 +API V1.17 + +Modified API commands: + 'summary' - add 'Work Utility' + 'pools' - add 'Diff1 Shares' + +---------- + +API V1.16 (cgminer v2.6.5) Added API commands: 'failover-only' diff --git a/api.c b/api.c index e17ded21..2d3781c3 100644 --- a/api.c +++ b/api.c @@ -166,7 +166,7 @@ static const char SEPARATOR = '|'; #define SEPSTR "|" static const char GPUSEP = ','; -static const char *APIVERSION = "1.16"; +static const char *APIVERSION = "1.17"; static const char *DEAD = "Dead"; static const char *SICK = "Sick"; static const char *NOSTART = "NoStart"; @@ -1779,6 +1779,7 @@ static void poolstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, root = api_add_uint(root, "Remote Failures", &(pool->remotefail_occasions), false); root = api_add_escape(root, "User", pool->rpc_user, false); root = api_add_time(root, "Last Share Time", &(pool->last_share_time), false); + root = api_add_int(root, "Diff1 Shares", &(pool->diff1), false); if (isjson && (i > 0)) strcat(io_buffer, COMMA); @@ -1795,7 +1796,7 @@ static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, boo { struct api_data *root = NULL; char buf[TMPBUFSIZ]; - double utility, mhs; + double utility, mhs, work_utility; #ifdef WANT_CPUMINE char *algo = (char *)(algo_names[opt_algo]); @@ -1805,6 +1806,7 @@ static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, boo utility = total_accepted / ( total_secs ? total_secs : 1 ) * 60; mhs = total_mhashes_done / total_secs; + work_utility = total_diff1 / ( total_secs ? total_secs : 1 ) * 60; sprintf(io_buffer, isjson ? "%s," JSON_SUMMARY @@ -1829,6 +1831,7 @@ static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, boo root = api_add_uint(root, "Remote Failures", &(total_ro), false); root = api_add_uint(root, "Network Blocks", &(new_blocks), false); root = api_add_mhtotal(root, "Total MH", &(total_mhashes_done), false); + root = api_add_utility(root, "Work Utility", &(work_utility), false); root = print_data(root, buf, isjson); if (isjson) diff --git a/miner.h b/miner.h index 396df219..cb090e45 100644 --- a/miner.h +++ b/miner.h @@ -662,7 +662,7 @@ extern int opt_rotate_period; extern double total_mhashes_done; extern unsigned int new_blocks; extern unsigned int found_blocks; -extern int total_accepted, total_rejected; +extern int total_accepted, total_rejected, total_diff1;; extern int total_getworks, total_stale, total_discarded; extern unsigned int local_work; extern unsigned int total_go, total_ro;