Add std.fmt.parseIntSizeSuffix and use for --maxrss

Fixes #14955
This commit is contained in:
Evin Yulo
2023-03-17 00:36:26 -04:00
committed by Veikka Tuominen
parent c4dbfd5ae1
commit 6d7bb255a4
2 changed files with 50 additions and 3 deletions

View File

@@ -151,8 +151,7 @@ pub fn main() !void {
std.debug.print("Expected argument after {s}\n\n", .{arg});
usageAndErr(builder, false, stderr_stream);
};
// TODO: support shorthand such as "2GiB", "2GB", or "2G"
max_rss = std.fmt.parseInt(usize, max_rss_text, 10) catch |err| {
max_rss = std.fmt.parseIntSizeSuffix(max_rss_text, 10) catch |err| {
std.debug.print("invalid byte size: '{s}': {s}\n", .{
max_rss_text, @errorName(err),
});

View File

@@ -1699,7 +1699,7 @@ pub const ParseIntError = error{
/// The result cannot fit in the type specified
Overflow,
/// The input was empty or had a byte that was not a digit
/// The input was empty or contained an invalid character
InvalidCharacter,
};
@@ -1905,6 +1905,54 @@ test "parseUnsigned" {
try std.testing.expectError(error.InvalidCharacter, parseUnsigned(u8, "", 10));
}
/// Parses a number like '2G', '2Gi', or '2GiB'.
pub fn parseIntSizeSuffix(buf: []const u8, radix: u8) ParseIntError!usize {
var without_B = buf;
if (mem.endsWith(u8, buf, "B")) without_B.len -= 1;
var without_i = without_B;
var base: usize = 1000;
if (mem.endsWith(u8, without_B, "i")) {
without_i.len -= 1;
base = 1024;
}
if (without_i.len == 0) return error.InvalidCharacter;
const orders_of_magnitude: usize = switch (without_i[without_i.len - 1]) {
'k', 'K' => 1,
'M' => 2,
'G' => 3,
'T' => 4,
'P' => 5,
'E' => 6,
'Z' => 7,
'Y' => 8,
else => 0,
};
var without_suffix = without_i;
if (orders_of_magnitude > 0) {
without_suffix.len -= 1;
} else if (without_i.len != without_B.len) {
return error.InvalidCharacter;
}
const multiplier = math.powi(usize, base, orders_of_magnitude) catch |err| switch (err) {
error.Underflow => unreachable,
error.Overflow => return error.Overflow,
};
const number = try std.fmt.parseInt(usize, without_suffix, radix);
return math.mul(usize, number, multiplier);
}
test "parseIntSizeSuffix" {
try std.testing.expect(try parseIntSizeSuffix("2", 10) == 2);
try std.testing.expect(try parseIntSizeSuffix("2B", 10) == 2);
try std.testing.expect(try parseIntSizeSuffix("2kB", 10) == 2000);
try std.testing.expect(try parseIntSizeSuffix("2k", 10) == 2000);
try std.testing.expect(try parseIntSizeSuffix("2KiB", 10) == 2048);
try std.testing.expect(try parseIntSizeSuffix("2Ki", 10) == 2048);
try std.testing.expect(try parseIntSizeSuffix("aKiB", 16) == 10240);
try std.testing.expect(parseIntSizeSuffix("", 10) == error.InvalidCharacter);
try std.testing.expect(parseIntSizeSuffix("2iB", 10) == error.InvalidCharacter);
}
pub const parseFloat = @import("fmt/parse_float.zig").parseFloat;
pub const ParseFloatError = @import("fmt/parse_float.zig").ParseFloatError;