From cc50515e57162d2ef740aa6e725e06f2b0c21293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Fri, 23 Sep 2016 08:13:28 +0200 Subject: Show memory info on macOS and Linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added support for showing memory information (amount of physical memory) in version information on macOS and Linux. Moved CPU info and memory info right after OS version info. Change-Id: I305d1b7d015d50ed137f2c80b31d698e9315d735 Reviewed-on: https://code.wireshark.org/review/17884 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- wsutil/cpu_info.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'wsutil') diff --git a/wsutil/cpu_info.c b/wsutil/cpu_info.c index 9a3416d9ab..3ac4ce164f 100644 --- a/wsutil/cpu_info.c +++ b/wsutil/cpu_info.c @@ -60,6 +60,9 @@ get_cpu_info(GString *str) ws_cpuid(CPUInfo, 0x80000004); memcpy(CPUBrandString + 32, CPUInfo, sizeof(CPUInfo)); + if (str->len > 0) + g_string_append(str, ", with "); + g_string_append_printf(str, "%s", CPUBrandString); if (ws_cpuid_sse42()) -- cgit v1.2.1