| author |  Andrew Kelley <andrew@ziglang.org> 2020-11-10 18:06:30-05:00 |
| committer |  GitHub <noreply@github.com> 2020-11-10 18:06:30-05:00 |
| log | 8b9195282e99427964119431b6f4e535eeb4d9ba |
| tree | e15e615790822e0c925ae8eaaf686d9f808892f9 |
| parent | 6904cd828edb34217cd4d54e8f6fe5bb91cb4858 |
| parent | 678bd4fc8919d0683435712fbf256c3fbd4821f9 |
| signature | Signed by PGP key 4AEE18F83AFDEB23 |
Merge pull request #7044 from semarie/openbsd-simples
Simple sets of commits for OpenBSD support3 files changed, 78 insertions(+), 4 deletions(-)
lib
std
lib/std/os/bits/openbsd.zig+62-1
| ... | ... | @@ -32,6 +32,24 @@ pub const Kevent = extern struct { |
| 32 | 32 | udata: usize, |
| 33 | 33 | }; |
| 34 | 34 | |
| 35 | // Modes and flags for dlopen() | |
| 36 | // include/dlfcn.h | |
| 37 | ||
| 38 | /// Bind function calls lazily. | |
| 39 | pub const RTLD_LAZY = 1; | |
| 40 | ||
| 41 | /// Bind function calls immediately. | |
| 42 | pub const RTLD_NOW = 2; | |
| 43 | ||
| 44 | /// Make symbols globally available. | |
| 45 | pub const RTLD_GLOBAL = 0x100; | |
| 46 | ||
| 47 | /// Opposite of RTLD_GLOBAL, and the default. | |
| 48 | pub const RTLD_LOCAL = 0x000; | |
| 49 | ||
| 50 | /// Trace loaded objects and exit. | |
| 51 | pub const RTLD_TRACE = 0x200; | |
| 52 | ||
| 35 | 53 | pub const dl_phdr_info = extern struct { |
| 36 | 54 | dlpi_addr: std.elf.Addr, |
| 37 | 55 | dlpi_name: ?[*:0]const u8, |
| ... | ... | @@ -185,7 +203,17 @@ pub const libc_stat = extern struct { |
| 185 | 203 | |
| 186 | 204 | pub const timespec = extern struct { |
| 187 | 205 | tv_sec: time_t, |
| 188 | tv_nsec: isize, | |
| 206 | tv_nsec: c_long, | |
| 207 | }; | |
| 208 | ||
| 209 | pub const timeval = extern struct { | |
| 210 | tv_sec: time_t, | |
| 211 | tv_usec: c_long, | |
| 212 | }; | |
| 213 | ||
| 214 | pub const timezone = extern struct { | |
| 215 | tz_minuteswest: c_int, | |
| 216 | tz_dsttime: c_int, | |
| 189 | 217 | }; |
| 190 | 218 | |
| 191 | 219 | pub const MAXNAMLEN = 255; |
| ... | ... | @@ -264,10 +292,13 @@ pub const AI_ADDRCONFIG = 64; |
| 264 | 292 | |
| 265 | 293 | pub const CTL_KERN = 1; |
| 266 | 294 | pub const CTL_DEBUG = 5; |
| 295 | pub const CTL_HW = 6; | |
| 267 | 296 | |
| 268 | 297 | pub const KERN_PROC_ARGS = 55; |
| 269 | 298 | pub const KERN_PROC_ARGV = 1; |
| 270 | 299 | |
| 300 | pub const HW_NCPUONLINE = 25; | |
| 301 | ||
| 271 | 302 | pub const PATH_MAX = 1024; |
| 272 | 303 | |
| 273 | 304 | pub const STDIN_FILENO = 0; |
| ... | ... | @@ -450,6 +481,36 @@ pub const SOCK_SEQPACKET = 5; |
| 450 | 481 | pub const SOCK_CLOEXEC = 0x8000; |
| 451 | 482 | pub const SOCK_NONBLOCK = 0x4000; |
| 452 | 483 | |
| 484 | pub const SO_DEBUG = 0x0001; | |
| 485 | pub const SO_ACCEPTCONN = 0x0002; | |
| 486 | pub const SO_REUSEADDR = 0x0004; | |
| 487 | pub const SO_KEEPALIVE = 0x0008; | |
| 488 | pub const SO_DONTROUTE = 0x0010; | |
| 489 | pub const SO_BROADCAST = 0x0020; | |
| 490 | pub const SO_USELOOPBACK = 0x0040; | |
| 491 | pub const SO_LINGER = 0x0080; | |
| 492 | pub const SO_OOBINLINE = 0x0100; | |
| 493 | pub const SO_REUSEPORT = 0x0200; | |
| 494 | pub const SO_TIMESTAMP = 0x0800; | |
| 495 | pub const SO_BINDANY = 0x1000; | |
| 496 | pub const SO_ZEROIZE = 0x2000; | |
| 497 | pub const SO_SNDBUF = 0x1001; | |
| 498 | pub const SO_RCVBUF = 0x1002; | |
| 499 | pub const SO_SNDLOWAT = 0x1003; | |
| 500 | pub const SO_RCVLOWAT = 0x1004; | |
| 501 | pub const SO_SNDTIMEO = 0x1005; | |
| 502 | pub const SO_RCVTIMEO = 0x1006; | |
| 503 | pub const SO_ERROR = 0x1007; | |
| 504 | pub const SO_TYPE = 0x1008; | |
| 505 | pub const SO_NETPROC = 0x1020; | |
| 506 | pub const SO_RTABLE = 0x1021; | |
| 507 | pub const SO_PEERCRED = 0x1022; | |
| 508 | pub const SO_SPLICE = 0x1023; | |
| 509 | pub const SO_DOMAIN = 0x1024; | |
| 510 | pub const SO_PROTOCOL = 0x1025; | |
| 511 | ||
| 512 | pub const SOL_SOCKET = 0xffff; | |
| 513 | ||
| 453 | 514 | pub const PF_UNSPEC = AF_UNSPEC; |
| 454 | 515 | pub const PF_LOCAL = AF_LOCAL; |
| 455 | 516 | pub const PF_UNIX = AF_UNIX; |
lib/std/reset_event.zig+6-3
| ... | ... | @@ -109,9 +109,12 @@ const PosixEvent = struct { |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | fn deinit(self: *PosixEvent) void { |
| 112 | // on dragonfly, *destroy() functions can return EINVAL | |
| 112 | // on dragonfly or openbsd, *destroy() functions can return EINVAL | |
| 113 | 113 | // for statically initialized pthread structures |
| 114 | const err = if (builtin.os.tag == .dragonfly) os.EINVAL else 0; | |
| 114 | const err = if (builtin.os.tag == .dragonfly or builtin.os.tag == .openbsd) | |
| 115 | os.EINVAL | |
| 116 | else | |
| 117 | 0; | |
| 115 | 118 | |
| 116 | 119 | const retm = c.pthread_mutex_destroy(&self.mutex); |
| 117 | 120 | assert(retm == 0 or retm == err); |
| ... | ... | @@ -447,7 +450,7 @@ test "ResetEvent" { |
| 447 | 450 | fn timedWaiter(self: *Self) !void { |
| 448 | 451 | self.in.wait(); |
| 449 | 452 | testing.expectError(error.TimedOut, self.out.timedWait(time.ns_per_us)); |
| 450 | try self.out.timedWait(time.ns_per_ms * 10); | |
| 453 | try self.out.timedWait(time.ns_per_ms * 100); | |
| 451 | 454 | testing.expect(self.value == 5); |
| 452 | 455 | } |
| 453 | 456 | }; |
lib/std/thread.zig+10
| ... | ... | @@ -491,6 +491,16 @@ pub const Thread = struct { |
| 491 | 491 | if (std.Target.current.os.tag == .windows) { |
| 492 | 492 | return os.windows.peb().NumberOfProcessors; |
| 493 | 493 | } |
| 494 | if (std.Target.current.os.tag == .openbsd) { | |
| 495 | var count: c_int = undefined; | |
| 496 | var count_size: usize = @sizeOf(c_int); | |
| 497 | const mib = [_]c_int{ os.CTL_HW, os.HW_NCPUONLINE }; | |
| 498 | os.sysctl(&mib, &count, &count_size, null, 0) catch |err| switch (err) { | |
| 499 | error.NameTooLong, error.UnknownName => unreachable, | |
| 500 | else => |e| return e, | |
| 501 | }; | |
| 502 | return @intCast(usize, count); | |
| 503 | } | |
| 494 | 504 | var count: c_int = undefined; |
| 495 | 505 | var count_len: usize = @sizeOf(c_int); |
| 496 | 506 | const name = if (comptime std.Target.current.isDarwin()) "hw.logicalcpu" else "hw.ncpu"; |