mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-26 14:02:53 -05:00
Code Issues Projects Releases Wiki Activity

xmrig v6.3.1 merge

Browse Source
This commit is contained in:
MoneroOcean
2020-07-31 12:04:00 -07:00
parent 54ee6bbd5d a0fe49f946
commit 22c39226b0
37 changed files with 308 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/base/crypto/Algorithm.cpp
View File

@@ -143,6 +143,12 @@ static AlgoName const algorithm_names[] = {
} /* namespace xmrig */
xmrig::Algorithm::Algorithm(const rapidjson::Value &value) :
m_id(parse(value.GetString()))
{
}
rapidjson::Value xmrig::Algorithm::toJSON() const
{
using namespace rapidjson;
@@ -151,6 +157,12 @@ rapidjson::Value xmrig::Algorithm::toJSON() const
}
rapidjson::Value xmrig::Algorithm::toJSON(rapidjson::Document &) const
{
return toJSON();
}
size_t xmrig::Algorithm::l2() const
{
# ifdef XMRIG_ALGO_RANDOMX

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

@@ -99,6 +99,7 @@ public:
inline Algorithm() = default;
inline Algorithm(const char *algo) : m_id(parse(algo)) {}
inline Algorithm(Id id) : m_id(id) {}
Algorithm(const rapidjson::Value &value);
inline bool isCN() const { auto f = family(); return f == CN || f == CN_LITE || f == CN_HEAVY || f == CN_PICO; }
inline bool isEqual(const Algorithm &other) const { return m_id == other.m_id; }
@@ -115,6 +116,7 @@ public:
inline operator Algorithm::Id() const { return m_id; }
rapidjson::Value toJSON() const;
rapidjson::Value toJSON(rapidjson::Document &doc) const;
size_t l2() const;
size_t l3() const;
uint32_t maxIntensity() const;