From 4dbb0a4ffa104093117f6f9aae1dd596a98694be Mon Sep 17 00:00:00 2001 From: pin Date: Sat, 14 Sep 2024 06:29:46 +0200 Subject: [PATCH 1/3] Add CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID constants --- libc-test/semver/netbsd.txt | 2 ++ src/unix/bsd/netbsdlike/netbsd/mod.rs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libc-test/semver/netbsd.txt b/libc-test/semver/netbsd.txt index 838f28f71b5d1..0f27534cddc9b 100644 --- a/libc-test/semver/netbsd.txt +++ b/libc-test/semver/netbsd.txt @@ -136,6 +136,8 @@ CLD_EXITED CLD_KILLED CLD_STOPPED CLD_TRAPPED +CLOCK_PROCESS_CPUTIME_ID +CLOCK_THREAD_CPUTIME_ID CMSG_DATA CMSG_FIRSTHDR CMSG_LEN diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index f919b73e5c2f4..6129cba008714 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -1873,6 +1873,8 @@ pub const MNT_NOWAIT: ::c_int = 2; pub const MNT_LAZY: ::c_int = 3; // +pub const CLOCK_PROCESS_CPUTIME_ID: ::clockid_t = 2; +pub const CLOCK_THREAD_CPUTIME_ID: ::clockid_t = 4; pub const NTP_API: ::c_int = 4; pub const MAXPHASE: ::c_long = 500000000; pub const MAXFREQ: ::c_long = 500000; From 11e5223a72088aa100a7471197b509256113547e Mon Sep 17 00:00:00 2001 From: pin Date: Sun, 15 Sep 2024 09:58:15 +0200 Subject: [PATCH 2/3] NetBSD has sysctlnametomib, add this --- libc-test/semver/netbsd.txt | 3 +-- src/unix/bsd/netbsdlike/netbsd/mod.rs | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libc-test/semver/netbsd.txt b/libc-test/semver/netbsd.txt index 0f27534cddc9b..65f234b0dc092 100644 --- a/libc-test/semver/netbsd.txt +++ b/libc-test/semver/netbsd.txt @@ -136,8 +136,6 @@ CLD_EXITED CLD_KILLED CLD_STOPPED CLD_TRAPPED -CLOCK_PROCESS_CPUTIME_ID -CLOCK_THREAD_CPUTIME_ID CMSG_DATA CMSG_FIRSTHDR CMSG_LEN @@ -1569,6 +1567,7 @@ sync syscall sysctl sysctlbyname +sysctlnametomib sysctldesc tcp_info telldir diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index 6129cba008714..fb8c197ef88d1 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -1873,8 +1873,6 @@ pub const MNT_NOWAIT: ::c_int = 2; pub const MNT_LAZY: ::c_int = 3; // -pub const CLOCK_PROCESS_CPUTIME_ID: ::clockid_t = 2; -pub const CLOCK_THREAD_CPUTIME_ID: ::clockid_t = 4; pub const NTP_API: ::c_int = 4; pub const MAXPHASE: ::c_long = 500000000; pub const MAXFREQ: ::c_long = 500000; @@ -2648,6 +2646,11 @@ extern "C" { newp: *const ::c_void, newlen: ::size_t, ) -> ::c_int; + pub fn sysctlnametomib( + name: *const ::c_char, + mibp: *mut ::c_int, + sizep: *mut ::size_t, + ) -> ::c_int; #[link_name = "__kevent50"] pub fn kevent( kq: ::c_int, From 41c883076cb57f87bcb75afa24cb0328d2483e5d Mon Sep 17 00:00:00 2001 From: pin Date: Sun, 15 Sep 2024 10:07:10 +0200 Subject: [PATCH 3/3] Satisfy CI --- src/unix/bsd/netbsdlike/netbsd/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index fb8c197ef88d1..2b5e9c9bfda35 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -2647,9 +2647,9 @@ extern "C" { newlen: ::size_t, ) -> ::c_int; pub fn sysctlnametomib( - name: *const ::c_char, - mibp: *mut ::c_int, - sizep: *mut ::size_t, + name: *const ::c_char, + mibp: *mut ::c_int, + sizep: *mut ::size_t, ) -> ::c_int; #[link_name = "__kevent50"] pub fn kevent(