diff --git a/lib/std/c/freebsd.zig b/lib/std/c/freebsd.zig index 0d0adf21f7..a03c5a3b70 100644 --- a/lib/std/c/freebsd.zig +++ b/lib/std/c/freebsd.zig @@ -13,19 +13,6 @@ pub const cpulevel_t = c_int; pub const cpuwhich_t = c_int; pub const id_t = i64; -pub const CPU_LEVEL_ROOT: cpulevel_t = 1; -pub const CPU_LEVEL_CPUSET: cpulevel_t = 2; -pub const CPU_LEVEL_WHICH: cpulevel_t = 3; -pub const CPU_WHICH_TID: cpuwhich_t = 1; -pub const CPU_WHICH_PID: cpuwhich_t = 2; -pub const CPU_WHICH_CPUSET: cpuwhich_t = 3; -pub const CPU_WHICH_IRQ: cpuwhich_t = 4; -pub const CPU_WHICH_JAIL: cpuwhich_t = 5; -pub const CPU_WHICH_DOMAIN: cpuwhich_t = 6; -pub const CPU_WHICH_INTRHANDLER: cpuwhich_t = 7; -pub const CPU_WHICH_ITHREAD: cpuwhich_t = 8; -pub const CPU_WHICH_TIDPID: cpuwhich_t = 8; - extern "c" fn __error() *c_int; pub const _errno = __error; diff --git a/lib/std/os.zig b/lib/std/os.zig index c8720257b8..b8b4295eba 100644 --- a/lib/std/os.zig +++ b/lib/std/os.zig @@ -146,12 +146,7 @@ pub const addrinfo = system.addrinfo; pub const blkcnt_t = system.blkcnt_t; pub const blksize_t = system.blksize_t; pub const clock_t = system.clock_t; -pub const cpu_set_t = if (builtin.os.tag == .linux) - system.cpu_set_t -else if (builtin.os.tag == .freebsd) - freebsd.cpuset_t -else - u32; +pub const cpu_set_t = system.cpu_set_t; pub const dev_t = system.dev_t; pub const dl_phdr_info = system.dl_phdr_info; pub const empty_sigset = system.empty_sigset; @@ -5492,27 +5487,13 @@ pub const SchedGetAffinityError = error{PermissionDenied} || UnexpectedError; pub fn sched_getaffinity(pid: pid_t) SchedGetAffinityError!cpu_set_t { var set: cpu_set_t = undefined; - if (builtin.os.tag == .linux) { - switch (errno(system.sched_getaffinity(pid, @sizeOf(cpu_set_t), &set))) { - .SUCCESS => return set, - .FAULT => unreachable, - .INVAL => unreachable, - .SRCH => unreachable, - .PERM => return error.PermissionDenied, - else => |err| return unexpectedErrno(err), - } - } else if (builtin.os.tag == .freebsd) { - switch (errno(freebsd.cpuset_getaffinity(freebsd.CPU_LEVEL_WHICH, freebsd.CPU_WHICH_PID, pid, @sizeOf(cpu_set_t), &set))) { - .SUCCESS => return set, - .FAULT => unreachable, - .INVAL => unreachable, - .SRCH => unreachable, - .EDEADLK => unreachable, - .PERM => return error.PermissionDenied, - else => |err| return unexpectedErrno(err), - } - } else { - @compileError("unsupported platform"); + switch (errno(system.sched_getaffinity(pid, @sizeOf(cpu_set_t), &set))) { + .SUCCESS => return set, + .FAULT => unreachable, + .INVAL => unreachable, + .SRCH => unreachable, + .PERM => return error.PermissionDenied, + else => |err| return unexpectedErrno(err), } }