Commit c443ccb580682fb08bdf040b018ef627f0799e56
2014-03-25T21:57:04
Add 3 rolling average hashrates to API output for summary and devs.
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
diff --git a/api.c b/api.c
index d74ca65..cf12762 100644
--- a/api.c
+++ b/api.c
@@ -2003,6 +2003,9 @@ static void ascstatus(struct io_data *io_data, int asc, bool isjson, bool precom
char mhsname[27];
sprintf(mhsname, "MHS %ds", opt_log_interval);
root = api_add_mhs(root, mhsname, &(cgpu->rolling), false);
+ root = api_add_mhs(root, "MHS 1m", &cgpu->rolling1, false);
+ root = api_add_mhs(root, "MHS 5m", &cgpu->rolling5, false);
+ root = api_add_mhs(root, "MHS 15m", &cgpu->rolling15, false);
root = api_add_int(root, "Accepted", &(cgpu->accepted), false);
root = api_add_int(root, "Rejected", &(cgpu->rejected), false);
root = api_add_int(root, "Hardware Errors", &(cgpu->hw_errors), false);
@@ -2087,6 +2090,9 @@ static void pgastatus(struct io_data *io_data, int pga, bool isjson, bool precom
char mhsname[27];
sprintf(mhsname, "MHS %ds", opt_log_interval);
root = api_add_mhs(root, mhsname, &(cgpu->rolling), false);
+ root = api_add_mhs(root, "MHS 1m", &cgpu->rolling1, false);
+ root = api_add_mhs(root, "MHS 5m", &cgpu->rolling5, false);
+ root = api_add_mhs(root, "MHS 15m", &cgpu->rolling15, false);
root = api_add_int(root, "Accepted", &(cgpu->accepted), false);
root = api_add_int(root, "Rejected", &(cgpu->rejected), false);
root = api_add_int(root, "Hardware Errors", &(cgpu->hw_errors), false);
@@ -2560,6 +2566,9 @@ static void summary(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __mayb
char mhsname[27];
sprintf(mhsname, "MHS %ds", opt_log_interval);
root = api_add_mhs(root, mhsname, &(total_rolling), false);
+ root = api_add_mhs(root, "MHS 1m", &rolling1, false);
+ root = api_add_mhs(root, "MHS 5m", &rolling5, false);
+ root = api_add_mhs(root, "MHS 15m", &rolling15, 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);
diff --git a/miner.h b/miner.h
index a1f1469..9f4cb0e 100644
--- a/miner.h
+++ b/miner.h
@@ -1102,6 +1102,7 @@ extern struct pool **pools;
extern struct strategies strategies[];
extern enum pool_strategy pool_strategy;
extern int opt_rotate_period;
+extern double rolling1, rolling5, rolling15;
extern double total_rolling;
extern double total_mhashes_done;
extern unsigned int new_blocks;