Changed memory print format.

This commit is contained in:
XMRig 2019-11-29 13:25:24 +07:00
parent c529770d38
commit c7d2639010
No known key found for this signature in database
GPG key ID: 446A53638BE94409

View file

@ -102,16 +102,25 @@ static void print_cpu(Config *)
} }
static void print_threads(Config *config) static void print_memory()
{ {
constexpr size_t oneGiB = 1024U * 1024U * 1024U; constexpr size_t oneGiB = 1024U * 1024U * 1024U;
const auto freeMem = static_cast<double>(uv_get_free_memory());
const auto totalMem = static_cast<double>(uv_get_total_memory());
Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%.1f/%.1f GB"), const double percent = freeMem > 0 ? ((totalMem - freeMem) / totalMem * 100.0) : 100.0;
Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%.1f/%.1f GB") BLACK_BOLD(" (%.0f%%)"),
"MEMORY", "MEMORY",
static_cast<double>(uv_get_free_memory()) / oneGiB, (totalMem - freeMem) / oneGiB,
static_cast<double>(uv_get_total_memory()) / oneGiB totalMem / oneGiB,
percent
); );
}
static void print_threads(Config *config)
{
Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") WHITE_BOLD("%s%d%%"), Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") WHITE_BOLD("%s%d%%"),
"DONATE", "DONATE",
config->pools().donateLevel() == 0 ? RED_BOLD_S : "", config->pools().donateLevel() == 0 ? RED_BOLD_S : "",
@ -152,6 +161,7 @@ void xmrig::Summary::print(Controller *controller)
controller->config()->printVersions(); controller->config()->printVersions();
print_memory(controller->config()); print_memory(controller->config());
print_cpu(controller->config()); print_cpu(controller->config());
print_memory();
print_threads(controller->config()); print_threads(controller->config());
controller->config()->pools().print(); controller->config()->pools().print();