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

Use uv_get_free_memory.

Browse source
This commit is contained in:
XMRig 2019-11-29 13:12:36 +07:00
parent 64fb4f265b
commit c529770d38
No known key found for this signature in database
GPG key ID: 446A53638BE94409
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Summary.cpp
View file

@ -104,9 +104,12 @@ static void print_cpu(Config *)
static void print_threads(Config *config) static void print_threads(Config *config)
{ {
Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%.1f GB"), constexpr size_t oneGiB = 1024U * 1024U * 1024U;
Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%.1f/%.1f GB"),
"MEMORY", "MEMORY",
static_cast<double>(uv_get_total_memory()) / (1024U * 1024U * 1024U) static_cast<double>(uv_get_free_memory()) / oneGiB,
static_cast<double>(uv_get_total_memory()) / oneGiB
); );
Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") WHITE_BOLD("%s%d%%"), Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") WHITE_BOLD("%s%d%%"),

1
src/base/api/Api.cpp
View file

@ -67,6 +67,7 @@ static rapidjson::Value getResources(rapidjson::Document &doc)
Value memory(kObjectType); Value memory(kObjectType);
Value load_average(kArrayType); Value load_average(kArrayType);
memory.AddMember("free", uv_get_free_memory(), allocator);
memory.AddMember("total", uv_get_total_memory(), allocator); memory.AddMember("total", uv_get_total_memory(), allocator);
memory.AddMember("resident_set_memory", static_cast<uint64_t>(rss), allocator); memory.AddMember("resident_set_memory", static_cast<uint64_t>(rss), allocator);

2
src/crypto/rx/RxDataset.cpp
View file

@ -167,7 +167,7 @@ void xmrig::RxDataset::allocate(bool hugePages)
return; return;
} }
if (m_mode == RxConfig::AutoMode && uv_get_total_memory() < (maxSize() + RxCache::maxSize())) { if (m_mode == RxConfig::AutoMode && uv_get_free_memory() < (maxSize() + RxCache::maxSize())) {
LOG_ERR(CLEAR "%s" RED_BOLD_S "not enough memory for RandomX dataset", rx_tag()); LOG_ERR(CLEAR "%s" RED_BOLD_S "not enough memory for RandomX dataset", rx_tag());
return; return;