1
0
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-25 05:40:39 -05:00

Fixed config file rewriting and donation user name

This commit is contained in:
MoneroOcean
2018-10-03 16:58:04 +02:00
parent 3faf122855
commit a47dc9b486
2 changed files with 20 additions and 24 deletions

View File

@@ -191,28 +191,28 @@ bool xmrig::Config::finalize()
for (size_t i = 0; i < m_threads[algo].cpu.size(); ++i) {
m_threads[algo].list.push_back(CpuThread::createFromData(i, algo, m_threads[algo].cpu[i], m_priority, softAES));
}
}
} else {
const AlgoVariant av = getAlgoVariant();
m_threads[algo].mode = m_threads[algo].count ? Simple : Automatic;
const AlgoVariant av = getAlgoVariant();
m_threads[algo].mode = m_threads[algo].count ? Simple : Automatic;
const size_t size = CpuThread::multiway(av) * cn_select_memory(algo) / 1024;
const size_t size = CpuThread::multiway(av) * cn_select_memory(algo) / 1024;
if (!m_threads[algo].count) {
m_threads[algo].count = Cpu::info()->optimalThreadsCount(size, m_maxCpuUsage);
}
else if (m_safe) {
const size_t count = Cpu::info()->optimalThreadsCount(size, m_maxCpuUsage);
if (m_threads[algo].count > count) {
m_threads[algo].count = count;
if (!m_threads[algo].count) {
m_threads[algo].count = Cpu::info()->optimalThreadsCount(size, m_maxCpuUsage);
}
else if (m_safe) {
const size_t count = Cpu::info()->optimalThreadsCount(size, m_maxCpuUsage);
if (m_threads[algo].count > count) {
m_threads[algo].count = count;
}
}
}
for (size_t i = 0; i < m_threads[algo].count; ++i) {
m_threads[algo].list.push_back(CpuThread::createFromAV(i, algo, av, m_threads[algo].mask, m_priority, m_assembly));
}
for (size_t i = 0; i < m_threads[algo].count; ++i) {
m_threads[algo].list.push_back(CpuThread::createFromAV(i, algo, av, m_threads[algo].mask, m_priority, m_assembly));
}
m_shouldSave = m_shouldSave || m_threads[algo].mode == Automatic;
m_shouldSave = m_shouldSave || m_threads[algo].mode == Automatic;
}
}
return true;