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

38
src/workers/CpuThreadLegacy.cpp
View file

@ -38,7 +38,7 @@
static const xmrig::CnHash cnHash;
xmrig::CpuThreadLegacy::CpuThreadLegacy(size_t index, Algorithm algorithm, AlgoVariant av, Multiway multiway, int64_t affinity, int priority, bool softAES, bool prefetch, Assembly assembly) :
xmrig::CpuThreadLegacy::CpuThreadLegacy(size_t index, Algorithm algorithm, CnHash::AlgoVariant av, Multiway multiway, int64_t affinity, int priority, bool softAES, bool prefetch, Assembly assembly) :
m_algorithm(algorithm),
m_av(av),
m_assembly(assembly),
@ -59,15 +59,15 @@ xmrig::cn_hash_fun xmrig::CpuThreadLegacy::fn(const Algorithm &algorithm) const
bool xmrig::CpuThreadLegacy::isSoftAES(AlgoVariant av)
bool xmrig::CpuThreadLegacy::isSoftAES(CnHash::AlgoVariant av)
{
return av == AV_SINGLE_SOFT || av == AV_DOUBLE_SOFT || av > AV_PENTA;
return av == CnHash::AV_SINGLE_SOFT || av == CnHash::AV_DOUBLE_SOFT || av > CnHash::AV_PENTA;
}
xmrig::CpuThreadLegacy *xmrig::CpuThreadLegacy::createFromAV(size_t index, const Algorithm &algorithm, AlgoVariant av, int64_t affinity, int priority, Assembly assembly)
xmrig::CpuThreadLegacy *xmrig::CpuThreadLegacy::createFromAV(size_t index, const Algorithm &algorithm, CnHash::AlgoVariant av, int64_t affinity, int priority, Assembly assembly)
{
assert(av > AV_AUTO && av < AV_MAX);
assert(av > CnHash::AV_AUTO && av < CnHash::AV_MAX);
int64_t cpuId = -1L;
@ -94,7 +94,7 @@ xmrig::CpuThreadLegacy *xmrig::CpuThreadLegacy::createFromAV(size_t index, const
xmrig::CpuThreadLegacy *xmrig::CpuThreadLegacy::createFromData(size_t index, const Algorithm &algorithm, const CpuThreadLegacy::Data &data, int priority, bool softAES)
{
int av = AV_AUTO;
int av = CnHash::AV_AUTO;
const Multiway multiway = data.multiway;
if (multiway <= DoubleWay) {
@ -104,9 +104,9 @@ xmrig::CpuThreadLegacy *xmrig::CpuThreadLegacy::createFromData(size_t index, con
av = softAES ? (multiway + 5) : (multiway + 2);
}
assert(av > AV_AUTO && av < AV_MAX);
assert(av > CnHash::AV_AUTO && av < CnHash::AV_MAX);
return new CpuThreadLegacy(index, algorithm, static_cast<AlgoVariant>(av), multiway, data.affinity, priority, softAES, false, data.assembly);
return new CpuThreadLegacy(index, algorithm, static_cast<CnHash::AlgoVariant>(av), multiway, data.affinity, priority, softAES, false, data.assembly);
}
@ -140,27 +140,27 @@ xmrig::CpuThreadLegacy::Data xmrig::CpuThreadLegacy::parse(const rapidjson::Valu
}
xmrig::IThread::Multiway xmrig::CpuThreadLegacy::multiway(AlgoVariant av)
xmrig::IThread::Multiway xmrig::CpuThreadLegacy::multiway(CnHash::AlgoVariant av)
{
switch (av) {
case AV_SINGLE:
case AV_SINGLE_SOFT:
case CnHash::AV_SINGLE:
case CnHash::AV_SINGLE_SOFT:
return SingleWay;
case AV_DOUBLE_SOFT:
case AV_DOUBLE:
case CnHash::AV_DOUBLE_SOFT:
case CnHash::AV_DOUBLE:
return DoubleWay;
case AV_TRIPLE_SOFT:
case AV_TRIPLE:
case CnHash::AV_TRIPLE_SOFT:
case CnHash::AV_TRIPLE:
return TripleWay;
case AV_QUAD_SOFT:
case AV_QUAD:
case CnHash::AV_QUAD_SOFT:
case CnHash::AV_QUAD:
return QuadWay;
case AV_PENTA_SOFT:
case AV_PENTA:
case CnHash::AV_PENTA_SOFT:
case CnHash::AV_PENTA:
return PentaWay;
default:

11
src/workers/CpuThreadLegacy.h
View file

@ -26,7 +26,6 @@
#define XMRIG_CPUTHREADLEGACY_H
#include "common/xmrig.h"
#include "crypto/cn/CnHash.h"
#include "interfaces/IThread.h"
@ -59,15 +58,15 @@ public:
};
CpuThreadLegacy(size_t index, Algorithm algorithm, AlgoVariant av, Multiway multiway, int64_t affinity, int priority, bool softAES, bool prefetch, Assembly assembly);
CpuThreadLegacy(size_t index, Algorithm algorithm, CnHash::AlgoVariant av, Multiway multiway, int64_t affinity, int priority, bool softAES, bool prefetch, Assembly assembly);
cn_hash_fun fn(const Algorithm &algorithm) const;
static bool isSoftAES(AlgoVariant av);
static CpuThreadLegacy *createFromAV(size_t index, const Algorithm &algorithm, AlgoVariant av, int64_t affinity, int priority, Assembly assembly);
static bool isSoftAES(CnHash::AlgoVariant av);
static CpuThreadLegacy *createFromAV(size_t index, const Algorithm &algorithm, CnHash::AlgoVariant av, int64_t affinity, int priority, Assembly assembly);
static CpuThreadLegacy *createFromData(size_t index, const Algorithm &algorithm, const CpuThreadLegacy::Data &data, int priority, bool softAES);
static Data parse(const rapidjson::Value &object);
static Multiway multiway(AlgoVariant av);
static Multiway multiway(CnHash::AlgoVariant av);
inline bool isPrefetch() const { return m_prefetch; }
inline bool isSoftAES() const { return m_softAES; }
@ -92,7 +91,7 @@ protected:
private:
const Algorithm m_algorithm;
const AlgoVariant m_av;
const CnHash::AlgoVariant m_av;
const Assembly m_assembly;
const bool m_prefetch;
const bool m_softAES;