diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2016-09-23 08:13:28 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-09-23 11:59:59 +0000 |
commit | cc50515e57162d2ef740aa6e725e06f2b0c21293 (patch) | |
tree | b3e66666275982714809f1ab568cb42cd3d4abcd /wsutil/cpu_info.c | |
parent | 2fa327ae0ca84368086922e4869e4fa739b1f1f3 (diff) |
Show memory info on macOS and Linux
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 <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wsutil/cpu_info.c')
-rw-r--r-- | wsutil/cpu_info.c | 3 |
1 files changed, 3 insertions, 0 deletions
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()) |