Commit a67e96c3e48baad8a56c5bef227e97bcd423c559
2012-12-03T11:36:15
API lock access to some summary statistics (and copy them)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
diff --git a/api.c b/api.c
index d59b5ca..d4832fc 100644
--- a/api.c
+++ b/api.c
@@ -1879,6 +1879,9 @@ static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, boo
algo = (char *)NULLSTR;
#endif
+ // stop hashmeter() changing some while copying
+ mutex_lock(&hash_lock);
+
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;
@@ -1888,28 +1891,30 @@ static void summary(__maybe_unused SOCKETTYPE c, __maybe_unused char *param, boo
: "%s" _SUMMARY ",",
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
root = api_add_string(root, "Algorithm", algo, false);
#endif
root = api_add_mhs(root, "MHS av", &(mhs), false);
- root = api_add_uint(root, "Found Blocks", &(found_blocks), false);
- root = api_add_int(root, "Getworks", &(total_getworks), false);
- root = api_add_int(root, "Accepted", &(total_accepted), false);
- root = api_add_int(root, "Rejected", &(total_rejected), false);
- root = api_add_int(root, "Hardware Errors", &(hw_errors), 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);
+ root = api_add_int(root, "Rejected", &(total_rejected), true);
+ root = api_add_int(root, "Hardware Errors", &(hw_errors), true);
root = api_add_utility(root, "Utility", &(utility), false);
- root = api_add_int(root, "Discarded", &(total_discarded), false);
- root = api_add_int(root, "Stale", &(total_stale), false);
- root = api_add_uint(root, "Get Failures", &(total_go), false);
- root = api_add_uint(root, "Local Work", &(local_work), false);
- 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_int(root, "Discarded", &(total_discarded), true);
+ root = api_add_int(root, "Stale", &(total_stale), true);
+ root = api_add_uint(root, "Get Failures", &(total_go), true);
+ root = api_add_uint(root, "Local Work", &(local_work), true);
+ root = api_add_uint(root, "Remote Failures", &(total_ro), true);
+ root = api_add_uint(root, "Network Blocks", &(new_blocks), true);
+ root = api_add_mhtotal(root, "Total MH", &(total_mhashes_done), true);
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 Rejected", &(total_diff_rejected), false);
- root = api_add_diff(root, "Difficulty Stale", &(total_diff_stale), false);
+ root = api_add_diff(root, "Difficulty Accepted", &(total_diff_accepted), true);
+ root = api_add_diff(root, "Difficulty Rejected", &(total_diff_rejected), true);
+ root = api_add_diff(root, "Difficulty Stale", &(total_diff_stale), true);
+
+ mutex_unlock(&hash_lock);
root = print_data(root, buf, isjson);
if (isjson)
diff --git a/cgminer.c b/cgminer.c
index 2628b59..721dadd 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -174,7 +174,7 @@ static int total_threads;
pthread_mutex_t cgusb_lock;
#endif
-static pthread_mutex_t hash_lock;
+pthread_mutex_t hash_lock;
static pthread_mutex_t qd_lock;
static pthread_mutex_t *stgd_lock;
pthread_mutex_t console_lock;
diff --git a/miner.h b/miner.h
index 6c38cf0..2e34236 100644
--- a/miner.h
+++ b/miner.h
@@ -705,6 +705,7 @@ extern int opt_expiry;
extern pthread_mutex_t cgusb_lock;
#endif
+extern pthread_mutex_t hash_lock;
extern pthread_mutex_t console_lock;
extern pthread_mutex_t ch_lock;