std.os.linux: Fix bunch of compilation errors#21138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewrk merged 7 commits into from
Aug 23, 2024
Merged

std.os.linux: Fix bunch of compilation errors #21138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e17cdd
Correct layout of IntInfo according to https://www.kernel.org/doc/htm…
fardragon Aug 18, 2024
92f624a
Fix VFS errors
fardragon Aug 18, 2024
fd698db
Fix std.os.linux.sendmmsg
fardragon Aug 18, 2024
9b59d52
Fix std.os.linux.sigismember. Add tests
fardragon Aug 18, 2024
3abaa32
Fix futex2 functions
fardragon Aug 19, 2024
7569c83
Fix comments
fardragon Aug 19, 2024
a5bd5b2
Restore backticks
fardragon Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions lib/std/os/linux.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -630,12 +630,13 @@ pub fn futex2_waitv(
nr_futexes,
flags,
@intFromPtr(timeout),
@bitCast(@as(isize, clockid)),
@bitCast(@as(isize, @intFromEnum(clockid))),
);
}

/// Wait on a futex.
/// Identical to `FUTEX.WAIT`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 familiy of calls.
pub fn futex2_wait(
/// Address of the futex to wait on.
uaddr: *const anyopaque,
Expand All@@ -646,7 +647,7 @@ pub fn futex2_wait(
/// `FUTEX2` flags.
flags: u32,
/// Optional absolute timeout.
timeout: *const timespec,
timeout: ?*const timespec,
/// Clock to be used for the timeout, realtime or monotonic.
clockid: clockid_t,
) usize {
Expand All@@ -657,15 +658,16 @@ pub fn futex2_wait(
mask,
flags,
@intFromPtr(timeout),
@bitCast(@as(isize, clockid)),
@bitCast(@as(isize, @intFromEnum(clockid))),
);
}

/// Wake a number of futexes.
/// Identical to `FUTEX.WAKE`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 family of calls.
pub fn futex2_wake(
/// Address of the futex(es) to wake.
uaddr: [*]const anyopaque,
uaddr: *const anyopaque,
/// Bitmask
mask: usize,
/// Number of the futexes to wake.
Expand DownExpand Up@@ -1683,7 +1685,7 @@ pub fn sigaddset(set: *sigset_t, sig: u6) void {

pub fn sigismember(set: *const sigset_t, sig: u6) bool {
const s = sig - 1;
return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << (s & (usize_bits - 1)))) != 0;
return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << @intCast(s & (usize_bits - 1)))) != 0;
}

