mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix preadv/pwritev bug on 64bit platform

Browse source 
Signed-off-by: Tw <wei.tan@intel.com>
This commit is contained in:
Tw 2022-01-29 17:44:13 +08:00 • committed by Andrew Kelley
parent 8bf14231b2
commit f9af406341
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/std/os/linux.zig
View file

@ -440,26 +440,30 @@ pub fn read(fd: i32, buf: [*]u8, count: usize) usize {
} }
pub fn preadv(fd: i32, iov: [*]const iovec, count: usize, offset: i64) usize { pub fn preadv(fd: i32, iov: [*]const iovec, count: usize, offset: i64) usize {
const offset_halves = splitValueLE64(offset); const offset_u = @bitCast(u64, offset);
return syscall5( return syscall5(
.preadv, .preadv,
@bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, fd)),
@ptrToInt(iov), @ptrToInt(iov),
count, count,
offset_halves[0], // Kernel expects the offset is splitted into largest natural word-size.
offset_halves[1], // See following link for detail:
// https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=601cc11d054ae4b5e9b5babec3d8e4667a2cb9b5
@truncate(usize, offset_u),
if (usize_bits < 64) @truncate(usize, offset_u >> 32) else 0,
); );
} }
pub fn preadv2(fd: i32, iov: [*]const iovec, count: usize, offset: i64, flags: kernel_rwf) usize { pub fn preadv2(fd: i32, iov: [*]const iovec, count: usize, offset: i64, flags: kernel_rwf) usize {
const offset_halves = splitValue64(offset); const offset_u = @bitCast(u64, offset);
return syscall6( return syscall6(
.preadv2, .preadv2,
@bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, fd)),
@ptrToInt(iov), @ptrToInt(iov),
count, count,
offset_halves[0], // See comments in preadv
offset_halves[1], @truncate(usize, offset_u),
if (usize_bits < 64) @truncate(usize, offset_u >> 32) else 0,
flags, flags,
); );
} }
@ -473,26 +477,28 @@ pub fn writev(fd: i32, iov: [*]const iovec_const, count: usize) usize {
} }
pub fn pwritev(fd: i32, iov: [*]const iovec_const, count: usize, offset: i64) usize { pub fn pwritev(fd: i32, iov: [*]const iovec_const, count: usize, offset: i64) usize {
const offset_halves = splitValueLE64(offset); const offset_u = @bitCast(u64, offset);
return syscall5( return syscall5(
.pwritev, .pwritev,
@bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, fd)),
@ptrToInt(iov), @ptrToInt(iov),
count, count,
offset_halves[0], // See comments in preadv
offset_halves[1], @truncate(usize, offset_u),
if (usize_bits < 64) @truncate(usize, offset_u >> 32) else 0,
); );
} }
pub fn pwritev2(fd: i32, iov: [*]const iovec_const, count: usize, offset: i64, flags: kernel_rwf) usize { pub fn pwritev2(fd: i32, iov: [*]const iovec_const, count: usize, offset: i64, flags: kernel_rwf) usize {
const offset_halves = splitValue64(offset); const offset_u = @bitCast(u64, offset);
return syscall6( return syscall6(
.pwritev2, .pwritev2,
@bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, fd)),
@ptrToInt(iov), @ptrToInt(iov),
count, count,
offset_halves[0], // See comments in preadv
offset_halves[1], @truncate(usize, offset_u),
if (usize_bits < 64) @truncate(usize, offset_u >> 32) else 0,
flags, flags,
); );
} }