Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-01-27 12:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.Progress: handle big-endian targets

Browse Source 
We cannot rely on host endianness because the parent or child process
may be executing inside QEMU.
This commit is contained in:
Andrew Kelley 2024-05-27 12:06:29 -07:00
parent eea7e5e554
commit dcf9cae256
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/std/Progress.zig
View File

@ -7,6 +7,7 @@ const testing = std.testing;
const assert = std.debug.assert;
const Progress = @This();
const posix = std.posix;
const is_big_endian = builtin.cpu.arch.endian() == .big;
/// `null` if the current node (and its children) should
/// not print on update()
@ -101,6 +102,11 @@ pub const Node = struct {
};
}
fn byteSwap(s: *Storage) void {
s.completed_count = @byteSwap(s.completed_count);
s.estimated_total_count = @byteSwap(s.estimated_total_count);
}
comptime {
assert((@sizeOf(Storage) % 4) == 0);
}
@ -719,9 +725,14 @@ fn serializeIpc(start_serialized_len: usize, serialized_buffer: *Serialized.Buff
// Mount the root here.
copyRoot(main_storage, &storage[0]);
if (is_big_endian) main_storage.byteSwap();
// Copy the rest of the tree to the end.
@memcpy(serialized_buffer.storage[serialized_len..][0..nodes_len], storage[1..][0..nodes_len]);
const storage_dest = serialized_buffer.storage[serialized_len..][0..nodes_len];
@memcpy(storage_dest, storage[1..][0..nodes_len]);
// Always little-endian over the pipe.
if (is_big_endian) for (storage_dest) |*s| s.byteSwap();
// Patch up parent pointers taking into account how the subtree is mounted.
for (serialized_buffer.parents[serialized_len..][0..nodes_len], parents[1..][0..nodes_len]) |*dest, p| {
@ -983,6 +994,10 @@ fn write(buf: []const u8) anyerror!void {
}
fn writeIpc(fd: posix.fd_t, serialized: Serialized) error{BrokenPipe}!void {
// Byteswap if necessary to ensure little endian over the pipe. This is
// needed because the parent or child process might be running in qemu.
if (is_big_endian) for (serialized.storage) |*s| s.byteSwap();
assert(serialized.parents.len == serialized.storage.len);
const serialized_len: u8 = @intCast(serialized.parents.len);
const header = std.mem.asBytes(&serialized_len);
@ -995,9 +1010,6 @@ fn writeIpc(fd: posix.fd_t, serialized: Serialized) error{BrokenPipe}!void {
.{ .base = parents.ptr, .len = parents.len },
};
// TODO: if big endian, byteswap
// this is needed because the parent or child process might be running in qemu
// If this write would block we do not want to keep trying, but we need to
// know if a partial message was written.
if (posix.writev(fd, &vecs)) |written| {