From 40e8bfe4439bd64be300119d294b3be71cc8c1ca Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Fri, 20 Sep 2019 14:15:35 +0700
Subject: [PATCH] Added global backends hashrate to "GET /2/backends" endpoint.
---
src/backend/common/Hashrate.cpp | 38 +++++++++++++++++++++++---
src/backend/common/Hashrate.h | 12 ++++++--
src/backend/cpu/CpuBackend.cpp | 11 ++------
src/backend/opencl/OclBackend.cpp | 11 ++------
src/backend/opencl/wrappers/OclLib.cpp | 2 +-
5 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/src/backend/common/Hashrate.cpp b/src/backend/common/Hashrate.cpp
index 99a9a9c5f..1c9873e01 100644
--- a/src/backend/common/Hashrate.cpp
+++ b/src/backend/common/Hashrate.cpp
@@ -23,10 +23,10 @@
*/
-#include <assert.h>
+#include <cassert>
#include <cmath>
#include <memory.h>
-#include <stdio.h>
+#include <cstdio>
#include "backend/common/Hashrate.h"
@@ -133,8 +133,8 @@ double xmrig::Hashrate::calc(size_t threadId, size_t ms) const
return nan("");
}
- const double hashes = static_cast<double>(lastestHashCnt - earliestHashCount);
- const double time = static_cast<double>(lastestStamp - earliestStamp) / 1000.0;
+ const auto hashes = static_cast<double>(lastestHashCnt - earliestHashCount);
+ const auto time = static_cast<double>(lastestStamp - earliestStamp) / 1000.0;
return hashes / time;
}
@@ -175,3 +175,33 @@ rapidjson::Value xmrig::Hashrate::normalize(double d)
return Value(floor(d * 100.0) / 100.0);
}
+
+
+#ifdef XMRIG_FEATURE_API
+rapidjson::Value xmrig::Hashrate::toJSON(rapidjson::Document &doc) const
+{
+ using namespace rapidjson;
+ auto &allocator = doc.GetAllocator();
+
+ Value out(kArrayType);
+ out.PushBack(normalize(calc(ShortInterval)), allocator);
+ out.PushBack(normalize(calc(MediumInterval)), allocator);
+ out.PushBack(normalize(calc(LargeInterval)), allocator);
+
+ return out;
+}
+
+
+rapidjson::Value xmrig::Hashrate::toJSON(size_t threadId, rapidjson::Document &doc) const
+{
+ using namespace rapidjson;
+ auto &allocator = doc.GetAllocator();
+
+ Value out(kArrayType);
+ out.PushBack(normalize(calc(threadId, ShortInterval)), allocator);
+ out.PushBack(normalize(calc(threadId, MediumInterval)), allocator);
+ out.PushBack(normalize(calc(threadId, LargeInterval)), allocator);
+
+ return out;
+}
+#endif
diff --git a/src/backend/common/Hashrate.h b/src/backend/common/Hashrate.h
index 0674c6aba..b9ca8430d 100644
--- a/src/backend/common/Hashrate.h
+++ b/src/backend/common/Hashrate.h
@@ -26,10 +26,11 @@
#define XMRIG_HASHRATE_H
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
+#include "base/tools/Object.h"
#include "rapidjson/fwd.h"
@@ -39,6 +40,8 @@ namespace xmrig {
class Hashrate
{
public:
+ XMRIG_DISABLE_COPY_MOVE_DEFAULT(Hashrate)
+
enum Intervals {
ShortInterval = 10000,
MediumInterval = 60000,
@@ -58,6 +61,11 @@ public:
static const char *format(double h, char *buf, size_t size);
static rapidjson::Value normalize(double d);
+# ifdef XMRIG_FEATURE_API
+ rapidjson::Value toJSON(rapidjson::Document &doc) const;
+ rapidjson::Value toJSON(size_t threadId, rapidjson::Document &doc) const;
+# endif
+
private:
constexpr static size_t kBucketSize = 2 << 11;
constexpr static size_t kBucketMask = kBucketSize - 1;
diff --git a/src/backend/cpu/CpuBackend.cpp b/src/backend/cpu/CpuBackend.cpp
index de2e61103..d6d3ff14c 100644
--- a/src/backend/cpu/CpuBackend.cpp
+++ b/src/backend/cpu/CpuBackend.cpp
@@ -405,8 +405,9 @@ rapidjson::Value xmrig::CpuBackend::toJSON(rapidjson::Document &doc) const
return out;
}
+ out.AddMember("hashrate", hashrate()->toJSON(doc), allocator);
+
Value threads(kArrayType);
- const Hashrate *hr = hashrate();
size_t i = 0;
for (const CpuLaunchData &data : d_ptr->threads) {
@@ -414,15 +415,9 @@ rapidjson::Value xmrig::CpuBackend::toJSON(rapidjson::Document &doc) const
thread.AddMember("intensity", data.intensity, allocator);
thread.AddMember("affinity", data.affinity, allocator);
thread.AddMember("av", data.av(), allocator);
-
- Value hashrate(kArrayType);
- hashrate.PushBack(Hashrate::normalize(hr->calc(i, Hashrate::ShortInterval)), allocator);
- hashrate.PushBack(Hashrate::normalize(hr->calc(i, Hashrate::MediumInterval)), allocator);
- hashrate.PushBack(Hashrate::normalize(hr->calc(i, Hashrate::LargeInterval)), allocator);
+ thread.AddMember("hashrate", hashrate()->toJSON(i, doc), allocator);
i++;
-
- thread.AddMember("hashrate", hashrate, allocator);
threads.PushBack(thread, allocator);
}
diff --git a/src/backend/opencl/OclBackend.cpp b/src/backend/opencl/OclBackend.cpp
index 2bce87b84..65c3ded9c 100644
--- a/src/backend/opencl/OclBackend.cpp
+++ b/src/backend/opencl/OclBackend.cpp
@@ -391,22 +391,17 @@ rapidjson::Value xmrig::OclBackend::toJSON(rapidjson::Document &doc) const
return out;
}
+ out.AddMember("hashrate", hashrate()->toJSON(doc), allocator);
+
Value threads(kArrayType);
- const Hashrate *hr = hashrate();
size_t i = 0;
for (const OclLaunchData &data : d_ptr->threads) {
Value thread = data.thread.toJSON(doc);
thread.AddMember("affinity", data.affinity, allocator);
-
- Value hashrate(kArrayType);
- hashrate.PushBack(Hashrate::normalize(hr->calc(i, Hashrate::ShortInterval)), allocator);
- hashrate.PushBack(Hashrate::normalize(hr->calc(i, Hashrate::MediumInterval)), allocator);
- hashrate.PushBack(Hashrate::normalize(hr->calc(i, Hashrate::LargeInterval)), allocator);
+ thread.AddMember("hashrate", hashrate()->toJSON(i, doc), allocator);
i++;
-
- thread.AddMember("hashrate", hashrate, allocator);
threads.PushBack(thread, allocator);
}
diff --git a/src/backend/opencl/wrappers/OclLib.cpp b/src/backend/opencl/wrappers/OclLib.cpp
index 0a6958d48..826b88c5d 100644
--- a/src/backend/opencl/wrappers/OclLib.cpp
+++ b/src/backend/opencl/wrappers/OclLib.cpp
@@ -561,7 +561,7 @@ cl_int xmrig::OclLib::release(cl_program program) noexcept
return CL_SUCCESS;
}
- LOG_REFS("%p %u ~program %s", program, getUint(program, CL_PROGRAM_REFERENCE_COUNT), getString(program, CL_PROGRAM_KERNEL_NAMES).data()); // FIXME
+ LOG_REFS("%p %u ~program %s", program, getUint(program, CL_PROGRAM_REFERENCE_COUNT), getString(program, CL_PROGRAM_KERNEL_NAMES).data());
const cl_int ret = pReleaseProgram(program);
if (ret != CL_SUCCESS) {