Added option "init-threads".

This commit is contained in:
XMRig 2019-07-25 12:20:59 +07:00
parent 2876702ea2
commit 4a32494060
4 changed files with 31 additions and 7 deletions

View file

@ -29,12 +29,18 @@
#include "rapidjson/document.h"
#ifdef XMRIG_ALGO_RANDOMX
# include "crypto/rx/Rx.h"
#endif
namespace xmrig {
static const char *kCn = "cn";
static const char *kEnabled = "enabled";
static const char *kHugePages = "huge-pages";
static const char *kHwAes = "hw-aes";
static const char *kInitThreads = "init-threads";
static const char *kPriority = "priority";
#ifdef XMRIG_FEATURE_ASM
@ -89,6 +95,7 @@ rapidjson::Value xmrig::CpuConfig::toJSON(rapidjson::Document &doc) const
obj.AddMember(StringRef(kHugePages), m_hugePages, allocator);
obj.AddMember(StringRef(kHwAes), m_aes == AES_AUTO ? Value(kNullType) : Value(m_aes == AES_HW), allocator);
obj.AddMember(StringRef(kPriority), priority() != -1 ? Value(priority()) : Value(kNullType), allocator);
obj.AddMember(StringRef(kInitThreads), m_initThreads, allocator);
# ifdef XMRIG_FEATURE_ASM
obj.AddMember(StringRef(kAsm), m_assembly.toJSON(), allocator);
@ -122,8 +129,9 @@ std::vector<xmrig::CpuLaunchData> xmrig::CpuConfig::get(const Miner *miner, cons
void xmrig::CpuConfig::read(const rapidjson::Value &value)
{
if (value.IsObject()) {
m_enabled = Json::getBool(value, kEnabled, m_enabled);
m_hugePages = Json::getBool(value, kHugePages, m_hugePages);
m_enabled = Json::getBool(value, kEnabled, m_enabled);
m_hugePages = Json::getBool(value, kHugePages, m_hugePages);
m_initThreads = Json::getInt(value, kInitThreads, m_initThreads);
setAesMode(Json::getValue(value, kHwAes));
setPriority(Json::getInt(value, kPriority, -1));
@ -132,6 +140,10 @@ void xmrig::CpuConfig::read(const rapidjson::Value &value)
m_assembly = Json::getValue(value, kAsm);
# endif
# ifdef XMRIG_ALGO_RANDOMX
Rx::setInitThreads(m_initThreads);
# endif
if (!m_threads.read(value)) {
generate();
}