GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 07:17:58 +00:00
Code Issues Releases Wiki Activity

API add 'MHS %ds' to 'summary'

Browse Source
This commit is contained in:
Kano 2013-10-17 19:45:20 +11:00 committed by Con Kolivas
parent d3d3fc1316
commit 514b3c424f
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
API-README
View File

@ -502,6 +502,9 @@ API V1.31 (cgminer v3.6.3)
Added API command: Added API command:
'lockstats' - display cgminer dev lock stats if compiled in 'lockstats' - display cgminer dev lock stats if compiled in
Modified API command:
'summary' - add 'MHS %ds' (where %d is the log interval)
--------- ---------
API V1.30 (cgminer v3.4.3) API V1.30 (cgminer v3.4.3)

3
api.c
View File

@ -2568,6 +2568,9 @@ static void summary(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __mayb
root = api_add_elapsed(root, "Elapsed", &(total_secs), true); root = api_add_elapsed(root, "Elapsed", &(total_secs), true);
root = api_add_mhs(root, "MHS av", &(mhs), false); root = api_add_mhs(root, "MHS av", &(mhs), false);
char mhsname[27];
sprintf(mhsname, "MHS %ds", opt_log_interval);
root = api_add_mhs(root, mhsname, &(total_rolling), false);
root = api_add_uint(root, "Found Blocks", &(found_blocks), true); root = api_add_uint(root, "Found Blocks", &(found_blocks), true);
root = api_add_int(root, "Getworks", &(total_getworks), true); root = api_add_int(root, "Getworks", &(total_getworks), true);
root = api_add_int(root, "Accepted", &(total_accepted), true); root = api_add_int(root, "Accepted", &(total_accepted), true);

9
cgminer.c
View File

@ -237,6 +237,7 @@ pthread_cond_t restart_cond;
pthread_cond_t gws_cond; pthread_cond_t gws_cond;
double total_rolling;
double total_mhashes_done; double total_mhashes_done;
static struct timeval total_tv_start, total_tv_end; static struct timeval total_tv_start, total_tv_end;
@ -4505,6 +4506,7 @@ void zero_stats(void)
int i; int i;
cgtime(&total_tv_start); cgtime(&total_tv_start);
total_rolling = 0;
total_mhashes_done = 0; total_mhashes_done = 0;
total_getworks = 0; total_getworks = 0;
total_accepted = 0; total_accepted = 0;
@ -5003,7 +5005,6 @@ static void hashmeter(int thr_id, struct timeval *diff,
double secs; double secs;
double local_secs; double local_secs;
static double local_mhashes_done = 0; static double local_mhashes_done = 0;
static double rolling = 0;
double local_mhashes; double local_mhashes;
bool showlog = false; bool showlog = false;
char displayed_hashes[16], displayed_rolling[16]; char displayed_hashes[16], displayed_rolling[16];
@ -5076,15 +5077,15 @@ static void hashmeter(int thr_id, struct timeval *diff,
cgtime(&total_tv_end); cgtime(&total_tv_end);
local_secs = (double)total_diff.tv_sec + ((double)total_diff.tv_usec / 1000000.0); local_secs = (double)total_diff.tv_sec + ((double)total_diff.tv_usec / 1000000.0);
decay_time(&rolling, local_mhashes_done / local_secs, local_secs); decay_time(&total_rolling, local_mhashes_done / local_secs, local_secs);
global_hashrate = roundl(rolling) * 1000000; global_hashrate = roundl(total_rolling) * 1000000;
timersub(&total_tv_end, &total_tv_start, &total_diff); timersub(&total_tv_end, &total_tv_start, &total_diff);
total_secs = (double)total_diff.tv_sec + total_secs = (double)total_diff.tv_sec +
((double)total_diff.tv_usec / 1000000.0); ((double)total_diff.tv_usec / 1000000.0);
dh64 = (double)total_mhashes_done / total_secs * 1000000ull; dh64 = (double)total_mhashes_done / total_secs * 1000000ull;
dr64 = (double)rolling * 1000000ull; dr64 = (double)total_rolling * 1000000ull;
suffix_string(dh64, displayed_hashes, sizeof(displayed_hashes), 4); suffix_string(dh64, displayed_hashes, sizeof(displayed_hashes), 4);
suffix_string(dr64, displayed_rolling, sizeof(displayed_rolling), 4); suffix_string(dr64, displayed_rolling, sizeof(displayed_rolling), 4);

1
miner.h
View File

@ -1140,6 +1140,7 @@ extern struct pool **pools;
extern struct strategies strategies[]; extern struct strategies strategies[];
extern enum pool_strategy pool_strategy; extern enum pool_strategy pool_strategy;
extern int opt_rotate_period; extern int opt_rotate_period;
extern double total_rolling;
extern double total_mhashes_done; extern double total_mhashes_done;
extern unsigned int new_blocks; extern unsigned int new_blocks;
extern unsigned int found_blocks; extern unsigned int found_blocks;