GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge pull request #339 from kanoi/api 

API lock access to some summary statistics + API add Best Share to summary
nfactor-troky
Con Kolivas 12 years ago
parent
c4b17ae918 e55fe73f9a
commit
777f0573c3
4 changed files with 30 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      API-README
  2. 38
      api.c
  3. 4
      cgminer.c
  4. 2
      miner.h

5
API-README
Unescape View File

@ -392,7 +392,10 @@ Added API commands:
'usbstats' 'usbstats'
Modified API commands: Modified API commands:
each MMQ shows up as 4 devices each with it's own stats 'summary' - add 'Best Share'
Modifed output:
each MMQ shows up as 4 devices, each with it's own stats
---------- ----------

38
api.c
Unescape View File

@ -1879,6 +1879,9 @@ static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, boo
algo = (char *)NULLSTR; algo = (char *)NULLSTR;
#endif #endif
// stop hashmeter() changing some while copying
mutex_lock(&hash_lock);
utility = total_accepted / ( total_secs ? total_secs : 1 ) * 60; utility = total_accepted / ( total_secs ? total_secs : 1 ) * 60;
mhs = total_mhashes_done / total_secs; mhs = total_mhashes_done / total_secs;
work_utility = total_diff1 / ( total_secs ? total_secs : 1 ) * 60; work_utility = total_diff1 / ( total_secs ? total_secs : 1 ) * 60;
@ -1888,28 +1891,31 @@ static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, boo
: "%s" _SUMMARY ",", : "%s" _SUMMARY ",",
message(MSG_SUMM, 0, NULL, isjson)); message(MSG_SUMM, 0, NULL, isjson));
root = api_add_elapsed(root, "Elapsed", &(total_secs), false); root = api_add_elapsed(root, "Elapsed", &(total_secs), true);
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
root = api_add_string(root, "Algorithm", algo, false); root = api_add_string(root, "Algorithm", algo, false);
#endif #endif
root = api_add_mhs(root, "MHS av", &(mhs), false); root = api_add_mhs(root, "MHS av", &(mhs), false);
root = api_add_uint(root, "Found Blocks", &(found_blocks), false); root = api_add_uint(root, "Found Blocks", &(found_blocks), true);
root = api_add_int(root, "Getworks", &(total_getworks), false); root = api_add_int(root, "Getworks", &(total_getworks), true);
root = api_add_int(root, "Accepted", &(total_accepted), false); root = api_add_int(root, "Accepted", &(total_accepted), true);
root = api_add_int(root, "Rejected", &(total_rejected), false); root = api_add_int(root, "Rejected", &(total_rejected), true);
root = api_add_int(root, "Hardware Errors", &(hw_errors), false); root = api_add_int(root, "Hardware Errors", &(hw_errors), true);
root = api_add_utility(root, "Utility", &(utility), false); root = api_add_utility(root, "Utility", &(utility), false);
root = api_add_int(root, "Discarded", &(total_discarded), false); root = api_add_int(root, "Discarded", &(total_discarded), true);
root = api_add_int(root, "Stale", &(total_stale), false); root = api_add_int(root, "Stale", &(total_stale), true);
root = api_add_uint(root, "Get Failures", &(total_go), false); root = api_add_uint(root, "Get Failures", &(total_go), true);
root = api_add_uint(root, "Local Work", &(local_work), false); root = api_add_uint(root, "Local Work", &(local_work), true);
root = api_add_uint(root, "Remote Failures", &(total_ro), false); root = api_add_uint(root, "Remote Failures", &(total_ro), true);
root = api_add_uint(root, "Network Blocks", &(new_blocks), false); root = api_add_uint(root, "Network Blocks", &(new_blocks), true);
root = api_add_mhtotal(root, "Total MH", &(total_mhashes_done), false); root = api_add_mhtotal(root, "Total MH", &(total_mhashes_done), true);
root = api_add_utility(root, "Work Utility", &(work_utility), false); root = api_add_utility(root, "Work Utility", &(work_utility), false);
root = api_add_diff(root, "Difficulty Accepted", &(total_diff_accepted), false); root = api_add_diff(root, "Difficulty Accepted", &(total_diff_accepted), true);
root = api_add_diff(root, "Difficulty Rejected", &(total_diff_rejected), false); root = api_add_diff(root, "Difficulty Rejected", &(total_diff_rejected), true);
root = api_add_diff(root, "Difficulty Stale", &(total_diff_stale), false); root = api_add_diff(root, "Difficulty Stale", &(total_diff_stale), true);
root = api_add_uint64(root, "Best Share", &(best_diff), true);
mutex_unlock(&hash_lock);
root = print_data(root, buf, isjson); root = print_data(root, buf, isjson);
if (isjson) if (isjson)

4
cgminer.c
Unescape View File

@ -174,7 +174,7 @@ static int total_threads;
pthread_mutex_t cgusb_lock; pthread_mutex_t cgusb_lock;
#endif #endif
static pthread_mutex_t hash_lock; pthread_mutex_t hash_lock;
static pthread_mutex_t qd_lock; static pthread_mutex_t qd_lock;
static pthread_mutex_t *stgd_lock; static pthread_mutex_t *stgd_lock;
pthread_mutex_t console_lock; pthread_mutex_t console_lock;
@ -228,7 +228,7 @@ static char datestamp[40];
static char blocktime[32]; static char blocktime[32];
struct timeval block_timeval; struct timeval block_timeval;
static char best_share[8] = "0"; static char best_share[8] = "0";
static uint64_t best_diff = 0; uint64_t best_diff = 0;
struct block { struct block {
char hash[40]; char hash[40];

2
miner.h
Unescape View File

@ -705,6 +705,7 @@ extern int opt_expiry;
extern pthread_mutex_t cgusb_lock; extern pthread_mutex_t cgusb_lock;
#endif #endif
extern pthread_mutex_t hash_lock;
extern pthread_mutex_t console_lock; extern pthread_mutex_t console_lock;
extern pthread_mutex_t ch_lock; extern pthread_mutex_t ch_lock;
@ -785,6 +786,7 @@ extern const int opt_cutofftemp;
extern int opt_log_interval; extern int opt_log_interval;
extern unsigned long long global_hashrate; extern unsigned long long global_hashrate;
extern char *current_fullhash; extern char *current_fullhash;
extern uint64_t best_diff;
extern struct timeval block_timeval; extern struct timeval block_timeval;
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL

Write Preview
Loading…
Cancel
Save