summaryrefslogtreecommitdiffstats
path: root/xmrstak/misc
diff options
context:
space:
mode:
authorfireice-uk <fireice-uk@users.noreply.github.com>2017-12-22 18:08:30 +0000
committerfireice-uk <fireice-uk@users.noreply.github.com>2017-12-22 18:08:30 +0000
commitda1da53fae61bf916924233c5198ebf7b2533f73 (patch)
tree44df71f5ae1f6bed68494dd00980e56a8f348c2a /xmrstak/misc
parentbbba9467ad77f160295e3e38a91727952c66aa7d (diff)
downloadxmr-stak-da1da53fae61bf916924233c5198ebf7b2533f73.zip
xmr-stak-da1da53fae61bf916924233c5198ebf7b2533f73.tar.gz
Make sure we are using a steady clock
Diffstat (limited to 'xmrstak/misc')
-rw-r--r--xmrstak/misc/executor.cpp5
-rw-r--r--xmrstak/misc/telemetry.cpp5
2 files changed, 4 insertions, 6 deletions
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index 3aeb408..a3088a5 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -423,10 +423,9 @@ void executor::on_miner_result(size_t pool_id, job_result& oResult)
return;
}
- using namespace std::chrono;
- size_t t_start = time_point_cast<milliseconds>(high_resolution_clock::now()).time_since_epoch().count();
+ size_t t_start = get_timestamp_ms();
bool bResult = pool->cmd_submit(oResult.sJobID, oResult.iNonce, oResult.bResult, pvThreads->at(oResult.iThreadId), is_monero);
- size_t t_len = time_point_cast<milliseconds>(high_resolution_clock::now()).time_since_epoch().count() - t_start;
+ size_t t_len = get_timestamp_ms() - t_start;
if(t_len > 0xFFFF)
t_len = 0xFFFF;
diff --git a/xmrstak/misc/telemetry.cpp b/xmrstak/misc/telemetry.cpp
index c5cce23..738d287 100644
--- a/xmrstak/misc/telemetry.cpp
+++ b/xmrstak/misc/telemetry.cpp
@@ -22,12 +22,12 @@
*/
#include "telemetry.hpp"
+#include "xmrstak/net/msgstruct.hpp"
#include <cmath>
#include <cstring>
#include <chrono>
-
namespace xmrstak
{
@@ -49,8 +49,7 @@ telemetry::telemetry(size_t iThd)
double telemetry::calc_telemetry_data(size_t iLastMilisec, size_t iThread)
{
- using namespace std::chrono;
- uint64_t iTimeNow = time_point_cast<milliseconds>(high_resolution_clock::now()).time_since_epoch().count();
+ uint64_t iTimeNow = get_timestamp_ms();
uint64_t iEarliestHashCnt = 0;
uint64_t iEarliestStamp = 0;
OpenPOWER on IntegriCloud