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

Merge pull request #78 from Spudz76/ocean-master-fixBenchMode

Browse source 
Fix upstream benchmark feature clash with MoBenchmark
This commit is contained in:
MoneroOcean 2021-11-29 07:37:16 -08:00 • committed by GitHub
commit 41d5be9c65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/App.cpp
View file

@ -86,20 +86,21 @@ int xmrig::App::exec()
} }
# ifdef XMRIG_FEATURE_MO_BENCHMARK # ifdef XMRIG_FEATURE_MO_BENCHMARK
m_controller->pre_start(); if (pool.mode() != Pool::MODE_BENCHMARK) {
m_controller->config()->benchmark().set_controller(m_controller); m_controller->pre_start();
m_controller->config()->benchmark().set_controller(m_controller);
if (m_controller->config()->benchmark().isNewBenchRun() || m_controller->config()->isRebenchAlgo()) { if (m_controller->config()->benchmark().isNewBenchRun() || m_controller->config()->isRebenchAlgo()) {
if (m_controller->config()->isShouldSave()) { if (m_controller->config()->isShouldSave()) {
m_controller->config()->save(); m_controller->config()->save();
}
m_controller->config()->benchmark().start();
} else {
m_controller->start();
} }
m_controller->config()->benchmark().start(); } else
} else {
m_controller->start();
}
# else
m_controller->start();
# endif # endif
m_controller->start();
rc = uv_run(uv_default_loop(), UV_RUN_DEFAULT); rc = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
uv_loop_close(uv_default_loop()); uv_loop_close(uv_default_loop());