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

std.Io.Threaded: apply netbsd todo hacks to openbsd

Browse source 
https://codeberg.org/ziglang/zig/issues/30063
This commit is contained in:
Alex Rønne Petersen 2025-12-01 04:30:55 +01:00
parent 49a0ffa42f
commit 7827dc03cb
No known key found for this signature in database
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/std/Io/Threaded.zig
View file

@ -1023,6 +1023,7 @@ fn cancel(
fn mutexLock(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mutex) Io.Cancelable!void { fn mutexLock(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mutex) Io.Cancelable!void {
if (builtin.single_threaded) unreachable; // Interface should have prevented this. if (builtin.single_threaded) unreachable; // Interface should have prevented this.
if (native_os == .netbsd) @panic("TODO"); if (native_os == .netbsd) @panic("TODO");
if (native_os == .openbsd) @panic("TODO");
const t: *Threaded = @ptrCast(@alignCast(userdata)); const t: *Threaded = @ptrCast(@alignCast(userdata));
const current_thread = Thread.getCurrent(t); const current_thread = Thread.getCurrent(t);
if (prev_state == .contended) { if (prev_state == .contended) {
@ -1036,6 +1037,7 @@ fn mutexLock(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mutex
fn mutexLockUncancelable(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mutex) void { fn mutexLockUncancelable(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mutex) void {
if (builtin.single_threaded) unreachable; // Interface should have prevented this. if (builtin.single_threaded) unreachable; // Interface should have prevented this.
if (native_os == .netbsd) @panic("TODO"); if (native_os == .netbsd) @panic("TODO");
if (native_os == .openbsd) @panic("TODO");
_ = userdata; _ = userdata;
if (prev_state == .contended) { if (prev_state == .contended) {
futexWaitUncancelable(@ptrCast(&mutex.state), @intFromEnum(Io.Mutex.State.contended)); futexWaitUncancelable(@ptrCast(&mutex.state), @intFromEnum(Io.Mutex.State.contended));
@ -1048,6 +1050,7 @@ fn mutexLockUncancelable(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mute
fn mutexUnlock(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mutex) void { fn mutexUnlock(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mutex) void {
if (builtin.single_threaded) unreachable; // Interface should have prevented this. if (builtin.single_threaded) unreachable; // Interface should have prevented this.
if (native_os == .netbsd) @panic("TODO"); if (native_os == .netbsd) @panic("TODO");
if (native_os == .openbsd) @panic("TODO");
_ = userdata; _ = userdata;
_ = prev_state; _ = prev_state;
if (@atomicRmw(Io.Mutex.State, &mutex.state, .Xchg, .unlocked, .release) == .contended) { if (@atomicRmw(Io.Mutex.State, &mutex.state, .Xchg, .unlocked, .release) == .contended) {
@ -1058,6 +1061,7 @@ fn mutexUnlock(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mut
fn conditionWaitUncancelable(userdata: ?*anyopaque, cond: *Io.Condition, mutex: *Io.Mutex) void { fn conditionWaitUncancelable(userdata: ?*anyopaque, cond: *Io.Condition, mutex: *Io.Mutex) void {
if (builtin.single_threaded) unreachable; // Deadlock. if (builtin.single_threaded) unreachable; // Deadlock.
if (native_os == .netbsd) @panic("TODO"); if (native_os == .netbsd) @panic("TODO");
if (native_os == .openbsd) @panic("TODO");
const t: *Threaded = @ptrCast(@alignCast(userdata)); const t: *Threaded = @ptrCast(@alignCast(userdata));
const t_io = ioBasic(t); const t_io = ioBasic(t);
comptime assert(@TypeOf(cond.state) == u64); comptime assert(@TypeOf(cond.state) == u64);
@ -1090,6 +1094,7 @@ fn conditionWaitUncancelable(userdata: ?*anyopaque, cond: *Io.Condition, mutex:
fn conditionWait(userdata: ?*anyopaque, cond: *Io.Condition, mutex: *Io.Mutex) Io.Cancelable!void { fn conditionWait(userdata: ?*anyopaque, cond: *Io.Condition, mutex: *Io.Mutex) Io.Cancelable!void {
if (builtin.single_threaded) unreachable; // Deadlock. if (builtin.single_threaded) unreachable; // Deadlock.
if (native_os == .netbsd) @panic("TODO"); if (native_os == .netbsd) @panic("TODO");
if (native_os == .openbsd) @panic("TODO");
const t: *Threaded = @ptrCast(@alignCast(userdata)); const t: *Threaded = @ptrCast(@alignCast(userdata));
const current_thread = Thread.getCurrent(t); const current_thread = Thread.getCurrent(t);
const t_io = ioBasic(t); const t_io = ioBasic(t);
@ -1192,6 +1197,7 @@ fn conditionWake(userdata: ?*anyopaque, cond: *Io.Condition, wake: Io.Condition.
// - T1: s & signals == 0 -> FUTEX_WAIT(&epoch, e) (missed both epoch change and state change) // - T1: s & signals == 0 -> FUTEX_WAIT(&epoch, e) (missed both epoch change and state change)
_ = cond_epoch.fetchAdd(1, .release); _ = cond_epoch.fetchAdd(1, .release);
if (native_os == .netbsd) @panic("TODO"); if (native_os == .netbsd) @panic("TODO");
if (native_os == .openbsd) @panic("TODO");
futexWake(cond_epoch, to_wake); futexWake(cond_epoch, to_wake);
return; return;
}; };
@ -6818,7 +6824,7 @@ pub fn futexWake(ptr: *const std.atomic.Value(u32), max_waiters: u32) void {
/// It can also block threads until the value is set with cancelation via timed /// It can also block threads until the value is set with cancelation via timed
/// waits. Statically initializable; four bytes on all targets. /// waits. Statically initializable; four bytes on all targets.
pub const ResetEvent = switch (native_os) { pub const ResetEvent = switch (native_os) {
.illumos, .netbsd => ResetEventPosix, .illumos, .netbsd, .openbsd => ResetEventPosix,
else => ResetEventFutex, else => ResetEventFutex,
}; };