diff --git a/src/proxy/splitters/extra_nonce/ExtraNonceSplitter.cpp b/src/proxy/splitters/extra_nonce/ExtraNonceSplitter.cpp index 8928c1c..5753673 100644 --- a/src/proxy/splitters/extra_nonce/ExtraNonceSplitter.cpp +++ b/src/proxy/splitters/extra_nonce/ExtraNonceSplitter.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright 2018-2025 SChernykh + * Copyright 2016-2025 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 @@ -24,6 +24,7 @@ #include "proxy/splitters/extra_nonce/ExtraNonceSplitter.h" #include "base/io/log/Log.h" +#include "base/tools/Chrono.h" #include "core/config/Config.h" #include "core/Controller.h" #include "proxy/Counters.h" @@ -95,8 +96,7 @@ void xmrig::ExtraNonceSplitter::printConnections() void xmrig::ExtraNonceSplitter::tick(uint64_t ticks) { - const uint64_t now = uv_now(uv_default_loop()); - m_upstream->tick(ticks, now); + m_upstream->tick(ticks, Chrono::steadyMSecs()); } diff --git a/src/proxy/splitters/nicehash/NonceSplitter.cpp b/src/proxy/splitters/nicehash/NonceSplitter.cpp index 407426d..b900421 100644 --- a/src/proxy/splitters/nicehash/NonceSplitter.cpp +++ b/src/proxy/splitters/nicehash/NonceSplitter.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright 2018-2025 SChernykh + * Copyright 2016-2025 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 @@ -24,6 +24,7 @@ #include "proxy/splitters/nicehash/NonceSplitter.h" #include "base/io/log/Log.h" +#include "base/tools/Chrono.h" #include "core/config/Config.h" #include "core/Controller.h" #include "proxy/Counters.h" @@ -34,7 +35,6 @@ #include "proxy/splitters/nicehash/NonceMapper.h" #include "Summary.h" - #include @@ -77,7 +77,7 @@ xmrig::Upstreams xmrig::NonceSplitter::upstreams() const void xmrig::NonceSplitter::connect() { - auto upstream = new NonceMapper(m_upstreams.size(), m_controller); + auto *upstream = new NonceMapper(m_upstreams.size(), m_controller); m_upstreams.push_back(upstream); upstream->start(); @@ -113,7 +113,7 @@ void xmrig::NonceSplitter::printConnections() void xmrig::NonceSplitter::tick(uint64_t ticks) { - const uint64_t now = uv_now(uv_default_loop()); + const uint64_t now = Chrono::steadyMSecs(); for (NonceMapper *mapper : m_upstreams) { mapper->tick(ticks, now); diff --git a/src/proxy/splitters/simple/SimpleSplitter.cpp b/src/proxy/splitters/simple/SimpleSplitter.cpp index 4097829..2ffaaf4 100644 --- a/src/proxy/splitters/simple/SimpleSplitter.cpp +++ b/src/proxy/splitters/simple/SimpleSplitter.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2025 SChernykh + * Copyright 2016-2025 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 @@ -22,10 +22,9 @@ * along with this program. If not, see . */ -#include - - +#include "proxy/splitters/simple/SimpleSplitter.h" #include "base/io/log/Log.h" +#include "base/tools/Chrono.h" #include "core/config/Config.h" #include "core/Controller.h" #include "proxy/Counters.h" @@ -34,16 +33,16 @@ #include "proxy/events/SubmitEvent.h" #include "proxy/Miner.h" #include "proxy/splitters/simple/SimpleMapper.h" -#include "proxy/splitters/simple/SimpleSplitter.h" #include "Summary.h" +#include + #define LABEL(x) " \x1B[01;30m" x ":\x1B[0m " xmrig::SimpleSplitter::SimpleSplitter(xmrig::Controller *controller) : Splitter(controller), - m_reuseTimeout(static_cast(controller->config()->reuseTimeout())), - m_sequence(0) + m_reuseTimeout(static_cast(controller->config()->reuseTimeout())) { } @@ -98,7 +97,7 @@ void xmrig::SimpleSplitter::printConnections() void xmrig::SimpleSplitter::tick(uint64_t ticks) { - const uint64_t now = uv_now(uv_default_loop()); + const uint64_t now = Chrono::steadyMSecs(); for (SimpleMapper *mapper : m_released) { delete mapper; diff --git a/src/proxy/splitters/simple/SimpleSplitter.h b/src/proxy/splitters/simple/SimpleSplitter.h index 67cc220..ea064b8 100644 --- a/src/proxy/splitters/simple/SimpleSplitter.h +++ b/src/proxy/splitters/simple/SimpleSplitter.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2025 SChernykh + * Copyright 2016-2025 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 @@ -25,9 +25,8 @@ #ifndef XMRIG_SIMPLESPLITTER_H #define XMRIG_SIMPLESPLITTER_H - +#include #include -#include #include @@ -76,12 +75,12 @@ private: std::map m_idles; std::map m_upstreams; std::vector m_released; - uint64_t m_reuseTimeout; - uint64_t m_sequence; + uint64_t m_reuseTimeout = 0; + uint64_t m_sequence = 0; }; -} /* namespace xmrig */ +} // namespace xmrig -#endif /* XMRIG_SIMPLESPLITTER_H */ +#endif // XMRIG_SIMPLESPLITTER_H