Commit e8f4eeade1d9ea3e44be86325826c72255cd5e26
2011-06-24T16:24:53
Use total mhashes as a counter to prevent 32 bit overflows.
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
diff --git a/cpu-miner.c b/cpu-miner.c
index 2810c2b..3391feb 100644
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -141,7 +141,7 @@ int longpoll_thr_id;
struct work_restart *work_restart = NULL;
pthread_mutex_t time_lock;
static pthread_mutex_t hash_lock;
-static unsigned long total_hashes_done;
+static double total_mhashes_done;
static struct timeval total_tv_start, total_tv_end;
static int accepted, rejected;
@@ -511,7 +511,7 @@ static void hashmeter(int thr_id, struct timeval *diff,
{
struct timeval temp_tv_end, total_diff;
double khashes, secs;
- double total_mhashes, total_secs;
+ double total_secs;
double local_mhashes, local_secs;
static local_hashes_done = 0;
@@ -530,7 +530,7 @@ static void hashmeter(int thr_id, struct timeval *diff,
if (opt_n_threads + nDevs > 1) {
/* Totals are updated by all threads so can race without locking */
pthread_mutex_lock(&hash_lock);
- total_hashes_done += hashes_done;
+ total_mhashes_done += (double)hashes_done / 1000000.0;
local_hashes_done += hashes_done;
if (total_diff.tv_sec < opt_log_interval) {
/* Only update the total every opt_log_interval seconds */
@@ -540,21 +540,20 @@ static void hashmeter(int thr_id, struct timeval *diff,
gettimeofday(&total_tv_end, NULL);
pthread_mutex_unlock(&hash_lock);
} else {
- total_hashes_done += hashes_done;
+ total_mhashes_done += (double)hashes_done / 1000000.0;
local_hashes_done += hashes_done;
if (total_diff.tv_sec < opt_log_interval)
return;
gettimeofday(&total_tv_end, NULL);
}
timeval_subtract(&total_diff, &total_tv_end, &total_tv_start);
- total_mhashes = total_hashes_done / 1000000.0;
total_secs = (double)total_diff.tv_sec +
((double)total_diff.tv_usec / 1000000.0);
local_mhashes = local_hashes_done / 1000000.0;
local_hashes_done = 0;
applog(LOG_INFO, "[%.2f | %.2f Mhash/s] [%d Accepted] [%d Rejected]",
local_mhashes / local_secs,
- total_mhashes / total_secs, accepted, rejected);
+ total_mhashes_done / total_secs, accepted, rejected);
}
static bool get_work(struct thr_info *thr, struct work *work)
@@ -1305,7 +1304,7 @@ int main (int argc, char *argv[])
pthread_mutex_lock(&hash_lock);
gettimeofday(&total_tv_start, NULL);
gettimeofday(&total_tv_end, NULL);
- total_hashes_done = 0;
+ total_mhashes_done = 0;
pthread_mutex_unlock(&hash_lock);
/* main loop - simply wait for workio thread to exit */