diff --git a/CMakeLists.txt b/CMakeLists.txt index 42bb51f89..00dd85772 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,6 @@ set(SOURCES src/base/net/stratum/Pools.cpp src/base/net/stratum/strategies/FailoverStrategy.cpp src/base/net/stratum/strategies/SinglePoolStrategy.cpp - src/base/net/stratum/SubmitResult.cpp src/base/tools/Arguments.cpp src/base/tools/Buffer.cpp src/base/tools/Handle.cpp diff --git a/src/base/net/stratum/SubmitResult.cpp b/src/base/net/stratum/SubmitResult.cpp deleted file mode 100644 index ad8a48af0..000000000 --- a/src/base/net/stratum/SubmitResult.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include - - -#include "base/net/stratum/SubmitResult.h" - - -xmrig::SubmitResult::SubmitResult(int64_t seq, uint32_t diff, uint64_t actualDiff, int64_t reqId) : - reqId(reqId), - seq(seq), - diff(diff), - actualDiff(actualDiff), - elapsed(0) -{ - start = uv_hrtime(); -} - - -void xmrig::SubmitResult::done() -{ - elapsed = (uv_hrtime() - start) / 1000000; -} diff --git a/src/base/net/stratum/SubmitResult.h b/src/base/net/stratum/SubmitResult.h index db97ac38a..583d426fe 100644 --- a/src/base/net/stratum/SubmitResult.h +++ b/src/base/net/stratum/SubmitResult.h @@ -26,7 +26,7 @@ #define XMRIG_SUBMITRESULT_H -#include +#include "base/tools/Chrono.h" namespace xmrig { @@ -35,10 +35,25 @@ namespace xmrig { class SubmitResult { public: - inline SubmitResult() : reqId(0), seq(0), diff(0), actualDiff(0), elapsed(0), start(0) {} - SubmitResult(int64_t seq, uint32_t diff, uint64_t actualDiff, int64_t reqId = 0); + inline SubmitResult() : + reqId(0), + seq(0), + diff(0), + actualDiff(0), + elapsed(0), + m_start(0) + {} - void done(); + inline SubmitResult(int64_t seq, uint32_t diff, uint64_t actualDiff, int64_t reqId = 0) : + reqId(reqId), + seq(seq), + diff(diff), + actualDiff(actualDiff), + elapsed(0), + m_start(Chrono::steadyMSecs()) + {} + + inline void done() { elapsed = Chrono::steadyMSecs() - m_start; } int64_t reqId; int64_t seq; @@ -47,7 +62,7 @@ public: uint64_t elapsed; private: - uint64_t start; + uint64_t m_start; };