mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-08 16:33:32 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into feature-opencl

Browse Source
This commit is contained in:
XMRig
2019-08-17 23:33:48 +07:00
parent d5f57c35e2 a8ab7e3bef
commit bd07f1d455
121 changed files with 5477 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/config/Config.cpp
View File

@@ -40,7 +40,8 @@
namespace xmrig {
static const char *kCPU = "cpu";
static const char *kCPU = "cpu";
static constexpr const uint32_t kVersion = 1;
#ifdef XMRIG_ALGO_RANDOMX
static const char *kRandomX = "randomx";
@@ -64,6 +65,10 @@ bool xmrig::Config::isShouldSave() const
return false;
}
if (version() < kVersion) {
return true;
}
# ifdef XMRIG_FEATURE_OPENCL
if (m_cl.isShouldSave()) {
return true;
@@ -80,7 +85,7 @@ bool xmrig::Config::read(const IJsonReader &reader, const char *fileName)
return false;
}
m_cpu.read(reader.getValue(kCPU));
m_cpu.read(reader.getValue(kCPU), version());
# ifdef XMRIG_ALGO_RANDOMX
if (!m_rx.read(reader.getValue(kRandomX))) {
@@ -105,12 +110,13 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const
auto &allocator = doc.GetAllocator();
Value api(kObjectType);
api.AddMember("id", m_apiId.toJSON(), allocator);
api.AddMember("worker-id", m_apiWorkerId.toJSON(), allocator);
api.AddMember("id", m_apiId.toJSON(), allocator);
api.AddMember("worker-id", m_apiWorkerId.toJSON(), allocator);
doc.AddMember("api", api, allocator);
doc.AddMember("http", m_http.toJSON(doc), allocator);
doc.AddMember("autosave", isAutoSave(), allocator);
doc.AddMember("version", kVersion, allocator);
doc.AddMember("background", isBackground(), allocator);
doc.AddMember("colors", Log::colors, allocator);