Skip to content

std.os: fix alignment of Sigaction.handler_fn #13418

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
Vexu merged 3 commits into from
Nov 9, 2022
Merged

std.os: fix alignment of Sigaction.handler_fn #13418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64b3ffd
std.os: Add IGN coverage to sigaction tests
ryanschneider Nov 3, 2022
7f1f2e6
std.os: fix alignment of Sigaction.handler_fn
ryanschneider Nov 3, 2022
a68b27c
std.os: improve sigaction test coverage.
ryanschneider Nov 3, 2022
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
2 changes: 1 addition & 1 deletion lib/std/c/darwin.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ pub const siginfo_t = extern struct {

/// Renamed from `sigaction` to `Sigaction` to avoid conflict with function name.
pub const Sigaction = extern struct {
pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);
pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);

handler: extern union {
Expand Down
2 changes: 1 addition & 1 deletion lib/std/c/dragonfly.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ pub const empty_sigset = sigset_t{ .__bits = [_]c_uint{0} ** _SIG_WORDS };
pub const sig_atomic_t = c_int;

pub const Sigaction = extern struct {
pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);
pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);

/// signal handler
Expand Down
2 changes: 1 addition & 1 deletion lib/std/c/freebsd.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@ const NSIG = 32;

/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
pub const Sigaction = extern struct {
pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);
pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);

/// signal handler
Expand Down
2 changes: 1 addition & 1 deletion lib/std/c/haiku.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ const NSIG = 32;

/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
pub const Sigaction = extern struct {
pub const handler_fn = std.meta.FnPtr(fn (i32) callconv(.C) void);
pub const handler_fn = std.meta.FnPtr(fn (i32) align(1) callconv(.C) void);

/// signal handler
__sigaction_u: extern union {
Expand Down
2 changes: 1 addition & 1 deletion lib/std/c/netbsd.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ pub const SIG = struct {

/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
pub const Sigaction = extern struct {
pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);
pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);

/// signal handler
Expand Down
2 changes: 1 addition & 1 deletion lib/std/c/openbsd.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ pub const SIG = struct {

/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
pub const Sigaction = extern struct {
pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);
pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);

/// signal handler
Expand Down
2 changes: 1 addition & 1 deletion lib/std/c/solaris.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ pub const SIG = struct {

/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
pub const Sigaction = extern struct {
pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);
pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);

/// signal options
Expand Down
4 changes: 2 additions & 2 deletions lib/std/os/linux.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3130,7 +3130,7 @@ pub const all_mask: sigset_t = [_]u32{0xffffffff} ** @typeInfo(sigset_t).Array.l
pub const app_mask: sigset_t = [2]u32{ 0xfffffffc, 0x7fffffff } ++ [_]u32{0xffffffff} ** 30;

const k_sigaction_funcs = struct {
const handler = ?std.meta.FnPtr(fn (c_int) callconv(.C) void);
const handler = ?std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
const restorer = std.meta.FnPtr(fn () callconv(.C) void);
};

Expand All @@ -3157,7 +3157,7 @@ pub const k_sigaction = switch (native_arch) {

/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
pub const Sigaction = extern struct {
pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);
pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);

handler: extern union {
Expand Down
35 changes: 29 additions & 6 deletions lib/std/os/test.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,8 +739,6 @@ test "shutdown socket" {
os.closeSocket(sock);
}

var signal_test_failed = true;

test "sigaction" {
if (native_os == .wasi or native_os == .windows)
return error.SkipZigTest;
Expand All @@ -750,17 +748,19 @@ test "sigaction" {
return error.SkipZigTest;

const S = struct {
var handler_called_count: u32 = 0;

fn handler(sig: i32, info: *const os.siginfo_t, ctx_ptr: ?*const anyopaque) callconv(.C) void {
_ = ctx_ptr;
// Check that we received the correct signal.
switch (native_os) {
.netbsd => {
if (sig == os.SIG.USR1 and sig == info.info.signo)
signal_test_failed = false;
handler_called_count += 1;
},
else => {
if (sig == os.SIG.USR1 and sig == info.signo)
signal_test_failed = false;
handler_called_count += 1;
},
}
}
Expand All @@ -774,18 +774,41 @@ test "sigaction" {
.flags = os.SA.SIGINFO | os.SA.RESETHAND,
};
var old_sa: os.Sigaction = undefined;

// Install the new signal handler.
try os.sigaction(os.SIG.USR1, &sa, null);

// Check that we can read it back correctly.
try os.sigaction(os.SIG.USR1, null, &old_sa);
try testing.expectEqual(actual_handler, old_sa.handler.sigaction.?);
try testing.expect((old_sa.flags & os.SA.SIGINFO) != 0);

// Invoke the handler.
try os.raise(os.SIG.USR1);
try testing.expect(signal_test_failed == false);
// Check if the handler has been correctly reset to SIG_DFL
try testing.expect(S.handler_called_count == 1);

// Check if passing RESETHAND correctly reset the handler to SIG_DFL
try os.sigaction(os.SIG.USR1, null, &old_sa);
try testing.expectEqual(os.SIG.DFL, old_sa.handler.handler);

// Reinstall the signal w/o RESETHAND and re-raise
sa.flags = os.SA.SIGINFO;
try os.sigaction(os.SIG.USR1, &sa, null);
try os.raise(os.SIG.USR1);
try testing.expect(S.handler_called_count == 2);

// Now set the signal to ignored
sa.handler = .{ .handler = os.SIG.IGN };
sa.flags = 0;
try os.sigaction(os.SIG.USR1, &sa, null);

// Re-raise to ensure handler is actually ignored
try os.raise(os.SIG.USR1);
try testing.expect(S.handler_called_count == 2);

// Ensure that ignored state is returned when querying
try os.sigaction(os.SIG.USR1, null, &old_sa);
try testing.expectEqual(os.SIG.IGN, old_sa.handler.handler.?);
}

test "dup & dup2" {
Expand Down