Commit c0e0bb385cec80f3c370fb9e1c3b7116fae1bd9c | zig

author	Tristan Ross <tristan.ross@midstall.com> 2024-01-21 22:16:22-08:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-01-23 00:17:53-08:00
log	c0e0bb385cec80f3c370fb9e1c3b7116fae1bd9c
tree	763a7a74362fe90129e15f336bf2e40d0cb7a4f1
parent	68ea1121fc73d35311b29d15b731a3e424867265

std.process: return u64 in totalSystemMemory

2 files changed, 12 insertions(+), 9 deletions(-)

lib
- build_runner.zig
- std
  - process.zig

lib/build_runner.zig+3-3

...	@@ -95,7 +95,7 @@ pub fn main() !void {	...	@@ -95,7 +95,7 @@ pub fn main() !void {
95	var install_prefix: ?[]const u8 = null;	95	var install_prefix: ?[]const u8 = null;
96	var dir_list = std.Build.DirList{};	96	var dir_list = std.Build.DirList{};
97	var summary: ?Summary = null;	97	var summary: ?Summary = null;
98	var max_rss: usize = 0;	98	var max_rss: u64 = 0;
99	var skip_oom_steps: bool = false;	99	var skip_oom_steps: bool = false;
100	var color: Color = .auto;	100	var color: Color = .auto;
101	var seed: u32 = 0;	101	var seed: u32 = 0;
...	@@ -337,7 +337,7 @@ pub fn main() !void {	...	@@ -337,7 +337,7 @@ pub fn main() !void {
337	};	337	};
338		338
339	if (run.max_rss == 0) {	339	if (run.max_rss == 0) {
340	run.max_rss = process.totalSystemMemory() catch std.math.maxInt(usize);	340	run.max_rss = process.totalSystemMemory() catch std.math.maxInt(u64);
341	run.max_rss_is_default = true;	341	run.max_rss_is_default = true;
342	}	342	}
343		343
...	@@ -356,7 +356,7 @@ pub fn main() !void {	...	@@ -356,7 +356,7 @@ pub fn main() !void {
356	}	356	}
357		357
358	const Run = struct {	358	const Run = struct {
359	max_rss: usize,	359	max_rss: u64,
360	max_rss_is_default: bool,	360	max_rss_is_default: bool,
361	max_rss_mutex: std.Thread.Mutex,	361	max_rss_mutex: std.Thread.Mutex,
362	skip_oom_steps: bool,	362	skip_oom_steps: bool,

lib/std/process.zig+9-6

 @@ -1522,8 +1522,11 @@ pub const TotalSystemMemoryError = error{
     UnknownTotalSystemMemory,
 };
-/// Returns the total system memory, in bytes.
+/// Returns the total system memory, in bytes as a u64.
-pub fn totalSystemMemory() TotalSystemMemoryError!usize {
+/// We return a u64 instead of usize due to PAE on ARM
+/// and Linux's /proc/meminfo reporting more memory when
+/// using QEMU user mode emulation.
+pub fn totalSystemMemory() TotalSystemMemoryError!u64 {
     switch (builtin.os.tag) {
         .linux => {
             return totalSystemMemoryLinux() catch return error.UnknownTotalSystemMemory;
 @@ -1552,7 +1555,7 @@ pub fn totalSystemMemory() TotalSystemMemoryError!usize {
                 else => return error.UnknownTotalSystemMemory,
             };
             assert(physmem >= 0);
-            return @as(usize, @bitCast(physmem));
+            return @as(u64, @bitCast(physmem));
         },
         .windows => {
             var sbi: std.os.windows.SYSTEM_BASIC_INFORMATION = undefined;
 @@ -1565,13 +1568,13 @@ pub fn totalSystemMemory() TotalSystemMemoryError!usize {
             if (rc != .SUCCESS) {
                 return error.UnknownTotalSystemMemory;
             }
-            return @as(usize, sbi.NumberOfPhysicalPages) * sbi.PageSize;
+            return @as(u64, sbi.NumberOfPhysicalPages) * sbi.PageSize;
         },
         else => return error.UnknownTotalSystemMemory,
     }
 }
-fn totalSystemMemoryLinux() !usize {
+fn totalSystemMemoryLinux() !u64 {
     var file = try std.fs.openFileAbsoluteZ("/proc/meminfo", .{});
     defer file.close();
     var buf: [50]u8 = undefined;
 @@ -1583,7 +1586,7 @@ fn totalSystemMemoryLinux() !usize {
     const int_text = it.next() orelse return error.Unexpected;
     const units = it.next() orelse return error.Unexpected;
     if (!std.mem.eql(u8, units, "kB")) return error.Unexpected;
-    const kilobytes = try std.fmt.parseInt(usize, int_text, 10);
+    const kilobytes = try std.fmt.parseInt(u64, int_text, 10);
     return kilobytes * 1024;
 }