mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2026-04-18 05:22:28 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Merge branch 'pr3764' into dev"

Browse Source 
This reverts commit 0d9a372e49, reversing
changes made to 1a04bf2904.
This commit is contained in:
XMRig
2026-01-21 21:32:51 +07:00
parent 0d9a372e49
commit db24bf5154
22 changed files with 70 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/base/net/stratum/NetworkState.cpp
View File

@@ -210,7 +210,7 @@ void xmrig::NetworkState::printResults() const
printHashes(m_accepted, m_hashes);
printDiff(m_diff);
if (m_active && m_latencyCount > 0) {
if (m_active && !m_latency.empty()) {
printAvgTime(avgTime());
}
@@ -298,19 +298,13 @@ void xmrig::NetworkState::onResultAccepted(IStrategy *strategy, IClient *client,
uint32_t xmrig::NetworkState::latency() const
{
const size_t calls = m_latencyCount;
const size_t calls = m_latency.size();
if (calls == 0) {
return 0;
}
std::array<uint16_t, kLatencyWindow> v;
const size_t start = (m_latencyPos + kLatencyWindow - calls) % kLatencyWindow;
for (size_t i = 0; i < calls; ++i) {
v[i] = m_latency[(start + i) % kLatencyWindow];
}
std::nth_element(v.begin(), v.begin() + calls / 2, v.begin() + calls);
auto v = m_latency;
std::nth_element(v.begin(), v.begin() + calls / 2, v.end());
return v[calls / 2];
}
@@ -318,11 +312,11 @@ uint32_t xmrig::NetworkState::latency() const
uint64_t xmrig::NetworkState::avgTime() const
{
if (m_latencyCount == 0) {
if (m_latency.empty()) {
return 0;
}
return connectionTime() / m_latencyCount;
return connectionTime() / m_latency.size();
}
@@ -348,12 +342,7 @@ void xmrig::NetworkState::add(const SubmitResult &result, const char *error)
std::sort(m_topDiff.rbegin(), m_topDiff.rend());
}
m_latency[m_latencyPos] = result.elapsed > 0xFFFF ? 0xFFFF : static_cast<uint16_t>(result.elapsed);
m_latencyPos = (m_latencyPos + 1) % kLatencyWindow;
if (m_latencyCount < kLatencyWindow) {
m_latencyCount++;
}
m_latency.push_back(result.elapsed > 0xFFFF ? 0xFFFF : static_cast<uint16_t>(result.elapsed));
}
@@ -366,6 +355,5 @@ void xmrig::NetworkState::stop()
m_fingerprint = nullptr;
m_failures++;
m_latencyCount = 0;
m_latencyPos = 0;
m_latency.clear();
}

7
src/base/net/stratum/NetworkState.h
View File

@@ -27,6 +27,7 @@
#include <array>
#include <string>
#include <vector>
namespace xmrig {
@@ -59,8 +60,6 @@ protected:
void onResultAccepted(IStrategy *strategy, IClient *client, const SubmitResult &result, const char *error) override;
private:
constexpr static size_t kLatencyWindow = 1024;
uint32_t latency() const;
uint64_t avgTime() const;
uint64_t connectionTime() const;
@@ -71,9 +70,7 @@ private:
bool m_active = false;
char m_pool[256]{};
std::array<uint64_t, 10> m_topDiff { { } };
std::array<uint16_t, kLatencyWindow> m_latency { { } };
size_t m_latencyCount = 0;
size_t m_latencyPos = 0;
std::vector<uint16_t> m_latency;
String m_fingerprint;
String m_ip;
String m_tls;