Commit a94b7be3bce294b5dd426736ded6fac69530702f
2013-06-29T08:41:22
correct device DR: and remove global U:
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
diff --git a/README b/README
index adcab8f..0866703 100644
--- a/README
+++ b/README
@@ -420,7 +420,7 @@ dedicated to this program,
http://forum.bitcoin.org/index.php?topic=28402.0
The output line shows the following:
-(5s):1713.6 (avg):1707.8 Mh/s | DA:729 DR:8 HW:0 U:22.53/m WU:22.53/m
+(5s):1713.6 (avg):1707.8 Mh/s | DA:729 DR:8 HW:0 WU:22.53/m
Each column is as follows:
5s: A 5 second exponentially decaying average hash rate
@@ -428,7 +428,6 @@ avg: An all time average hash rate
DA: The total difficulty of Accepted shares
DR: The total difficulty of Rejected shares
HW: The number of HardWare errors
-U: The Utility defined as the number of shares / minute
WU: The Work Utility defined as the number of diff1 shares work / minute
(accepted or rejected).
diff --git a/cgminer.c b/cgminer.c
index 4abba25..c9e1025 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -2174,10 +2174,10 @@ static void curses_print_devstatus(struct cgpu_info *cgpu, int count)
adj_width(cgpu->hw_errors, &hwwidth);
adj_width(wu, &wuwidth);
- wprintw(statuswin, "/%6sh/s | DA:%*.0f DR:%*d HW:%*d WU:%*.2f/m",
+ wprintw(statuswin, "/%6sh/s | DA:%*.0f DR:%*.0f HW:%*d WU:%*.2f/m",
displayed_hashes,
dawidth, cgpu->diff_accepted,
- drwidth, cgpu->rejected,
+ drwidth, cgpu->diff_rejected,
hwwidth, cgpu->hw_errors,
wuwidth + 3, wu);
@@ -4646,7 +4646,6 @@ static void hashmeter(int thr_id, struct timeval *diff,
struct timeval temp_tv_end, total_diff;
double secs;
double local_secs;
- double utility;
static double local_mhashes_done = 0;
static double rolling = 0;
double local_mhashes;
@@ -4728,17 +4727,15 @@ static void hashmeter(int thr_id, struct timeval *diff,
total_secs = (double)total_diff.tv_sec +
((double)total_diff.tv_usec / 1000000.0);
- utility = total_accepted / total_secs * 60;
-
dh64 = (double)total_mhashes_done / total_secs * 1000000ull;
dr64 = (double)rolling * 1000000ull;
suffix_string(dh64, displayed_hashes, 4);
suffix_string(dr64, displayed_rolling, 4);
- sprintf(statusline, "%s(%ds):%s (avg):%sh/s | DA:%.0f DR:%.0f HW:%d U:%.1f/m WU:%.1f/m",
+ sprintf(statusline, "%s(%ds):%s (avg):%sh/s | DA:%.0f DR:%.0f HW:%d WU:%.1f/m",
want_per_device_stats ? "ALL " : "",
opt_log_interval, displayed_rolling, displayed_hashes,
- total_diff_accepted, total_diff_rejected, hw_errors, utility,
+ total_diff_accepted, total_diff_rejected, hw_errors,
total_diff1 / total_secs * 60);
local_mhashes_done = 0;