From 5676105b7fff3bb9157b617b9d2fd68133dd3a4f Mon Sep 17 00:00:00 2001 From: Tony Butler Date: Fri, 31 Jul 2020 17:09:20 -0600 Subject: [PATCH] Cleanup useless code, rearrange --- src/backend/common/Tags.h | 4 ---- src/base/kernel/config/BaseConfig.cpp | 4 ++-- src/base/kernel/config/BaseTransform.cpp | 8 ++++---- src/config.json | 4 ++-- src/core/MoBenchmark.cpp | 5 ----- src/core/config/Config.cpp | 3 +-- src/core/config/Config_platform.h | 6 ++++-- src/crypto/randomx/randomx.cpp | 14 ++++++++++++++ src/crypto/randomx/randomx.h | 4 +--- src/version.h | 2 +- 10 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/backend/common/Tags.h b/src/backend/common/Tags.h index 03cee729c2..0e29827595 100644 --- a/src/backend/common/Tags.h +++ b/src/backend/common/Tags.h @@ -46,10 +46,6 @@ const char *ocl_tag(); const char *cuda_tag(); #endif -#ifdef XMRIG_FEATURE_BENCHMARK -const char *bm_tag(); -#endif - } // namespace xmrig diff --git a/src/base/kernel/config/BaseConfig.cpp b/src/base/kernel/config/BaseConfig.cpp index cb0e4f9064..19b5cfac24 100644 --- a/src/base/kernel/config/BaseConfig.cpp +++ b/src/base/kernel/config/BaseConfig.cpp @@ -101,12 +101,12 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName) m_autoSave = reader.getBool(kAutosave, m_autoSave); m_background = reader.getBool(kBackground, m_background); m_dryRun = reader.getBool(kDryRun, m_dryRun); + m_pauseOnBattery = reader.getBool(kPauseOnBattery, m_pauseOnBattery); # ifdef XMRIG_FEATURE_BENCHMARK - m_rebenchAlgo = reader.getBool(kRebenchAlgo, m_rebenchAlgo); + m_rebenchAlgo = reader.getBool(kRebenchAlgo, m_rebenchAlgo); # endif m_syslog = reader.getBool(kSyslog, m_syslog); m_watch = reader.getBool(kWatch, m_watch); - m_pauseOnBattery = reader.getBool(kPauseOnBattery, m_pauseOnBattery); m_logFile = reader.getString(kLogFile); m_userAgent = reader.getString(kUserAgent); m_printTime = std::min(reader.getUint(kPrintTime, m_printTime), 3600U); diff --git a/src/base/kernel/config/BaseTransform.cpp b/src/base/kernel/config/BaseTransform.cpp index 8bf3c1f808..1fd64367b6 100644 --- a/src/base/kernel/config/BaseTransform.cpp +++ b/src/base/kernel/config/BaseTransform.cpp @@ -271,10 +271,10 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch case IConfig::DaemonKey: /* --daemon */ # endif case IConfig::VerboseKey: /* --verbose */ + case IConfig::PauseOnBatteryKey: /* --pause-on-battery */ # ifdef XMRIG_FEATURE_BENCHMARK case IConfig::RebenchAlgoKey: /* --rebench-algo */ # endif - case IConfig::PauseOnBatteryKey: /* --pause-on-battery */ return transformBoolean(doc, key, true); case IConfig::ColorKey: /* --no-color */ @@ -333,14 +333,14 @@ void xmrig::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, b case IConfig::NoTitleKey: /* --no-title */ return set(doc, BaseConfig::kTitle, enable); + case IConfig::PauseOnBatteryKey: /* --pause-on-battery */ + return set(doc, BaseConfig::kPauseOnBattery, enable); + # ifdef XMRIG_FEATURE_BENCHMARK case IConfig::RebenchAlgoKey: /* --rebench-algo */ return set(doc, BaseConfig::kRebenchAlgo, enable); # endif - case IConfig::PauseOnBatteryKey: /* --pause-on-battery */ - return set(doc, BaseConfig::kPauseOnBattery, enable); - default: break; } diff --git a/src/config.json b/src/config.json index b3c3f46084..549b224f09 100644 --- a/src/config.json +++ b/src/config.json @@ -94,7 +94,7 @@ "user-agent": null, "verbose": 0, "watch": true, + "pause-on-battery": false, "rebench-algo": false, - "bench-algo-time": 20, - "pause-on-battery": false + "bench-algo-time": 20 } diff --git a/src/core/MoBenchmark.cpp b/src/core/MoBenchmark.cpp index 464729bbdb..7fb433af95 100644 --- a/src/core/MoBenchmark.cpp +++ b/src/core/MoBenchmark.cpp @@ -225,8 +225,3 @@ uint64_t MoBenchmark::get_now() const { // get current time in ms } } // namespace xmrig - -const char *xmrig::bm_tag() -{ - return Tags::benchmark(); -} diff --git a/src/core/config/Config.cpp b/src/core/config/Config.cpp index b92af5519f..ba79ca0c3e 100644 --- a/src/core/config/Config.cpp +++ b/src/core/config/Config.cpp @@ -257,12 +257,11 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const doc.AddMember(StringRef(kUserAgent), m_userAgent.toJSON(), allocator); doc.AddMember(StringRef(kVerbose), Log::verbose(), allocator); doc.AddMember(StringRef(kWatch), m_watch, allocator); + doc.AddMember(StringRef(kPauseOnBattery), isPauseOnBattery(), allocator); # ifdef XMRIG_FEATURE_BENCHMARK doc.AddMember(StringRef(kRebenchAlgo), isRebenchAlgo(), allocator); doc.AddMember(StringRef(kBenchAlgoTime), benchAlgoTime(), allocator); doc.AddMember(StringRef(kAlgoPerf), m_benchmark.toJSON(doc), allocator); # endif - - doc.AddMember(StringRef(kPauseOnBattery), isPauseOnBattery(), allocator); } diff --git a/src/core/config/Config_platform.h b/src/core/config/Config_platform.h index 28d6931787..badf45f669 100644 --- a/src/core/config/Config_platform.h +++ b/src/core/config/Config_platform.h @@ -69,8 +69,10 @@ static const option options[] = { { "keepalive", 0, nullptr, IConfig::KeepAliveKey }, { "log-file", 1, nullptr, IConfig::LogFileKey }, { "nicehash", 0, nullptr, IConfig::NicehashKey }, - { "rebench-algo", 0, nullptr, IConfig::RebenchAlgoKey }, - { "bench-algo-time", 1, nullptr, IConfig::BenchAlgoTimeKey }, +# ifdef XMRIG_FEATURE_PERFCHK + { "rechk-algo", 0, nullptr, IConfig::ReChkAlgoKey }, + { "perfchk-time", 1, nullptr, IConfig::PerfChkTimeKey }, +# endif { "no-color", 0, nullptr, IConfig::ColorKey }, { "no-huge-pages", 0, nullptr, IConfig::HugePagesKey }, { "pass", 1, nullptr, IConfig::PasswordKey }, diff --git a/src/crypto/randomx/randomx.cpp b/src/crypto/randomx/randomx.cpp index 7acc96f669..8d9642b537 100644 --- a/src/crypto/randomx/randomx.cpp +++ b/src/crypto/randomx/randomx.cpp @@ -106,6 +106,20 @@ RandomX_ConfigurationKeva::RandomX_ConfigurationKeva() RandomX_ConfigurationScala2::RandomX_ConfigurationScala2() { + ArgonMemory = 131072; + ArgonIterations = 2; + ArgonSalt = "DefyXScala\x13"; + CacheAccesses = 2; + DatasetBaseSize = 33554432; + ScratchpadL1_Size = 65536; + ScratchpadL2_Size = 131072; + ScratchpadL3_Size = 262144; + ProgramSize = 64; + ProgramIterations = 1024; + ProgramCount = 4; + + RANDOMX_FREQ_IADD_RS = 25; + RANDOMX_FREQ_CBRANCH = 16; } RandomX_ConfigurationBase::RandomX_ConfigurationBase() diff --git a/src/crypto/randomx/randomx.h b/src/crypto/randomx/randomx.h index 3ca164078a..11d886bce8 100644 --- a/src/crypto/randomx/randomx.h +++ b/src/crypto/randomx/randomx.h @@ -153,15 +153,13 @@ struct RandomX_ConfigurationWownero : public RandomX_ConfigurationBase { RandomX struct RandomX_ConfigurationArqma : public RandomX_ConfigurationBase { RandomX_ConfigurationArqma(); }; struct RandomX_ConfigurationSafex : public RandomX_ConfigurationBase { RandomX_ConfigurationSafex(); }; struct RandomX_ConfigurationKeva : public RandomX_ConfigurationBase { RandomX_ConfigurationKeva(); }; -struct RandomX_ConfigurationScala : public RandomX_ConfigurationBase { RandomX_ConfigurationScala(); }; -struct RandomX_ConfigurationScala2 : public RandomX_ConfigurationScala { RandomX_ConfigurationScala2(); }; +struct RandomX_ConfigurationScala2 : public RandomX_ConfigurationBase { RandomX_ConfigurationScala2(); }; extern RandomX_ConfigurationMonero RandomX_MoneroConfig; extern RandomX_ConfigurationWownero RandomX_WowneroConfig; extern RandomX_ConfigurationArqma RandomX_ArqmaConfig; extern RandomX_ConfigurationSafex RandomX_SafexConfig; extern RandomX_ConfigurationKeva RandomX_KevaConfig; -extern RandomX_ConfigurationScala RandomX_ScalaConfig; extern RandomX_ConfigurationScala2 RandomX_Scala2Config; extern RandomX_ConfigurationBase RandomX_CurrentConfig; diff --git a/src/version.h b/src/version.h index 118ce52925..409fb22047 100644 --- a/src/version.h +++ b/src/version.h @@ -28,7 +28,7 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig miner" -#define APP_VERSION "6.4.0-mo1" +#define APP_VERSION "6.4.0-mo2" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2020 xmrig.com"