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

Merge branch 'dev' into feature-opencl

Browse source
This commit is contained in:
XMRig 2019-08-17 23:33:48 +07:00
commit bd07f1d455
121 changed files with 5477 additions and 369 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/backend/common/Threads.cpp
View file

@ -66,7 +66,11 @@ size_t xmrig::Threads<T>::read(const rapidjson::Value &value)
if (!threads.isEmpty()) {
move(member.name.GetString(), std::move(threads));
}
}
}
for (auto &member : value.GetObject()) {
if (member.value.IsArray() || member.value.IsObject()) {
continue;
}

1
src/backend/common/WorkerJob.h
View file

@ -56,6 +56,7 @@ public:
}
if (index() == 1 && job.index() == 0 && job == m_jobs[0]) {
m_index = 0;
return;
}

13
src/backend/common/Workers.cpp
View file

@ -166,18 +166,7 @@ namespace xmrig {
template<>
xmrig::IWorker *xmrig::Workers<CpuLaunchData>::create(Thread<CpuLaunchData> *handle)
{
const int intensity = handle->config().intensity;
# if defined(XMRIG_ALGO_RANDOMX) || defined(XMRIG_ALGO_CN_GPU)
if (intensity > handle->config().algorithm.maxIntensity()) {
LOG_WARN("CPU thread %zu warning: \"intensity %d not supported for %s algorithm\".", handle->index(), handle->config().intensity, handle->config().algorithm.shortName());
return new CpuWorker<1>(handle->index(), handle->config());
}
# endif
switch (intensity) {
switch (handle->config().intensity) {
case 1:
return new CpuWorker<1>(handle->index(), handle->config());