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

Removed xmrig.h.

Browse source
This commit is contained in:
XMRig 2019-07-13 19:10:17 +07:00
parent 8b3f2d8fff
commit dc87ef6062
13 changed files with 53 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,7 @@
xmrig::Config::Config() :
m_algoVariant(AV_AUTO),
m_algoVariant(CnHash::AV_AUTO),
m_shouldSave(false)
{
}
@ -131,7 +131,7 @@ bool xmrig::Config::finalize()
return true;
}
const AlgoVariant av = getAlgoVariant();
const CnHash::AlgoVariant av = getAlgoVariant();
m_threads.mode = m_threads.count ? Simple : Automatic;
const size_t size = CpuThreadLegacy::multiway(av) * CnAlgo<>::memory(algorithm) / 1024; // FIXME MEMORY
@ -158,8 +158,8 @@ bool xmrig::Config::finalize()
void xmrig::Config::setAlgoVariant(int av)
{
if (av >= AV_AUTO && av < AV_MAX) {
m_algoVariant = static_cast<AlgoVariant>(av);
if (av >= CnHash::AV_AUTO && av < CnHash::AV_MAX) {
m_algoVariant = static_cast<CnHash::AlgoVariant>(av);
}
}
@ -192,7 +192,7 @@ void xmrig::Config::setThreads(const rapidjson::Value &threads)
}
xmrig::AlgoVariant xmrig::Config::getAlgoVariant() const
xmrig::CnHash::AlgoVariant xmrig::Config::getAlgoVariant() const
{
# ifdef XMRIG_ALGO_CN_LITE
// if (m_algorithm.algo() == xmrig::CRYPTONIGHT_LITE) { // FIXME
@ -200,8 +200,8 @@ xmrig::AlgoVariant xmrig::Config::getAlgoVariant() const
// }
# endif
if (m_algoVariant <= AV_AUTO || m_algoVariant >= AV_MAX) {
return Cpu::info()->hasAES() ? AV_SINGLE : AV_SINGLE_SOFT;
if (m_algoVariant <= CnHash::AV_AUTO || m_algoVariant >= CnHash::AV_MAX) {
return Cpu::info()->hasAES() ? CnHash::AV_SINGLE : CnHash::AV_SINGLE_SOFT;
}
// if (m_safe && !Cpu::info()->hasAES() && m_algoVariant <= AV_DOUBLE) {
@ -213,10 +213,10 @@ xmrig::AlgoVariant xmrig::Config::getAlgoVariant() const
#ifdef XMRIG_ALGO_CN_LITE
xmrig::AlgoVariant xmrig::Config::getAlgoVariantLite() const
xmrig::CnHash::AlgoVariant xmrig::Config::getAlgoVariantLite() const
{
if (m_algoVariant <= AV_AUTO || m_algoVariant >= AV_MAX) {
return Cpu::info()->hasAES() ? AV_DOUBLE : AV_DOUBLE_SOFT;
if (m_algoVariant <= CnHash::AV_AUTO || m_algoVariant >= CnHash::AV_MAX) {
return Cpu::info()->hasAES() ? CnHash::AV_DOUBLE : CnHash::AV_DOUBLE_SOFT;
}
// if (m_safe && !Cpu::info()->hasAES() && m_algoVariant <= AV_DOUBLE) {

9
src/core/config/Config.h
View file

@ -32,7 +32,6 @@
#include "backend/cpu/CpuConfig.h"
#include "base/kernel/config/BaseConfig.h"
#include "common/xmrig.h"
#include "rapidjson/fwd.h"
#include "workers/CpuThreadLegacy.h"
@ -58,7 +57,7 @@ public:
bool read(const IJsonReader &reader, const char *fileName) override;
void getJSON(rapidjson::Document &doc) const override;
inline AlgoVariant algoVariant() const { return m_algoVariant; }
inline CnHash::AlgoVariant algoVariant() const { return m_algoVariant; }
inline bool isShouldSave() const { return (m_shouldSave || m_upgrade || m_cpu.isShouldSave()) && isAutoSave(); }
inline const CpuConfig &cpu() const { return m_cpu; }
inline const std::vector<IThread *> &threads() const { return m_threads.list; }
@ -70,9 +69,9 @@ private:
void setAlgoVariant(int av);
void setThreads(const rapidjson::Value &threads);
AlgoVariant getAlgoVariant() const;
CnHash::AlgoVariant getAlgoVariant() const;
# ifdef XMRIG_ALGO_CN_LITE
AlgoVariant getAlgoVariantLite() const;
CnHash::AlgoVariant getAlgoVariantLite() const;
# endif
struct Threads
@ -87,7 +86,7 @@ private:
};
AlgoVariant m_algoVariant;
CnHash::AlgoVariant m_algoVariant;
bool m_shouldSave;
CpuConfig m_cpu;
Threads m_threads;