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

Reverted changes in Job

Browse source
This commit is contained in:
BenDroid 2018-03-29 23:30:20 +02:00
parent 5f2f97face
commit db199786e8
3 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/net/Job.cpp
View file

@ -61,8 +61,7 @@ Job::Job(int poolId, bool nicehash) :
m_threadId(-1),
m_size(0),
m_diff(0),
m_target(0),
m_blob()
m_target(0)
{
}

3
src/net/Job.h
View file

@ -70,6 +70,7 @@ public:
bool operator!=(const Job &other) const;
private:
alignas(16) uint8_t m_blob[84]; // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk.
bool m_nicehash;
int m_poolId;
@ -79,8 +80,6 @@ private:
uint64_t m_diff;
uint64_t m_target;
alignas(16) uint8_t m_blob[84]; // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk.
# ifdef XMRIG_PROXY_PROJECT
VAR_ALIGN(16, char m_rawBlob[169]);
VAR_ALIGN(16, char m_rawTarget[17]);

24
src/net/JobId.h
View file

@ -31,15 +31,15 @@
class JobId
{
public:
inline JobId() :
m_data()
inline JobId()
{
memset(m_data, 0, sizeof(m_data));
}
inline JobId(const char *jobId, size_t sizeFix = 0)
inline JobId(const char *id, size_t sizeFix = 0)
{
setId(jobId, sizeFix);
setId(id, sizeFix);
}
@ -55,27 +55,19 @@ public:
}
JobId &operator=(const JobId &other)
{
memcpy(m_data, other.m_data, sizeof(m_data));
return *this;
}
inline bool setId(const char *jobId, size_t sizeFix = 0)
inline bool setId(const char *id, size_t sizeFix = 0)
{
memset(m_data, 0, sizeof(m_data));
if (!jobId) {
if (!id) {
return false;
}
const size_t size = strlen(jobId);
const size_t size = strlen(id);
if (size >= sizeof(m_data)) {
return false;
}
memcpy(m_data, jobId, size - sizeFix);
memcpy(m_data, id, size - sizeFix);
return true;
}