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

Merge xmrig v6.15.0 into master

Browse source
This commit is contained in:
MoneroOcean 2021-08-31 16:45:39 +00:00
commit 29fa5c61e0
258 changed files with 13719 additions and 8163 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/Controller.cpp
View file

@ -1,6 +1,6 @@
/* XMRig
* Copyright 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
*
* 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
@ -16,7 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "core/Controller.h"
#include "backend/cpu/Cpu.h"
#include "core/config/Config.h"
@ -107,7 +106,7 @@ xmrig::Network *xmrig::Controller::network() const
}
void xmrig::Controller::execCommand(char command)
void xmrig::Controller::execCommand(char command) const
{
miner()->execCommand(command);
network()->execCommand(command);

6
src/core/Controller.h
View file

@ -1,6 +1,6 @@
/* XMRig
* Copyright 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
*
* 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
@ -52,7 +52,7 @@ public:
Miner *miner() const;
Network *network() const;
void execCommand(char command);
void execCommand(char command) const;
private:
std::shared_ptr<Miner> m_miner;

4
src/core/Miner.cpp
View file

@ -78,7 +78,7 @@ public:
XMRIG_DISABLE_COPY_MOVE_DEFAULT(MinerPrivate)
inline MinerPrivate(Controller *controller) : controller(controller) {}
inline explicit MinerPrivate(Controller *controller) : controller(controller) {}
inline ~MinerPrivate()
@ -329,7 +329,7 @@ public:
# ifdef XMRIG_ALGO_RANDOMX
inline bool initRX() { return Rx::init(job, controller->config()->rx(), controller->config()->cpu()); }
inline bool initRX() const { return Rx::init(job, controller->config()->rx(), controller->config()->cpu()); }
# endif

2
src/core/MoBenchmark.cpp
View file

@ -136,7 +136,7 @@ double MoBenchmark::get_algo_perf(Algorithm::Id algo) const {
case Algorithm::KAWPOW_RVN: return m_bench_algo_perf[BenchAlgo::KAWPOW_RVN];
case Algorithm::RX_0: return m_bench_algo_perf[BenchAlgo::RX_0];
case Algorithm::RX_SFX: return m_bench_algo_perf[BenchAlgo::RX_0];
case Algorithm::RX_WOW: return m_bench_algo_perf[BenchAlgo::RX_WOW];
case Algorithm::RX_GRAFT: return m_bench_algo_perf[BenchAlgo::RX_GRAFT];
case Algorithm::RX_ARQ: return m_bench_algo_perf[BenchAlgo::RX_ARQ];
case Algorithm::RX_XLA: return m_bench_algo_perf[BenchAlgo::RX_XLA];
default: return 0.0f;

4
src/core/MoBenchmark.h
View file

@ -44,7 +44,7 @@ class MoBenchmark : public IJobResultListener {
KAWPOW_RVN, // "kawpow/rvn" KawPow (RVN)
ASTROBWT_DERO, // "astrobwt" AstroBWT (Dero).
RX_0, // "rx/0" RandomX (Monero).
RX_WOW, // "rx/wow" RandomWOW (Wownero).
RX_GRAFT, // "rx/graft" RandomGraft (Graft).
RX_ARQ, // "rx/arq" RandomARQ (Arqma).
RX_XLA, // "panthera" Panthera (Scala2).
MAX,
@ -63,7 +63,7 @@ class MoBenchmark : public IJobResultListener {
Algorithm::KAWPOW_RVN,
Algorithm::ASTROBWT_DERO,
Algorithm::RX_0,
Algorithm::RX_WOW,
Algorithm::RX_GRAFT,
Algorithm::RX_ARQ,
Algorithm::RX_XLA,
};

3
src/core/config/Config.cpp
View file

@ -16,7 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <algorithm>
#include <cinttypes>
#include <cstring>
@ -112,7 +111,7 @@ public:
}
};
}
} // namespace xmrig
xmrig::Config::Config() :

4
src/core/config/ConfigTransform.cpp
View file

@ -16,7 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "core/config/ConfigTransform.h"
#include "base/kernel/interfaces/IConfig.h"
#include "base/net/stratum/Pool.h"
@ -360,6 +359,9 @@ void xmrig::ConfigTransform::transformBenchmark(rapidjson::Document &doc, int ke
case IConfig::UserKey: /* --user */
return set(doc, BenchConfig::kBenchmark, BenchConfig::kUser, arg);
default:
break;
}
}
#endif