diff --git a/src/App.cpp b/src/App.cpp index 9577189f..e3a65cc6 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -136,7 +136,7 @@ int App::exec() // run benchmark before pool mining or not? if (m_controller->config()->get_algo_perf(xmrig::PA_CN) == 0.0f || m_controller->config()->isCalibrateAlgo()) { benchmark.set_controller(m_controller); // we need controller there to access config and network objects - Workers::setListener(&benchmark); // register benchmark as job reault listener to compute hashrates there + Workers::setListener(&benchmark); // register benchmark as job result listener to compute hashrates there // write text before first benchmark round Log::i()->text(m_controller->config()->isColors() ? GREEN_BOLD(" >>>>> ") WHITE_BOLD("STARTING ALGO PERFORMANCE CALIBRATION (with %i seconds round)") diff --git a/src/common/crypto/Algorithm.cpp b/src/common/crypto/Algorithm.cpp index 11609fb9..b6c8ae5b 100644 --- a/src/common/crypto/Algorithm.cpp +++ b/src/common/crypto/Algorithm.cpp @@ -272,7 +272,7 @@ const char *xmrig::Algorithm::perfAlgoName(const xmrig::PerfAlgo pa) { static const char* perf_algo_names[xmrig::PerfAlgo::PA_MAX] = { "cn", "cn/2", - "cn/msr", + "cn/half", "cn-lite", "cn-heavy", }; @@ -290,9 +290,9 @@ xmrig::Algorithm::Algorithm(const xmrig::PerfAlgo pa) { m_algo = xmrig::CRYPTONIGHT; m_variant = xmrig::VARIANT_2; break; - case PA_CN_FAST: + case PA_CN_HALF: m_algo = xmrig::CRYPTONIGHT; - m_variant = xmrig::VARIANT_MSR; + m_variant = xmrig::VARIANT_HALF; break; case PA_CN_LITE: m_algo = xmrig::CRYPTONIGHT_LITE; @@ -310,9 +310,13 @@ xmrig::Algorithm::Algorithm(const xmrig::PerfAlgo pa) { // returns PerfAlgo that corresponds to current Algorithm xmrig::PerfAlgo xmrig::Algorithm::perf_algo() const { - if (m_variant == VARIANT_MSR) return PA_CN_FAST; switch (m_algo) { - case CRYPTONIGHT: return m_variant == VARIANT_2 ? PA_CN2 : PA_CN; + case CRYPTONIGHT: + switch (m_variant) { + case VARIANT_2: return PA_CN2; + case VARIANT_HALF: return PA_CN_HALF; + default: return PA_CN; + } case CRYPTONIGHT_LITE: return PA_CN_LITE; case CRYPTONIGHT_HEAVY: return PA_CN_HEAVY; default: return PA_INVALID; diff --git a/src/common/net/Pool.cpp b/src/common/net/Pool.cpp index 143bb74e..e1aa269d 100644 --- a/src/common/net/Pool.cpp +++ b/src/common/net/Pool.cpp @@ -59,6 +59,7 @@ Pool::Pool() : m_algorithms.push_back(xmrig::Algorithm(xmrig::CRYPTONIGHT, xmrig::VARIANT_MSR)); m_algorithms.push_back(xmrig::Algorithm(xmrig::CRYPTONIGHT, xmrig::VARIANT_XAO)); m_algorithms.push_back(xmrig::Algorithm(xmrig::CRYPTONIGHT, xmrig::VARIANT_RTO)); + m_algorithms.push_back(xmrig::Algorithm(xmrig::CRYPTONIGHT, xmrig::VARIANT_HALF)); m_algorithms.push_back(xmrig::Algorithm(xmrig::CRYPTONIGHT_LITE, xmrig::VARIANT_1)); m_algorithms.push_back(xmrig::Algorithm(xmrig::CRYPTONIGHT_LITE, xmrig::VARIANT_0)); diff --git a/src/common/xmrig.h b/src/common/xmrig.h index 6fa5f63f..7ca96df3 100644 --- a/src/common/xmrig.h +++ b/src/common/xmrig.h @@ -44,7 +44,7 @@ enum PerfAlgo { PA_INVALID = -1, PA_CN, /* CryptoNight (Monero) */ PA_CN2, /* CryptoNight/2 (Monero) */ - PA_CN_FAST, /* CryptoNight-Fast (Masari) */ + PA_CN_HALF, /* CryptoNight-Half (Masari) */ PA_CN_LITE, /* CryptoNight-Lite (AEON) */ PA_CN_HEAVY, /* CryptoNight-Heavy (SUMO) */ PA_MAX diff --git a/src/workers/Benchmark.cpp b/src/workers/Benchmark.cpp index c32db0d0..c6a78f7a 100644 --- a/src/workers/Benchmark.cpp +++ b/src/workers/Benchmark.cpp @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2016-2018 XMRig , - * Copyright 2018 MoneroOcean , + * Copyright 2018-2019 MoneroOcean , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/workers/Benchmark.h b/src/workers/Benchmark.h index 795edc6d..cef9f9c9 100644 --- a/src/workers/Benchmark.h +++ b/src/workers/Benchmark.h @@ -6,7 +6,7 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2016-2018 XMRig , - * Copyright 2018 MoneroOcean , + * Copyright 2018-2019 MoneroOcean , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by