GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-09-12 14:12:15 +00:00
Code Issues Releases Wiki Activity

Make the output display the 5 second and total average Mhash/s.

Browse Source 
Make the log interval configurable.
This commit is contained in:
Con Kolivas 2011-06-23 21:58:46 +10:00
parent debe77767a
commit 70f7357692
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
cpu-miner.c
View File

@ -119,6 +119,7 @@ bool use_syslog = false;
static bool opt_quiet = false; static bool opt_quiet = false;
static int opt_retries = 10; static int opt_retries = 10;
static int opt_fail_pause = 30; static int opt_fail_pause = 30;
static int opt_log_interval = 5;
int opt_scantime = 5; int opt_scantime = 5;
static json_t *opt_config; static json_t *opt_config;
static const bool opt_time = true; static const bool opt_time = true;
@ -185,6 +186,9 @@ static struct option_help options_help[] = {
{ "intensity", { "intensity",
"(-I) Intensity of scanning (0 - 16, default 5)" }, "(-I) Intensity of scanning (0 - 16, default 5)" },
{ "log",
"(-l) Interval in seconds between log output (default 5)" },
{ "ndevs", { "ndevs",
"(-n) Display number of detected GPUs" }, "(-n) Display number of detected GPUs" },
@ -237,6 +241,7 @@ static struct option options[] = {
{ "debug", 0, NULL, 'D' }, { "debug", 0, NULL, 'D' },
{ "help", 0, NULL, 'h' }, { "help", 0, NULL, 'h' },
{ "intensity", 1, NULL, 'I' }, { "intensity", 1, NULL, 'I' },
{ "log", 1, NULL, 'l' },
{ "ndevs", 0, NULL, 'n' }, { "ndevs", 0, NULL, 'n' },
{ "no-longpoll", 0, NULL, 1003 }, { "no-longpoll", 0, NULL, 1003 },
{ "pass", 1, NULL, 'p' }, { "pass", 1, NULL, 'p' },
@ -507,9 +512,11 @@ static void hashmeter(int thr_id, struct timeval *diff,
struct timeval temp_tv_end, total_diff; struct timeval temp_tv_end, total_diff;
double khashes, secs; double khashes, secs;
double total_mhashes, total_secs; double total_mhashes, total_secs;
double local_mhashes, local_secs;
static local_hashes_done = 0;
/* Don't bother calculating anything if we're not displaying it */ /* Don't bother calculating anything if we're not displaying it */
if (opt_quiet) if (opt_quiet || !opt_log_interval)
return; return;
khashes = hashes_done / 1000.0; khashes = hashes_done / 1000.0;
secs = (double)diff->tv_sec + ((double)diff->tv_usec / 1000000.0); secs = (double)diff->tv_sec + ((double)diff->tv_usec / 1000000.0);
@ -518,40 +525,39 @@ static void hashmeter(int thr_id, struct timeval *diff,
thr_id, hashes_done, hashes_done / secs); thr_id, hashes_done, hashes_done / secs);
gettimeofday(&temp_tv_end, NULL); gettimeofday(&temp_tv_end, NULL);
timeval_subtract(&total_diff, &temp_tv_end, &total_tv_end); timeval_subtract(&total_diff, &temp_tv_end, &total_tv_end);
local_secs = (double)total_diff.tv_sec + ((double)total_diff.tv_usec / 1000000.0);
if (opt_n_threads + nDevs > 1) { if (opt_n_threads + nDevs > 1) {
/* Totals are updated by all threads so can race without locking */ /* Totals are updated by all threads so can race without locking */
pthread_mutex_lock(&hash_lock); pthread_mutex_lock(&hash_lock);
total_hashes_done += hashes_done; total_hashes_done += hashes_done;
if (total_diff.tv_sec < 5) { local_hashes_done += hashes_done;
/* Only update the total every 5 seconds */ if (total_diff.tv_sec < opt_log_interval) {
/* Only update the total every opt_log_interval seconds */
pthread_mutex_unlock(&hash_lock); pthread_mutex_unlock(&hash_lock);
return; return;
} }
gettimeofday(&total_tv_end, NULL); gettimeofday(&total_tv_end, NULL);
pthread_mutex_unlock(&hash_lock); pthread_mutex_unlock(&hash_lock);
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);
applog(LOG_INFO, "[%.2f Mhash/sec] [%d Accepted] [%d Rejected]",
total_mhashes / total_secs, accepted, rejected);
} else { } else {
total_hashes_done += hashes_done; total_hashes_done += hashes_done;
local_hashes_done += hashes_done;
if (total_diff.tv_sec < 5) { if (total_diff.tv_sec < 5) {
/* Only update the total every 5 seconds */ /* Only update the total every 5 seconds */
pthread_mutex_unlock(&hash_lock); pthread_mutex_unlock(&hash_lock);
return; return;
} }
gettimeofday(&total_tv_end, NULL); 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);
applog(LOG_INFO, "[%.2f Mhash/sec] [%d Accepted] [%d Rejected]",
total_mhashes / total_secs, accepted, rejected);
} }
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);
} }
static bool get_work(struct thr_info *thr, struct work *work) static bool get_work(struct thr_info *thr, struct work *work)
@ -1029,8 +1035,8 @@ static void parse_arg (int key, char *arg)
} }
break; break;
} }
case 'q': case 'D':
opt_quiet = true; opt_debug = true;
break; break;
case 'I': case 'I':
v = atoi(arg); v = atoi(arg);
@ -1038,8 +1044,11 @@ static void parse_arg (int key, char *arg)
show_usage(); show_usage();
scan_intensity = v; scan_intensity = v;
break; break;
case 'D': case 'l':
opt_debug = true; v = atoi(arg);
if (v < 0 || v > 9999) /* sanity check */
show_usage();
opt_log_interval = v;
break; break;
case 'p': case 'p':
free(rpc_pass); free(rpc_pass);
@ -1048,6 +1057,9 @@ static void parse_arg (int key, char *arg)
case 'P': case 'P':
opt_protocol = true; opt_protocol = true;
break; break;
case 'q':
opt_quiet = true;
break;
case 'r': case 'r':
v = atoi(arg); v = atoi(arg);
if (v < -1 || v > 9999) /* sanity check */ if (v < -1 || v > 9999) /* sanity check */