fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separated cn/2 perf numbers

Browse source
This commit is contained in:
MoneroOcean 2018-10-05 12:42:30 +02:00
parent d6f96aad76
commit eec8f8ce4c
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/common/crypto/Algorithm.cpp
View file

@ -245,7 +245,8 @@ const char *xmrig::Algorithm::name(bool shortName) const
const char *xmrig::Algorithm::perfAlgoName(const xmrig::PerfAlgo pa) { const char *xmrig::Algorithm::perfAlgoName(const xmrig::PerfAlgo pa) {
static const char* perf_algo_names[xmrig::PerfAlgo::PA_MAX] = { static const char* perf_algo_names[xmrig::PerfAlgo::PA_MAX] = {
"cn", "cn",
"cn-fast", "cn/2",
"cn/msr",
"cn-lite", "cn-lite",
"cn-heavy", "cn-heavy",
}; };
@ -256,6 +257,10 @@ const char *xmrig::Algorithm::perfAlgoName(const xmrig::PerfAlgo pa) {
xmrig::Algorithm::Algorithm(const xmrig::PerfAlgo pa) { xmrig::Algorithm::Algorithm(const xmrig::PerfAlgo pa) {
switch (pa) { switch (pa) {
case PA_CN: case PA_CN:
m_algo = xmrig::CRYPTONIGHT;
m_variant = xmrig::VARIANT_1;
break;
case PA_CN2:
m_algo = xmrig::CRYPTONIGHT; m_algo = xmrig::CRYPTONIGHT;
m_variant = xmrig::VARIANT_2; m_variant = xmrig::VARIANT_2;
break; break;
@ -281,7 +286,7 @@ xmrig::Algorithm::Algorithm(const xmrig::PerfAlgo pa) {
xmrig::PerfAlgo xmrig::Algorithm::perf_algo() const { xmrig::PerfAlgo xmrig::Algorithm::perf_algo() const {
if (m_variant == VARIANT_MSR) return PA_CN_FAST; if (m_variant == VARIANT_MSR) return PA_CN_FAST;
switch (m_algo) { switch (m_algo) {
case CRYPTONIGHT: return PA_CN; case CRYPTONIGHT: return m_variant == VARIANT_2 ? PA_CN2 : PA_CN;
case CRYPTONIGHT_LITE: return PA_CN_LITE; case CRYPTONIGHT_LITE: return PA_CN_LITE;
case CRYPTONIGHT_HEAVY: return PA_CN_HEAVY; case CRYPTONIGHT_HEAVY: return PA_CN_HEAVY;
default: return PA_INVALID; default: return PA_INVALID;

1
src/common/xmrig.h
View file

@ -42,6 +42,7 @@ enum Algo {
enum PerfAlgo { enum PerfAlgo {
PA_INVALID = -1, PA_INVALID = -1,
PA_CN, /* CryptoNight (Monero) */ PA_CN, /* CryptoNight (Monero) */
PA_CN2, /* CryptoNight/2 (Monero) */
PA_CN_FAST, /* CryptoNight-Fast (Masari) */ PA_CN_FAST, /* CryptoNight-Fast (Masari) */
PA_CN_LITE, /* CryptoNight-Lite (AEON) */ PA_CN_LITE, /* CryptoNight-Lite (AEON) */
PA_CN_HEAVY, /* CryptoNight-Heavy (SUMO) */ PA_CN_HEAVY, /* CryptoNight-Heavy (SUMO) */