pub fn getsockname(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
Expand DownExpand Up@@ -1740,31 +1742,31 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize
var next_unsent: usize = 0;
for (msgvec[0..kvlen], 0..) |*msg, i| {
var size: i32 = 0;
const msg_iovlen = @as(usize, @intCast(msg.msg_hdr.msg_iovlen)); // kernel side this is treated as unsigned
for (msg.msg_hdr.msg_iov[0..msg_iovlen]) |iov| {
const msg_iovlen = @as(usize, @intCast(msg.hdr.iovlen)); // kernel side this is treated as unsigned
for (msg.hdr.iov[0..msg_iovlen]) |iov| {
if (iov.len > std.math.maxInt(i32) or @addWithOverflow(size, @as(i32, @intCast(iov.len)))[1] != 0) {
// batch-send all messages up to the current message
if (next_unsent < i) {
const batch_size = i - next_unsent;
const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
if (E.init(r) != 0) return next_unsent;
if (E.init(r) != .SUCCESS) return next_unsent;
if (r < batch_size) return next_unsent + r;
}
// send current message as own packet
const r = sendmsg(fd, &msg.msg_hdr, flags);
if (E.init(r) != 0) return r;
const r = sendmsg(fd, &msg.hdr, flags);
if (E.init(r) != .SUCCESS) return r;
// Linux limits the total bytes sent by sendmsg to INT_MAX, so this cast is safe.
msg.msg_len = @as(u32, @intCast(r));
msg.len = @as(u32, @intCast(r));
next_unsent = i + 1;
break;
}
size += iov.len;
size += @intCast(iov.len);
}
}
if (next_unsent < kvlen or next_unsent == 0) { // want to make sure at least one syscall occurs (e.g. to trigger MSG.EOR)
const batch_size = kvlen - next_unsent;
const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
if (E.init(r) != 0) return r;
if (E.init(r) != .SUCCESS) return r;
return next_unsent + r;
}
return kvlen;
Expand DownExpand Up@@ -5095,7 +5097,7 @@ pub const epoll_event = extern struct {

pub const VFS_CAP_REVISION_MASK = 0xFF000000;
pub const VFS_CAP_REVISION_SHIFT = 24;
pub const VFS_CAP_FLAGS_MASK = ~VFS_CAP_REVISION_MASK;
pub const VFS_CAP_FLAGS_MASK = ~@as(u32, VFS_CAP_REVISION_MASK);
pub const VFS_CAP_FLAGS_EFFECTIVE = 0x000001;

pub const VFS_CAP_REVISION_1 = 0x01000000;
Expand All@@ -5113,7 +5115,7 @@ pub const VFS_CAP_REVISION = VFS_CAP_REVISION_2;
pub const vfs_cap_data = extern struct {
//all of these are mandated as little endian
//when on disk.
const Data = struct {
const Data = extern struct {
permitted: u32,
inheritable: u32,
};
Expand Down
3 changes: 2 additions & 1 deletion lib/std/os/linux/bpf/btf.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,13 +83,14 @@ pub const Kind = enum(u5) {
/// int kind is followed by this struct
pub const IntInfo = packed struct(u32) {
bits: u8,
unused: u8,
reserved_1: u8,

@andrewrkandrewrkAug 23, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
reserved_1: u8,
reserved_1: u8=0,

offset: u8,
encoding: enum(u4) {
signed = 1 << 0,
char = 1 << 1,
boolean = 1 << 2,
},
reserved_2: u4,

@andrewrkandrewrkAug 23, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
reserved_2: u4,
reserved_2: u4=0,

};

test "IntInfo is 32 bits" {
Expand Down
17 changes: 17 additions & 0 deletions lib/std/os/linux/test.zig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,23 @@ test "fadvise" {
try expectEqual(@as(usize, 0), ret);
}

test "sigset_t" {
var sigset = linux.empty_sigset;

try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), false);
try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

linux.sigaddset(&sigset, linux.SIG.USR1);

try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

linux.sigaddset(&sigset, linux.SIG.USR2);

try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), true);
}

test {
_ = linux.IoUring;
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
std.os.linux: Fix bunch of compilation errors#21138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 7 commits into

from

Aug 23, 2024
 Merged


std.os.linux: Fix bunch of compilation errors
#21138
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
9e17cdd

Correct layout of IntInfo according to https://www.kernel.org/doc/htm…


fardragon Aug 18, 2024
92f624a

Fix VFS errors


fardragon Aug 18, 2024
fd698db

Fix std.os.linux.sendmmsg


fardragon Aug 18, 2024
9b59d52

Fix std.os.linux.sigismember. Add tests


fardragon Aug 18, 2024
3abaa32

Fix futex2 functions


fardragon Aug 19, 2024
7569c83

Fix comments


fardragon Aug 19, 2024
a5bd5b2

Restore backticks


fardragon Aug 21, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


36 changes: 19 additions & 17 deletions
lib/std/os/linux.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,12 +630,13 @@ pub fn futex2_waitv(
 nr_futexes,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wait on a futex.
/// Identical to `FUTEX.WAIT`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 familiy of calls.
pub fn futex2_wait(
 /// Address of the futex to wait on.
 uaddr: *const anyopaque,
Expand All@@ -646,7 +647,7 @@ pub fn futex2_wait(
 /// `FUTEX2` flags.
 flags: u32,
 /// Optional absolute timeout.
 timeout: *const timespec,
 timeout: ?*const timespec,
 /// Clock to be used for the timeout, realtime or monotonic.
 clockid: clockid_t,
) usize {
Expand All@@ -657,15 +658,16 @@ pub fn futex2_wait(
 mask,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wake a number of futexes.
/// Identical to `FUTEX.WAKE`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 family of calls.
pub fn futex2_wake(
 /// Address of the futex(es) to wake.
 uaddr: [*]const anyopaque,
 uaddr: *const anyopaque,
 /// Bitmask
 mask: usize,
 /// Number of the futexes to wake.
Expand DownExpand Up@@ -1683,7 +1685,7 @@ pub fn sigaddset(set: *sigset_t, sig: u6) void {

pub fn sigismember(set: *const sigset_t, sig: u6) bool {
 const s = sig - 1;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << (s & (usize_bits - 1)))) != 0;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << @intCast(s & (usize_bits - 1)))) != 0;
}

pub fn getsockname(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
Expand DownExpand Up@@ -1740,31 +1742,31 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize
 var next_unsent: usize = 0;
 for (msgvec[0..kvlen], 0..) |*msg, i| {
 var size: i32 = 0;
 const msg_iovlen = @as(usize, @intCast(msg.msg_hdr.msg_iovlen)); // kernel side this is treated as unsigned
 for (msg.msg_hdr.msg_iov[0..msg_iovlen]) |iov| {
 const msg_iovlen = @as(usize, @intCast(msg.hdr.iovlen)); // kernel side this is treated as unsigned
 for (msg.hdr.iov[0..msg_iovlen]) |iov| {
 if (iov.len > std.math.maxInt(i32) or @addWithOverflow(size, @as(i32, @intCast(iov.len)))[1] != 0) {
 // batch-send all messages up to the current message
 if (next_unsent < i) {
 const batch_size = i - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return next_unsent;
 if (E.init(r) != .SUCCESS) return next_unsent;
 if (r < batch_size) return next_unsent + r;
 }
 // send current message as own packet
 const r = sendmsg(fd, &msg.msg_hdr, flags);
 if (E.init(r) != 0) return r;
 const r = sendmsg(fd, &msg.hdr, flags);
 if (E.init(r) != .SUCCESS) return r;
 // Linux limits the total bytes sent by sendmsg to INT_MAX, so this cast is safe.
 msg.msg_len = @as(u32, @intCast(r));
 msg.len = @as(u32, @intCast(r));
 next_unsent = i + 1;
 break;
 }
 size += iov.len;
 size += @intCast(iov.len);
 }
 }
 if (next_unsent < kvlen or next_unsent == 0) { // want to make sure at least one syscall occurs (e.g. to trigger MSG.EOR)
 const batch_size = kvlen - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return r;
 if (E.init(r) != .SUCCESS) return r;
 return next_unsent + r;
 }
 return kvlen;
Expand DownExpand Up@@ -5095,7 +5097,7 @@ pub const epoll_event = extern struct {

pub const VFS_CAP_REVISION_MASK = 0xFF000000;
pub const VFS_CAP_REVISION_SHIFT = 24;
pub const VFS_CAP_FLAGS_MASK = ~VFS_CAP_REVISION_MASK;
pub const VFS_CAP_FLAGS_MASK = ~@as(u32, VFS_CAP_REVISION_MASK);
pub const VFS_CAP_FLAGS_EFFECTIVE = 0x000001;

pub const VFS_CAP_REVISION_1 = 0x01000000;
Expand All@@ -5113,7 +5115,7 @@ pub const VFS_CAP_REVISION = VFS_CAP_REVISION_2;
pub const vfs_cap_data = extern struct {
 //all of these are mandated as little endian
 //when on disk.
 const Data = struct {
 const Data = extern struct {
 permitted: u32,
 inheritable: u32,
 };
Expand Down

3 changes: 2 additions & 1 deletion
lib/std/os/linux/bpf/btf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,13 +83,14 @@ pub const Kind = enum(u5) {
/// int kind is followed by this struct
pub const IntInfo = packed struct(u32) {
 bits: u8,
unused: u8,
reserved_1: u8,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_1: u8,
reserved_1: u8=0,
 offset: u8,
 encoding: enum(u4) {
 signed = 1 << 0,
 char = 1 << 1,
 boolean = 1 << 2,
 },
 reserved_2: u4,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_2: u4,
reserved_2: u4=0,
};

test "IntInfo is 32 bits" {
Expand Down

17 changes: 17 additions & 0 deletions
lib/std/os/linux/test.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,23 @@ test "fadvise" {
 try expectEqual(@as(usize, 0), ret);
}

test "sigset_t" {
 var sigset = linux.empty_sigset;

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), false);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR1);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR2);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), true);
}

test {
 _ = linux.IoUring;
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
std.os.linux: Fix bunch of compilation errors#21138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 7 commits into

from

Aug 23, 2024
 Merged


std.os.linux: Fix bunch of compilation errors
#21138
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
9e17cdd

Correct layout of IntInfo according to https://www.kernel.org/doc/htm…


fardragon Aug 18, 2024
92f624a

Fix VFS errors


fardragon Aug 18, 2024
fd698db

Fix std.os.linux.sendmmsg


fardragon Aug 18, 2024
9b59d52

Fix std.os.linux.sigismember. Add tests


fardragon Aug 18, 2024
3abaa32

Fix futex2 functions


fardragon Aug 19, 2024
7569c83

Fix comments


fardragon Aug 19, 2024
a5bd5b2

Restore backticks


fardragon Aug 21, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


36 changes: 19 additions & 17 deletions
lib/std/os/linux.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,12 +630,13 @@ pub fn futex2_waitv(
 nr_futexes,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wait on a futex.
/// Identical to `FUTEX.WAIT`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 familiy of calls.
pub fn futex2_wait(
 /// Address of the futex to wait on.
 uaddr: *const anyopaque,
Expand All@@ -646,7 +647,7 @@ pub fn futex2_wait(
 /// `FUTEX2` flags.
 flags: u32,
 /// Optional absolute timeout.
 timeout: *const timespec,
 timeout: ?*const timespec,
 /// Clock to be used for the timeout, realtime or monotonic.
 clockid: clockid_t,
) usize {
Expand All@@ -657,15 +658,16 @@ pub fn futex2_wait(
 mask,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wake a number of futexes.
/// Identical to `FUTEX.WAKE`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 family of calls.
pub fn futex2_wake(
 /// Address of the futex(es) to wake.
 uaddr: [*]const anyopaque,
 uaddr: *const anyopaque,
 /// Bitmask
 mask: usize,
 /// Number of the futexes to wake.
Expand DownExpand Up@@ -1683,7 +1685,7 @@ pub fn sigaddset(set: *sigset_t, sig: u6) void {

pub fn sigismember(set: *const sigset_t, sig: u6) bool {
 const s = sig - 1;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << (s & (usize_bits - 1)))) != 0;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << @intCast(s & (usize_bits - 1)))) != 0;
}

pub fn getsockname(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
Expand DownExpand Up@@ -1740,31 +1742,31 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize
 var next_unsent: usize = 0;
 for (msgvec[0..kvlen], 0..) |*msg, i| {
 var size: i32 = 0;
 const msg_iovlen = @as(usize, @intCast(msg.msg_hdr.msg_iovlen)); // kernel side this is treated as unsigned
 for (msg.msg_hdr.msg_iov[0..msg_iovlen]) |iov| {
 const msg_iovlen = @as(usize, @intCast(msg.hdr.iovlen)); // kernel side this is treated as unsigned
 for (msg.hdr.iov[0..msg_iovlen]) |iov| {
 if (iov.len > std.math.maxInt(i32) or @addWithOverflow(size, @as(i32, @intCast(iov.len)))[1] != 0) {
 // batch-send all messages up to the current message
 if (next_unsent < i) {
 const batch_size = i - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return next_unsent;
 if (E.init(r) != .SUCCESS) return next_unsent;
 if (r < batch_size) return next_unsent + r;
 }
 // send current message as own packet
 const r = sendmsg(fd, &msg.msg_hdr, flags);
 if (E.init(r) != 0) return r;
 const r = sendmsg(fd, &msg.hdr, flags);
 if (E.init(r) != .SUCCESS) return r;
 // Linux limits the total bytes sent by sendmsg to INT_MAX, so this cast is safe.
 msg.msg_len = @as(u32, @intCast(r));
 msg.len = @as(u32, @intCast(r));
 next_unsent = i + 1;
 break;
 }
 size += iov.len;
 size += @intCast(iov.len);
 }
 }
 if (next_unsent < kvlen or next_unsent == 0) { // want to make sure at least one syscall occurs (e.g. to trigger MSG.EOR)
 const batch_size = kvlen - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return r;
 if (E.init(r) != .SUCCESS) return r;
 return next_unsent + r;
 }
 return kvlen;
Expand DownExpand Up@@ -5095,7 +5097,7 @@ pub const epoll_event = extern struct {

pub const VFS_CAP_REVISION_MASK = 0xFF000000;
pub const VFS_CAP_REVISION_SHIFT = 24;
pub const VFS_CAP_FLAGS_MASK = ~VFS_CAP_REVISION_MASK;
pub const VFS_CAP_FLAGS_MASK = ~@as(u32, VFS_CAP_REVISION_MASK);
pub const VFS_CAP_FLAGS_EFFECTIVE = 0x000001;

pub const VFS_CAP_REVISION_1 = 0x01000000;
Expand All@@ -5113,7 +5115,7 @@ pub const VFS_CAP_REVISION = VFS_CAP_REVISION_2;
pub const vfs_cap_data = extern struct {
 //all of these are mandated as little endian
 //when on disk.
 const Data = struct {
 const Data = extern struct {
 permitted: u32,
 inheritable: u32,
 };
Expand Down

3 changes: 2 additions & 1 deletion
lib/std/os/linux/bpf/btf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,13 +83,14 @@ pub const Kind = enum(u5) {
/// int kind is followed by this struct
pub const IntInfo = packed struct(u32) {
 bits: u8,
unused: u8,
reserved_1: u8,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_1: u8,
reserved_1: u8=0,
 offset: u8,
 encoding: enum(u4) {
 signed = 1 << 0,
 char = 1 << 1,
 boolean = 1 << 2,
 },
 reserved_2: u4,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_2: u4,
reserved_2: u4=0,
};

test "IntInfo is 32 bits" {
Expand Down

17 changes: 17 additions & 0 deletions
lib/std/os/linux/test.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,23 @@ test "fadvise" {
 try expectEqual(@as(usize, 0), ret);
}

test "sigset_t" {
 var sigset = linux.empty_sigset;

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), false);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR1);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR2);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), true);
}

test {
 _ = linux.IoUring;
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
std.os.linux: Fix bunch of compilation errors#21138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 7 commits into

from

Aug 23, 2024
 Merged


std.os.linux: Fix bunch of compilation errors
#21138
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
9e17cdd

Correct layout of IntInfo according to https://www.kernel.org/doc/htm…


fardragon Aug 18, 2024
92f624a

Fix VFS errors


fardragon Aug 18, 2024
fd698db

Fix std.os.linux.sendmmsg


fardragon Aug 18, 2024
9b59d52

Fix std.os.linux.sigismember. Add tests


fardragon Aug 18, 2024
3abaa32

Fix futex2 functions


fardragon Aug 19, 2024
7569c83

Fix comments


fardragon Aug 19, 2024
a5bd5b2

Restore backticks


fardragon Aug 21, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


36 changes: 19 additions & 17 deletions
lib/std/os/linux.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,12 +630,13 @@ pub fn futex2_waitv(
 nr_futexes,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wait on a futex.
/// Identical to `FUTEX.WAIT`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 familiy of calls.
pub fn futex2_wait(
 /// Address of the futex to wait on.
 uaddr: *const anyopaque,
Expand All@@ -646,7 +647,7 @@ pub fn futex2_wait(
 /// `FUTEX2` flags.
 flags: u32,
 /// Optional absolute timeout.
 timeout: *const timespec,
 timeout: ?*const timespec,
 /// Clock to be used for the timeout, realtime or monotonic.
 clockid: clockid_t,
) usize {
Expand All@@ -657,15 +658,16 @@ pub fn futex2_wait(
 mask,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wake a number of futexes.
/// Identical to `FUTEX.WAKE`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 family of calls.
pub fn futex2_wake(
 /// Address of the futex(es) to wake.
 uaddr: [*]const anyopaque,
 uaddr: *const anyopaque,
 /// Bitmask
 mask: usize,
 /// Number of the futexes to wake.
Expand DownExpand Up@@ -1683,7 +1685,7 @@ pub fn sigaddset(set: *sigset_t, sig: u6) void {

pub fn sigismember(set: *const sigset_t, sig: u6) bool {
 const s = sig - 1;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << (s & (usize_bits - 1)))) != 0;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << @intCast(s & (usize_bits - 1)))) != 0;
}

pub fn getsockname(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
Expand DownExpand Up@@ -1740,31 +1742,31 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize
 var next_unsent: usize = 0;
 for (msgvec[0..kvlen], 0..) |*msg, i| {
 var size: i32 = 0;
 const msg_iovlen = @as(usize, @intCast(msg.msg_hdr.msg_iovlen)); // kernel side this is treated as unsigned
 for (msg.msg_hdr.msg_iov[0..msg_iovlen]) |iov| {
 const msg_iovlen = @as(usize, @intCast(msg.hdr.iovlen)); // kernel side this is treated as unsigned
 for (msg.hdr.iov[0..msg_iovlen]) |iov| {
 if (iov.len > std.math.maxInt(i32) or @addWithOverflow(size, @as(i32, @intCast(iov.len)))[1] != 0) {
 // batch-send all messages up to the current message
 if (next_unsent < i) {
 const batch_size = i - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return next_unsent;
 if (E.init(r) != .SUCCESS) return next_unsent;
 if (r < batch_size) return next_unsent + r;
 }
 // send current message as own packet
 const r = sendmsg(fd, &msg.msg_hdr, flags);
 if (E.init(r) != 0) return r;
 const r = sendmsg(fd, &msg.hdr, flags);
 if (E.init(r) != .SUCCESS) return r;
 // Linux limits the total bytes sent by sendmsg to INT_MAX, so this cast is safe.
 msg.msg_len = @as(u32, @intCast(r));
 msg.len = @as(u32, @intCast(r));
 next_unsent = i + 1;
 break;
 }
 size += iov.len;
 size += @intCast(iov.len);
 }
 }
 if (next_unsent < kvlen or next_unsent == 0) { // want to make sure at least one syscall occurs (e.g. to trigger MSG.EOR)
 const batch_size = kvlen - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return r;
 if (E.init(r) != .SUCCESS) return r;
 return next_unsent + r;
 }
 return kvlen;
Expand DownExpand Up@@ -5095,7 +5097,7 @@ pub const epoll_event = extern struct {

pub const VFS_CAP_REVISION_MASK = 0xFF000000;
pub const VFS_CAP_REVISION_SHIFT = 24;
pub const VFS_CAP_FLAGS_MASK = ~VFS_CAP_REVISION_MASK;
pub const VFS_CAP_FLAGS_MASK = ~@as(u32, VFS_CAP_REVISION_MASK);
pub const VFS_CAP_FLAGS_EFFECTIVE = 0x000001;

pub const VFS_CAP_REVISION_1 = 0x01000000;
Expand All@@ -5113,7 +5115,7 @@ pub const VFS_CAP_REVISION = VFS_CAP_REVISION_2;
pub const vfs_cap_data = extern struct {
 //all of these are mandated as little endian
 //when on disk.
 const Data = struct {
 const Data = extern struct {
 permitted: u32,
 inheritable: u32,
 };
Expand Down

3 changes: 2 additions & 1 deletion
lib/std/os/linux/bpf/btf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,13 +83,14 @@ pub const Kind = enum(u5) {
/// int kind is followed by this struct
pub const IntInfo = packed struct(u32) {
 bits: u8,
unused: u8,
reserved_1: u8,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_1: u8,
reserved_1: u8=0,
 offset: u8,
 encoding: enum(u4) {
 signed = 1 << 0,
 char = 1 << 1,
 boolean = 1 << 2,
 },
 reserved_2: u4,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_2: u4,
reserved_2: u4=0,
};

test "IntInfo is 32 bits" {
Expand Down

17 changes: 17 additions & 0 deletions
lib/std/os/linux/test.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,23 @@ test "fadvise" {
 try expectEqual(@as(usize, 0), ret);
}

test "sigset_t" {
 var sigset = linux.empty_sigset;

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), false);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR1);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR2);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), true);
}

test {
 _ = linux.IoUring;
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
std.os.linux: Fix bunch of compilation errors#21138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 7 commits into

from

Aug 23, 2024
 Merged


std.os.linux: Fix bunch of compilation errors
#21138
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
9e17cdd

Correct layout of IntInfo according to https://www.kernel.org/doc/htm…


fardragon Aug 18, 2024
92f624a

Fix VFS errors


fardragon Aug 18, 2024
fd698db

Fix std.os.linux.sendmmsg


fardragon Aug 18, 2024
9b59d52

Fix std.os.linux.sigismember. Add tests


fardragon Aug 18, 2024
3abaa32

Fix futex2 functions


fardragon Aug 19, 2024
7569c83

Fix comments


fardragon Aug 19, 2024
a5bd5b2

Restore backticks


fardragon Aug 21, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


36 changes: 19 additions & 17 deletions
lib/std/os/linux.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,12 +630,13 @@ pub fn futex2_waitv(
 nr_futexes,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wait on a futex.
/// Identical to `FUTEX.WAIT`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 familiy of calls.
pub fn futex2_wait(
 /// Address of the futex to wait on.
 uaddr: *const anyopaque,
Expand All@@ -646,7 +647,7 @@ pub fn futex2_wait(
 /// `FUTEX2` flags.
 flags: u32,
 /// Optional absolute timeout.
 timeout: *const timespec,
 timeout: ?*const timespec,
 /// Clock to be used for the timeout, realtime or monotonic.
 clockid: clockid_t,
) usize {
Expand All@@ -657,15 +658,16 @@ pub fn futex2_wait(
 mask,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wake a number of futexes.
/// Identical to `FUTEX.WAKE`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 family of calls.
pub fn futex2_wake(
 /// Address of the futex(es) to wake.
 uaddr: [*]const anyopaque,
 uaddr: *const anyopaque,
 /// Bitmask
 mask: usize,
 /// Number of the futexes to wake.
Expand DownExpand Up@@ -1683,7 +1685,7 @@ pub fn sigaddset(set: *sigset_t, sig: u6) void {

pub fn sigismember(set: *const sigset_t, sig: u6) bool {
 const s = sig - 1;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << (s & (usize_bits - 1)))) != 0;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << @intCast(s & (usize_bits - 1)))) != 0;
}

pub fn getsockname(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
Expand DownExpand Up@@ -1740,31 +1742,31 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize
 var next_unsent: usize = 0;
 for (msgvec[0..kvlen], 0..) |*msg, i| {
 var size: i32 = 0;
 const msg_iovlen = @as(usize, @intCast(msg.msg_hdr.msg_iovlen)); // kernel side this is treated as unsigned
 for (msg.msg_hdr.msg_iov[0..msg_iovlen]) |iov| {
 const msg_iovlen = @as(usize, @intCast(msg.hdr.iovlen)); // kernel side this is treated as unsigned
 for (msg.hdr.iov[0..msg_iovlen]) |iov| {
 if (iov.len > std.math.maxInt(i32) or @addWithOverflow(size, @as(i32, @intCast(iov.len)))[1] != 0) {
 // batch-send all messages up to the current message
 if (next_unsent < i) {
 const batch_size = i - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return next_unsent;
 if (E.init(r) != .SUCCESS) return next_unsent;
 if (r < batch_size) return next_unsent + r;
 }
 // send current message as own packet
 const r = sendmsg(fd, &msg.msg_hdr, flags);
 if (E.init(r) != 0) return r;
 const r = sendmsg(fd, &msg.hdr, flags);
 if (E.init(r) != .SUCCESS) return r;
 // Linux limits the total bytes sent by sendmsg to INT_MAX, so this cast is safe.
 msg.msg_len = @as(u32, @intCast(r));
 msg.len = @as(u32, @intCast(r));
 next_unsent = i + 1;
 break;
 }
 size += iov.len;
 size += @intCast(iov.len);
 }
 }
 if (next_unsent < kvlen or next_unsent == 0) { // want to make sure at least one syscall occurs (e.g. to trigger MSG.EOR)
 const batch_size = kvlen - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return r;
 if (E.init(r) != .SUCCESS) return r;
 return next_unsent + r;
 }
 return kvlen;
Expand DownExpand Up@@ -5095,7 +5097,7 @@ pub const epoll_event = extern struct {

pub const VFS_CAP_REVISION_MASK = 0xFF000000;
pub const VFS_CAP_REVISION_SHIFT = 24;
pub const VFS_CAP_FLAGS_MASK = ~VFS_CAP_REVISION_MASK;
pub const VFS_CAP_FLAGS_MASK = ~@as(u32, VFS_CAP_REVISION_MASK);
pub const VFS_CAP_FLAGS_EFFECTIVE = 0x000001;

pub const VFS_CAP_REVISION_1 = 0x01000000;
Expand All@@ -5113,7 +5115,7 @@ pub const VFS_CAP_REVISION = VFS_CAP_REVISION_2;
pub const vfs_cap_data = extern struct {
 //all of these are mandated as little endian
 //when on disk.
 const Data = struct {
 const Data = extern struct {
 permitted: u32,
 inheritable: u32,
 };
Expand Down

3 changes: 2 additions & 1 deletion
lib/std/os/linux/bpf/btf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,13 +83,14 @@ pub const Kind = enum(u5) {
/// int kind is followed by this struct
pub const IntInfo = packed struct(u32) {
 bits: u8,
unused: u8,
reserved_1: u8,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_1: u8,
reserved_1: u8=0,
 offset: u8,
 encoding: enum(u4) {
 signed = 1 << 0,
 char = 1 << 1,
 boolean = 1 << 2,
 },
 reserved_2: u4,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_2: u4,
reserved_2: u4=0,
};

test "IntInfo is 32 bits" {
Expand Down

17 changes: 17 additions & 0 deletions
lib/std/os/linux/test.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,23 @@ test "fadvise" {
 try expectEqual(@as(usize, 0), ret);
}

test "sigset_t" {
 var sigset = linux.empty_sigset;

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), false);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR1);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR2);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), true);
}

test {
 _ = linux.IoUring;
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
std.os.linux: Fix bunch of compilation errors#21138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 7 commits into

from

Aug 23, 2024
 Merged


std.os.linux: Fix bunch of compilation errors
#21138
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
9e17cdd

Correct layout of IntInfo according to https://www.kernel.org/doc/htm…


fardragon Aug 18, 2024
92f624a

Fix VFS errors


fardragon Aug 18, 2024
fd698db

Fix std.os.linux.sendmmsg


fardragon Aug 18, 2024
9b59d52

Fix std.os.linux.sigismember. Add tests


fardragon Aug 18, 2024
3abaa32

Fix futex2 functions


fardragon Aug 19, 2024
7569c83

Fix comments


fardragon Aug 19, 2024
a5bd5b2

Restore backticks


fardragon Aug 21, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


36 changes: 19 additions & 17 deletions
lib/std/os/linux.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,12 +630,13 @@ pub fn futex2_waitv(
 nr_futexes,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wait on a futex.
/// Identical to `FUTEX.WAIT`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 familiy of calls.
pub fn futex2_wait(
 /// Address of the futex to wait on.
 uaddr: *const anyopaque,
Expand All@@ -646,7 +647,7 @@ pub fn futex2_wait(
 /// `FUTEX2` flags.
 flags: u32,
 /// Optional absolute timeout.
 timeout: *const timespec,
 timeout: ?*const timespec,
 /// Clock to be used for the timeout, realtime or monotonic.
 clockid: clockid_t,
) usize {
Expand All@@ -657,15 +658,16 @@ pub fn futex2_wait(
 mask,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wake a number of futexes.
/// Identical to `FUTEX.WAKE`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 family of calls.
pub fn futex2_wake(
 /// Address of the futex(es) to wake.
 uaddr: [*]const anyopaque,
 uaddr: *const anyopaque,
 /// Bitmask
 mask: usize,
 /// Number of the futexes to wake.
Expand DownExpand Up@@ -1683,7 +1685,7 @@ pub fn sigaddset(set: *sigset_t, sig: u6) void {

pub fn sigismember(set: *const sigset_t, sig: u6) bool {
 const s = sig - 1;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << (s & (usize_bits - 1)))) != 0;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << @intCast(s & (usize_bits - 1)))) != 0;
}

pub fn getsockname(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
Expand DownExpand Up@@ -1740,31 +1742,31 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize
 var next_unsent: usize = 0;
 for (msgvec[0..kvlen], 0..) |*msg, i| {
 var size: i32 = 0;
 const msg_iovlen = @as(usize, @intCast(msg.msg_hdr.msg_iovlen)); // kernel side this is treated as unsigned
 for (msg.msg_hdr.msg_iov[0..msg_iovlen]) |iov| {
 const msg_iovlen = @as(usize, @intCast(msg.hdr.iovlen)); // kernel side this is treated as unsigned
 for (msg.hdr.iov[0..msg_iovlen]) |iov| {
 if (iov.len > std.math.maxInt(i32) or @addWithOverflow(size, @as(i32, @intCast(iov.len)))[1] != 0) {
 // batch-send all messages up to the current message
 if (next_unsent < i) {
 const batch_size = i - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return next_unsent;
 if (E.init(r) != .SUCCESS) return next_unsent;
 if (r < batch_size) return next_unsent + r;
 }
 // send current message as own packet
 const r = sendmsg(fd, &msg.msg_hdr, flags);
 if (E.init(r) != 0) return r;
 const r = sendmsg(fd, &msg.hdr, flags);
 if (E.init(r) != .SUCCESS) return r;
 // Linux limits the total bytes sent by sendmsg to INT_MAX, so this cast is safe.
 msg.msg_len = @as(u32, @intCast(r));
 msg.len = @as(u32, @intCast(r));
 next_unsent = i + 1;
 break;
 }
 size += iov.len;
 size += @intCast(iov.len);
 }
 }
 if (next_unsent < kvlen or next_unsent == 0) { // want to make sure at least one syscall occurs (e.g. to trigger MSG.EOR)
 const batch_size = kvlen - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return r;
 if (E.init(r) != .SUCCESS) return r;
 return next_unsent + r;
 }
 return kvlen;
Expand DownExpand Up@@ -5095,7 +5097,7 @@ pub const epoll_event = extern struct {

pub const VFS_CAP_REVISION_MASK = 0xFF000000;
pub const VFS_CAP_REVISION_SHIFT = 24;
pub const VFS_CAP_FLAGS_MASK = ~VFS_CAP_REVISION_MASK;
pub const VFS_CAP_FLAGS_MASK = ~@as(u32, VFS_CAP_REVISION_MASK);
pub const VFS_CAP_FLAGS_EFFECTIVE = 0x000001;

pub const VFS_CAP_REVISION_1 = 0x01000000;
Expand All@@ -5113,7 +5115,7 @@ pub const VFS_CAP_REVISION = VFS_CAP_REVISION_2;
pub const vfs_cap_data = extern struct {
 //all of these are mandated as little endian
 //when on disk.
 const Data = struct {
 const Data = extern struct {
 permitted: u32,
 inheritable: u32,
 };
Expand Down

3 changes: 2 additions & 1 deletion
lib/std/os/linux/bpf/btf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,13 +83,14 @@ pub const Kind = enum(u5) {
/// int kind is followed by this struct
pub const IntInfo = packed struct(u32) {
 bits: u8,
unused: u8,
reserved_1: u8,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_1: u8,
reserved_1: u8=0,
 offset: u8,
 encoding: enum(u4) {
 signed = 1 << 0,
 char = 1 << 1,
 boolean = 1 << 2,
 },
 reserved_2: u4,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_2: u4,
reserved_2: u4=0,
};

test "IntInfo is 32 bits" {
Expand Down

17 changes: 17 additions & 0 deletions
lib/std/os/linux/test.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,23 @@ test "fadvise" {
 try expectEqual(@as(usize, 0), ret);
}

test "sigset_t" {
 var sigset = linux.empty_sigset;

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), false);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR1);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR2);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), true);
}

test {
 _ = linux.IoUring;
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
std.os.linux: Fix bunch of compilation errors#21138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 7 commits into

from

Aug 23, 2024
 Merged


std.os.linux: Fix bunch of compilation errors
#21138
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
9e17cdd

Correct layout of IntInfo according to https://www.kernel.org/doc/htm…


fardragon Aug 18, 2024
92f624a

Fix VFS errors


fardragon Aug 18, 2024
fd698db

Fix std.os.linux.sendmmsg


fardragon Aug 18, 2024
9b59d52

Fix std.os.linux.sigismember. Add tests


fardragon Aug 18, 2024
3abaa32

Fix futex2 functions


fardragon Aug 19, 2024
7569c83

Fix comments


fardragon Aug 19, 2024
a5bd5b2

Restore backticks


fardragon Aug 21, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


36 changes: 19 additions & 17 deletions
lib/std/os/linux.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,12 +630,13 @@ pub fn futex2_waitv(
 nr_futexes,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wait on a futex.
/// Identical to `FUTEX.WAIT`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 familiy of calls.
pub fn futex2_wait(
 /// Address of the futex to wait on.
 uaddr: *const anyopaque,
Expand All@@ -646,7 +647,7 @@ pub fn futex2_wait(
 /// `FUTEX2` flags.
 flags: u32,
 /// Optional absolute timeout.
 timeout: *const timespec,
 timeout: ?*const timespec,
 /// Clock to be used for the timeout, realtime or monotonic.
 clockid: clockid_t,
) usize {
Expand All@@ -657,15 +658,16 @@ pub fn futex2_wait(
 mask,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wake a number of futexes.
/// Identical to `FUTEX.WAKE`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 family of calls.
pub fn futex2_wake(
 /// Address of the futex(es) to wake.
 uaddr: [*]const anyopaque,
 uaddr: *const anyopaque,
 /// Bitmask
 mask: usize,
 /// Number of the futexes to wake.
Expand DownExpand Up@@ -1683,7 +1685,7 @@ pub fn sigaddset(set: *sigset_t, sig: u6) void {

pub fn sigismember(set: *const sigset_t, sig: u6) bool {
 const s = sig - 1;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << (s & (usize_bits - 1)))) != 0;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << @intCast(s & (usize_bits - 1)))) != 0;
}

pub fn getsockname(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
Expand DownExpand Up@@ -1740,31 +1742,31 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize
 var next_unsent: usize = 0;
 for (msgvec[0..kvlen], 0..) |*msg, i| {
 var size: i32 = 0;
 const msg_iovlen = @as(usize, @intCast(msg.msg_hdr.msg_iovlen)); // kernel side this is treated as unsigned
 for (msg.msg_hdr.msg_iov[0..msg_iovlen]) |iov| {
 const msg_iovlen = @as(usize, @intCast(msg.hdr.iovlen)); // kernel side this is treated as unsigned
 for (msg.hdr.iov[0..msg_iovlen]) |iov| {
 if (iov.len > std.math.maxInt(i32) or @addWithOverflow(size, @as(i32, @intCast(iov.len)))[1] != 0) {
 // batch-send all messages up to the current message
 if (next_unsent < i) {
 const batch_size = i - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return next_unsent;
 if (E.init(r) != .SUCCESS) return next_unsent;
 if (r < batch_size) return next_unsent + r;
 }
 // send current message as own packet
 const r = sendmsg(fd, &msg.msg_hdr, flags);
 if (E.init(r) != 0) return r;
 const r = sendmsg(fd, &msg.hdr, flags);
 if (E.init(r) != .SUCCESS) return r;
 // Linux limits the total bytes sent by sendmsg to INT_MAX, so this cast is safe.
 msg.msg_len = @as(u32, @intCast(r));
 msg.len = @as(u32, @intCast(r));
 next_unsent = i + 1;
 break;
 }
 size += iov.len;
 size += @intCast(iov.len);
 }
 }
 if (next_unsent < kvlen or next_unsent == 0) { // want to make sure at least one syscall occurs (e.g. to trigger MSG.EOR)
 const batch_size = kvlen - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return r;
 if (E.init(r) != .SUCCESS) return r;
 return next_unsent + r;
 }
 return kvlen;
Expand DownExpand Up@@ -5095,7 +5097,7 @@ pub const epoll_event = extern struct {

pub const VFS_CAP_REVISION_MASK = 0xFF000000;
pub const VFS_CAP_REVISION_SHIFT = 24;
pub const VFS_CAP_FLAGS_MASK = ~VFS_CAP_REVISION_MASK;
pub const VFS_CAP_FLAGS_MASK = ~@as(u32, VFS_CAP_REVISION_MASK);
pub const VFS_CAP_FLAGS_EFFECTIVE = 0x000001;

pub const VFS_CAP_REVISION_1 = 0x01000000;
Expand All@@ -5113,7 +5115,7 @@ pub const VFS_CAP_REVISION = VFS_CAP_REVISION_2;
pub const vfs_cap_data = extern struct {
 //all of these are mandated as little endian
 //when on disk.
 const Data = struct {
 const Data = extern struct {
 permitted: u32,
 inheritable: u32,
 };
Expand Down

3 changes: 2 additions & 1 deletion
lib/std/os/linux/bpf/btf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,13 +83,14 @@ pub const Kind = enum(u5) {
/// int kind is followed by this struct
pub const IntInfo = packed struct(u32) {
 bits: u8,
unused: u8,
reserved_1: u8,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_1: u8,
reserved_1: u8=0,
 offset: u8,
 encoding: enum(u4) {
 signed = 1 << 0,
 char = 1 << 1,
 boolean = 1 << 2,
 },
 reserved_2: u4,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_2: u4,
reserved_2: u4=0,
};

test "IntInfo is 32 bits" {
Expand Down

17 changes: 17 additions & 0 deletions
lib/std/os/linux/test.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,23 @@ test "fadvise" {
 try expectEqual(@as(usize, 0), ret);
}

test "sigset_t" {
 var sigset = linux.empty_sigset;

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), false);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR1);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR2);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), true);
}

test {
 _ = linux.IoUring;
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
std.os.linux: Fix bunch of compilation errors#21138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

andrewrk
merged 7 commits into

from

Aug 23, 2024
 Merged


std.os.linux: Fix bunch of compilation errors
#21138
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
9e17cdd

Correct layout of IntInfo according to https://www.kernel.org/doc/htm…


fardragon Aug 18, 2024
92f624a

Fix VFS errors


fardragon Aug 18, 2024
fd698db

Fix std.os.linux.sendmmsg


fardragon Aug 18, 2024
9b59d52

Fix std.os.linux.sigismember. Add tests


fardragon Aug 18, 2024
3abaa32

Fix futex2 functions


fardragon Aug 19, 2024
7569c83

Fix comments


fardragon Aug 19, 2024
a5bd5b2

Restore backticks


fardragon Aug 21, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


36 changes: 19 additions & 17 deletions
lib/std/os/linux.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -630,12 +630,13 @@ pub fn futex2_waitv(
 nr_futexes,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wait on a futex.
/// Identical to `FUTEX.WAIT`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 familiy of calls.
pub fn futex2_wait(
 /// Address of the futex to wait on.
 uaddr: *const anyopaque,
Expand All@@ -646,7 +647,7 @@ pub fn futex2_wait(
 /// `FUTEX2` flags.
 flags: u32,
 /// Optional absolute timeout.
 timeout: *const timespec,
 timeout: ?*const timespec,
 /// Clock to be used for the timeout, realtime or monotonic.
 clockid: clockid_t,
) usize {
Expand All@@ -657,15 +658,16 @@ pub fn futex2_wait(
 mask,
 flags,
 @intFromPtr(timeout),
 @bitCast(@as(isize, clockid)),
 @bitCast(@as(isize, @intFromEnum(clockid))),
 );
}

/// Wake a number of futexes.
/// Identical to `FUTEX.WAKE`, except it is part of the futex2 family of calls.
/// Identical to the traditional `FUTEX.FUTEX_WAIT_BITSET` op, except it is part of the
/// futex2 family of calls.
pub fn futex2_wake(
 /// Address of the futex(es) to wake.
 uaddr: [*]const anyopaque,
 uaddr: *const anyopaque,
 /// Bitmask
 mask: usize,
 /// Number of the futexes to wake.
Expand DownExpand Up@@ -1683,7 +1685,7 @@ pub fn sigaddset(set: *sigset_t, sig: u6) void {

pub fn sigismember(set: *const sigset_t, sig: u6) bool {
 const s = sig - 1;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << (s & (usize_bits - 1)))) != 0;
 return ((set.*)[@as(usize, @intCast(s)) / usize_bits] & (@as(usize, @intCast(1)) << @intCast(s & (usize_bits - 1)))) != 0;
}

pub fn getsockname(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
Expand DownExpand Up@@ -1740,31 +1742,31 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize
 var next_unsent: usize = 0;
 for (msgvec[0..kvlen], 0..) |*msg, i| {
 var size: i32 = 0;
 const msg_iovlen = @as(usize, @intCast(msg.msg_hdr.msg_iovlen)); // kernel side this is treated as unsigned
 for (msg.msg_hdr.msg_iov[0..msg_iovlen]) |iov| {
 const msg_iovlen = @as(usize, @intCast(msg.hdr.iovlen)); // kernel side this is treated as unsigned
 for (msg.hdr.iov[0..msg_iovlen]) |iov| {
 if (iov.len > std.math.maxInt(i32) or @addWithOverflow(size, @as(i32, @intCast(iov.len)))[1] != 0) {
 // batch-send all messages up to the current message
 if (next_unsent < i) {
 const batch_size = i - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return next_unsent;
 if (E.init(r) != .SUCCESS) return next_unsent;
 if (r < batch_size) return next_unsent + r;
 }
 // send current message as own packet
 const r = sendmsg(fd, &msg.msg_hdr, flags);
 if (E.init(r) != 0) return r;
 const r = sendmsg(fd, &msg.hdr, flags);
 if (E.init(r) != .SUCCESS) return r;
 // Linux limits the total bytes sent by sendmsg to INT_MAX, so this cast is safe.
 msg.msg_len = @as(u32, @intCast(r));
 msg.len = @as(u32, @intCast(r));
 next_unsent = i + 1;
 break;
 }
 size += iov.len;
 size += @intCast(iov.len);
 }
 }
 if (next_unsent < kvlen or next_unsent == 0) { // want to make sure at least one syscall occurs (e.g. to trigger MSG.EOR)
 const batch_size = kvlen - next_unsent;
 const r = syscall4(.sendmmsg, @as(usize, @bitCast(@as(isize, fd))), @intFromPtr(&msgvec[next_unsent]), batch_size, flags);
 if (E.init(r) != 0) return r;
 if (E.init(r) != .SUCCESS) return r;
 return next_unsent + r;
 }
 return kvlen;
Expand DownExpand Up@@ -5095,7 +5097,7 @@ pub const epoll_event = extern struct {

pub const VFS_CAP_REVISION_MASK = 0xFF000000;
pub const VFS_CAP_REVISION_SHIFT = 24;
pub const VFS_CAP_FLAGS_MASK = ~VFS_CAP_REVISION_MASK;
pub const VFS_CAP_FLAGS_MASK = ~@as(u32, VFS_CAP_REVISION_MASK);
pub const VFS_CAP_FLAGS_EFFECTIVE = 0x000001;

pub const VFS_CAP_REVISION_1 = 0x01000000;
Expand All@@ -5113,7 +5115,7 @@ pub const VFS_CAP_REVISION = VFS_CAP_REVISION_2;
pub const vfs_cap_data = extern struct {
 //all of these are mandated as little endian
 //when on disk.
 const Data = struct {
 const Data = extern struct {
 permitted: u32,
 inheritable: u32,
 };
Expand Down

3 changes: 2 additions & 1 deletion
lib/std/os/linux/bpf/btf.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,13 +83,14 @@ pub const Kind = enum(u5) {
/// int kind is followed by this struct
pub const IntInfo = packed struct(u32) {
 bits: u8,
unused: u8,
reserved_1: u8,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_1: u8,
reserved_1: u8=0,
 offset: u8,
 encoding: enum(u4) {
 signed = 1 << 0,
 char = 1 << 1,
 boolean = 1 << 2,
 },
 reserved_2: u4,
@andrewrkandrewrkAug 23, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

reserved_2: u4,
reserved_2: u4=0,
};

test "IntInfo is 32 bits" {
Expand Down

17 changes: 17 additions & 0 deletions
lib/std/os/linux/test.zig

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -125,6 +125,23 @@ test "fadvise" {
 try expectEqual(@as(usize, 0), ret);
}

test "sigset_t" {
 var sigset = linux.empty_sigset;

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), false);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR1);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), false);

 linux.sigaddset(&sigset, linux.SIG.USR2);

 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR1), true);
 try expectEqual(linux.sigismember(&sigset, linux.SIG.USR2), true);
}

test {
 _ = linux.IoUring;
}