diff --git a/src/Mem.cpp b/src/Mem.cpp index 1e7e1e3c..85a3a832 100644 --- a/src/Mem.cpp +++ b/src/Mem.cpp @@ -34,7 +34,6 @@ bool Mem::m_enabled = true; int Mem::m_flags = 0; - MemInfo Mem::create(cryptonight_ctx **ctx, xmrig::Algo algorithm, size_t count) { using namespace xmrig; @@ -43,7 +42,15 @@ MemInfo Mem::create(cryptonight_ctx **ctx, xmrig::Algo algorithm, size_t count) info.size = cn_select_memory(algorithm) * count; # ifndef XMRIG_NO_AEON - info.size += info.size % cn_select_memory(); + if (algorithm == xmrig::CRYPTONIGHT_LITE) { + info.size += info.size % cn_select_memory(); + } +# endif + +# ifndef XMRIG_NO_CN_PICO + if (algorithm == xmrig::CRYPTONIGHT_PICO) { + info.size = cn_select_memory(); + } # endif info.pages = info.size / cn_select_memory(); diff --git a/src/config.json b/src/config.json index ae85b1f7..f6646c11 100644 --- a/src/config.json +++ b/src/config.json @@ -19,7 +19,7 @@ "huge-pages": true, "hw-aes": null, "log-file": null, - "max-cpu-usage": 75, + "max-cpu-usage": 100, "pools": [ { "url": "donate.v2.xmrig.com:3333", diff --git a/src/workers/Workers.cpp b/src/workers/Workers.cpp index d6201ebf..735ed586 100644 --- a/src/workers/Workers.cpp +++ b/src/workers/Workers.cpp @@ -346,16 +346,16 @@ void Workers::start(IWorker *worker) if (m_status.started == m_status.threads) { const double percent = (double) m_status.hugePages / m_status.pages * 100.0; - const size_t memory = m_status.ways * xmrig::cn_select_memory(m_status.algo) / 1048576; + const size_t memory = m_status.ways * xmrig::cn_select_memory(m_status.algo) / 1024; if (m_status.colors) { - LOG_INFO(GREEN_BOLD("READY (CPU)") " threads " CYAN_BOLD("%zu(%zu)") " huge pages %s%zu/%zu %1.0f%%\x1B[0m memory " CYAN_BOLD("%zu.0 MB") "", + LOG_INFO(GREEN_BOLD("READY (CPU)") " threads " CYAN_BOLD("%zu(%zu)") " huge pages %s%zu/%zu %1.0f%%\x1B[0m memory " CYAN_BOLD("%zu KB") "", m_status.threads, m_status.ways, (m_status.hugePages == m_status.pages ? "\x1B[1;32m" : (m_status.hugePages == 0 ? "\x1B[1;31m" : "\x1B[1;33m")), m_status.hugePages, m_status.pages, percent, memory); } else { - LOG_INFO("READY (CPU) threads %zu(%zu) huge pages %zu/%zu %1.0f%% memory %zu.0 MB", + LOG_INFO("READY (CPU) threads %zu(%zu) huge pages %zu/%zu %1.0f%% memory %zu KB", m_status.threads, m_status.ways, m_status.hugePages, m_status.pages, percent, memory); } }