mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2026-02-02 02:03:03 -05:00
Code Issues Projects Releases Wiki Activity

xmrig v2.13.0 rebase

Browse Source
This commit is contained in:
MoneroOcean
2019-02-21 15:54:11 -08:00
parent e600d22cc6 cac240104e
commit cb22009ee5
111 changed files with 5210 additions and 1292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/crypto/Algorithm.cpp
View File

@@ -66,6 +66,8 @@ static AlgoData const algorithms[] = {
{ "cryptonight/half", "cn/half", xmrig::CRYPTONIGHT, xmrig::VARIANT_HALF },
{ "cryptonight/xtlv9", "cn/xtlv9", xmrig::CRYPTONIGHT, xmrig::VARIANT_HALF },
{ "cryptonight/wow", "cn/wow", xmrig::CRYPTONIGHT, xmrig::VARIANT_WOW },
{ "cryptonight/r", "cn/r", xmrig::CRYPTONIGHT, xmrig::VARIANT_4 },
{ "cryptonight/4", "cn/4", xmrig::CRYPTONIGHT, xmrig::VARIANT_4 },
# ifndef XMRIG_NO_AEON
{ "cryptonight-lite", "cn-lite", xmrig::CRYPTONIGHT_LITE, xmrig::VARIANT_AUTO },
@@ -131,6 +133,7 @@ static const char *variants[] = {
"trtl",
"gpu",
"wow",
"4",
};
@@ -296,7 +299,7 @@ const char *xmrig::Algorithm::perfAlgoName(const xmrig::PerfAlgo pa) {
"cn/2",
"cn/half",
"cn/gpu",
"cn/wow",
"cn/4",
"cn-lite",
"cn-heavy",
"cn-pico",
@@ -323,9 +326,9 @@ xmrig::Algorithm::Algorithm(const xmrig::PerfAlgo pa) {
m_algo = xmrig::CRYPTONIGHT;
m_variant = xmrig::VARIANT_GPU;
break;
case PA_CN_WOW:
case PA_CN4:
m_algo = xmrig::CRYPTONIGHT;
m_variant = xmrig::VARIANT_WOW;
m_variant = xmrig::VARIANT_4;
break;
case PA_CN_LITE:
m_algo = xmrig::CRYPTONIGHT_LITE;
@@ -353,7 +356,7 @@ xmrig::PerfAlgo xmrig::Algorithm::perf_algo() const {
case VARIANT_2: return PA_CN2;
case VARIANT_HALF: return PA_CN_HALF;
case VARIANT_GPU: return PA_CN_GPU;
case VARIANT_WOW: return PA_CN_WOW;
case VARIANT_4: return PA_CN4;
default: return PA_CN;
}
case CRYPTONIGHT_LITE: return PA_CN_LITE;

2
src/common/crypto/Algorithm.h
View File

@@ -6,7 +6,7 @@
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018 Lee Clagett <https://github.com/vtnerd>
* Copyright 2018 SChernykh <https://github.com/SChernykh>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright 2018-2019 MoneroOcean <https://github.com/MoneroOcean>, <support@moneroocean.stream>
*