Merge branch 'bytecodealliance:main' into bind_device

Author: al8n

.github/workflows/main.yml

@@ -56,6 +56,7 @@ jobs:
         cargo update --package=half --precise=2.2.1
         cargo update --package=flate2 --precise=1.0.35
         cargo update --package=textwrap --precise=0.16.1
+        cargo update --package=once_cell --precise=1.20.3
 
     - run: >
         rustup target add
@@ -221,18 +222,20 @@ jobs:
     - run: cargo check -Z build-std --target armv7-unknown-freebsd --all-targets --features=all-apis
     - run: cargo check -Z build-std --target aarch64-unknown-linux-gnu_ilp32 --all-targets --features=all-apis
     - run: cargo check -Z build-std --target x86_64-unknown-haiku --all-targets --features=all-apis
-    - run: cargo check -Z build-std --target x86_64-uwp-windows-msvc --all-targets --features=all-apis
+    # Temporarily disable due to build errors on nightly.
+    # - run: cargo check -Z build-std --target x86_64-uwp-windows-msvc --all-targets --features=all-apis
     - run: cargo check -Z build-std --target=riscv32imc-esp-espidf --features=all-apis
     - run: cargo check -Z build-std --target=aarch64-unknown-nto-qnx710 --features=all-apis
     - run: cargo check -Z build-std --target=x86_64-pc-nto-qnx710 --features=all-apis
     - run: cargo check -Z build-std --target=armv6k-nintendo-3ds --all-features
-    # Temporarily disable armv7-sony-vita-newlibeabihf, as it gets build errors.
-    # - run: cargo check -Z build-std --target=armv7-sony-vita-newlibeabihf --features=all-apis
-    - run: cargo check -Z build-std --target=powerpc64-ibm-aix --features=all-apis
+    - run: cargo check -Z build-std --target=armv7-sony-vita-newlibeabihf --features=all-apis
+    # Temporarily disable due to build errors on nightly.
+    # - run: cargo check -Z build-std --target=powerpc64-ibm-aix --features=all-apis
     - run: cargo check -Z build-std --target=mipsel-unknown-linux-gnu --features=all-apis
     - run: cargo check -Z build-std --target=mips64el-unknown-linux-gnuabi64 --features=all-apis
     - run: cargo check -Z build-std --target=powerpc-unknown-linux-musl --features=all-apis
     - run: cargo check -Z build-std --target=powerpc64le-unknown-linux-musl --features=all-apis
+    - run: cargo check -Z build-std --target=armv7k-apple-watchos --features=all-apis
 
 
   test:
@@ -244,13 +247,13 @@ jobs:
       RUSTFLAGS: --cfg rustix_use_experimental_features
     strategy:
       matrix:
-        build: [ubuntu, ubuntu-20.04, i686-linux, aarch64-linux, powerpc-linux, powerpc64le-linux, riscv64-linux, s390x-linux, arm-linux, ubuntu-stable, i686-linux-stable, aarch64-linux-stable, riscv64-linux-stable, s390x-linux-stable, powerpc-linux-stable, powerpc64le-linux-stable, arm-linux-stable, ubuntu-1.63, i686-linux-1.63, aarch64-linux-1.63, riscv64-linux-1.63, s390x-linux-1.63, powerpc64le-linux, powerpc64le-linux-1.63, arm-linux-1.63, macos-latest, macos-13, windows, windows-2019, musl]
+        build: [ubuntu, ubuntu-22.04, i686-linux, aarch64-linux, powerpc-linux, powerpc64le-linux, riscv64-linux, s390x-linux, arm-linux, ubuntu-stable, i686-linux-stable, aarch64-linux-stable, riscv64-linux-stable, s390x-linux-stable, powerpc-linux-stable, powerpc64le-linux-stable, arm-linux-stable, ubuntu-1.63, i686-linux-1.63, aarch64-linux-1.63, riscv64-linux-1.63, s390x-linux-1.63, powerpc64le-linux, powerpc64le-linux-1.63, arm-linux-1.63, macos-latest, macos-13, windows, windows-2019, musl]
         include:
           - build: ubuntu
             os: ubuntu-latest
             rust: nightly
-          - build: ubuntu-20.04
-            os: ubuntu-20.04
+          - build: ubuntu-22.04
+            os: ubuntu-22.04
             rust: nightly
           - build: i686-linux
             os: ubuntu-latest
@@ -533,6 +536,7 @@ jobs:
         cargo update --package=half --precise=2.2.1
         cargo update --package=flate2 --precise=1.0.35
         cargo update --package=textwrap --precise=0.16.1
+        cargo update --package=once_cell --precise=1.20.3
 
     - run: |
         cargo test --verbose --features=all-apis --release --workspace -- --nocapture

CHANGES.md

@@ -14,8 +14,8 @@ cargo test --features=all-apis
 ```
 
 And, rustix has two backends, linux_raw and libc, and only one is used in
-any given build. To test with the libc backend explicitly, additionally
-enable the `use-libc` feature:
+any given build. To test on Linux with the libc backend explicitly,
+additionally enable the `use-libc` feature:
 
 ```console
 cargo test --features=all-apis,use-libc

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 [package]
 name = "rustix"
-version = "1.0.1"
+version = "1.0.6"
 authors = [
     "Dan Gohman <dev@sunfishcode.online>",
     "Jakub Konka <kubkon@jakubkonka.com>",
@@ -32,15 +32,15 @@ compiler_builtins = { version = '0.1.49', optional = true }
 [target.'cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", any(target_endian = "little", any(target_arch = "s390x", target_arch = "powerpc")), any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc"), all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "s390x"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))'.dependencies]
 linux-raw-sys = { version = "0.9.2", default-features = false, features = ["general", "errno", "ioctl", "no_std", "elf"] }
 libc_errno = { package = "errno", version = "0.3.10", default-features = false, optional = true }
-libc = { version = "0.2.168", default-features = false, optional = true }
+libc = { version = "0.2.171", default-features = false, optional = true }
 
 # Dependencies for platforms where only libc is supported:
 #
 # On all other Unix-family platforms, and under Miri, we always use the libc
 # backend, so enable its dependencies unconditionally.
 [target.'cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", any(target_endian = "little", any(target_arch = "s390x", target_arch = "powerpc")), any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc"), all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "s390x"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))'.dependencies]
 libc_errno = { package = "errno", version = "0.3.10", default-features = false }
-libc = { version = "0.2.168", default-features = false }
+libc = { version = "0.2.171", default-features = false }
 
 # Additional dependencies for Linux with the libc backend:
 #
@@ -66,7 +66,7 @@ default-features = false
 
 [dev-dependencies]
 tempfile = "3.5.0"
-libc = "0.2.168"
+libc = "0.2.171"
 libc_errno = { package = "errno", version = "0.3.10", default-features = false }
 serial_test = "2.0.0"
 memoffset = "0.9.0"
@@ -269,4 +269,5 @@ check-cfg = [
     'cfg(wasi_ext)',
     'cfg(wasip2)',
     'cfg(target_arch, values("xtensa"))',
+    'cfg(target_os, values("cygwin"))',
 ]

Cargo.toml

@@ -52,9 +52,9 @@ building.
 
 ## Cargo features
 
-The modules [`rustix::io`], [`rustix::fd`], [`rustix::ffi`], and
-[`rustix::ioctl`] are enabled by default. The rest of the API modules are
-conditional with cargo feature flags.
+The modules [`rustix::io`], [`rustix::buffer`], [`rustix::fd`],
+[`rustix::ffi`], and [`rustix::ioctl`] are enabled by default. The rest of the
+API modules are conditional with cargo feature flags.
 
 | Name       | Description                                                    |
 | ---------- | -------------------------------------------------------------- |
@@ -88,6 +88,7 @@ conditional with cargo feature flags.
 | `std`      | On by default; disable to activate `#![no_std]`.               |
 | `alloc`    | On by default; enables features that depend on [`alloc`].      |
 
+[`rustix::buffer`]: https://docs.rs/rustix/*/rustix/buffer/index.html
 [`rustix::event`]: https://docs.rs/rustix/*/rustix/event/index.html
 [`rustix::fs`]: https://docs.rs/rustix/*/rustix/fs/index.html
 [`rustix::io_uring`]: https://docs.rs/rustix/*/rustix/io_uring/index.html

README.md

@@ -159,6 +159,7 @@ fn main() {
             || (arch == "aarch64" && os == "linux" && abi == Ok("ilp32".to_string())))
         && (apple
             || os == "android"
+            || (os == "freebsd" && arch == "x86")
             || os == "haiku"
             || env == "gnu"
             || (env == "musl" && arch == "x86")

build.rs

@@ -50,31 +50,62 @@ fn main() -> rustix::io::Result<()> {
         println!("Stack Limit: {:?}", getrlimit(Resource::Stack));
         #[cfg(not(target_os = "haiku"))]
         println!("Core Limit: {:?}", getrlimit(Resource::Core));
-        #[cfg(not(any(solarish, target_os = "haiku")))]
+        #[cfg(not(any(solarish, target_os = "cygwin", target_os = "haiku")))]
         println!("Rss Limit: {:?}", getrlimit(Resource::Rss));
-        #[cfg(not(any(solarish, target_os = "haiku")))]
+        #[cfg(not(any(solarish, target_os = "cygwin", target_os = "haiku")))]
         println!("Nproc Limit: {:?}", getrlimit(Resource::Nproc));
         #[cfg(not(target_os = "solaris"))]
         println!("Nofile Limit: {:?}", getrlimit(Resource::Nofile));
-        #[cfg(not(any(solarish, target_os = "aix", target_os = "haiku")))]
+        #[cfg(not(any(solarish, target_os = "aix", target_os = "cygwin", target_os = "haiku")))]
         println!("Memlock Limit: {:?}", getrlimit(Resource::Memlock));
         #[cfg(not(target_os = "openbsd"))]
         println!("As Limit: {:?}", getrlimit(Resource::As));
-        #[cfg(not(any(bsd, solarish, target_os = "aix", target_os = "haiku")))]
+        #[cfg(not(any(
+            bsd,
+            solarish,
+            target_os = "aix",
+            target_os = "cygwin",
+            target_os = "haiku",
+        )))]
         println!("Locks Limit: {:?}", getrlimit(Resource::Locks));
-        #[cfg(not(any(bsd, solarish, target_os = "aix", target_os = "haiku")))]
+        #[cfg(not(any(
+            bsd,
+            solarish,
+            target_os = "aix",
+            target_os = "cygwin",
+            target_os = "haiku",
+        )))]
         println!("Sigpending Limit: {:?}", getrlimit(Resource::Sigpending));
-        #[cfg(not(any(bsd, solarish, target_os = "aix", target_os = "haiku")))]
+        #[cfg(not(any(
+            bsd,
+            solarish,
+            target_os = "aix",
+            target_os = "cygwin",
+            target_os = "haiku",
+        )))]
         println!("Msgqueue Limit: {:?}", getrlimit(Resource::Msgqueue));
-        #[cfg(not(any(bsd, solarish, target_os = "aix", target_os = "haiku")))]
+        #[cfg(not(any(
+            bsd,
+            solarish,
+            target_os = "aix",
+            target_os = "cygwin",
+            target_os = "haiku",
+        )))]
         println!("Nice Limit: {:?}", getrlimit(Resource::Nice));
-        #[cfg(not(any(bsd, solarish, target_os = "aix", target_os = "haiku")))]
+        #[cfg(not(any(
+            bsd,
+            solarish,
+            target_os = "aix",
+            target_os = "cygwin",
+            target_os = "haiku",
+        )))]
         println!("Rtprio Limit: {:?}", getrlimit(Resource::Rtprio));
         #[cfg(not(any(
             bsd,
             solarish,
             target_os = "aix",
             target_os = "android",
+            target_os = "cygwin",
             target_os = "emscripten",
             target_os = "haiku",
         )))]

examples/process.rs

@@ -258,7 +258,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
             if term.local_modes.contains(LocalModes::ECHOCTL) {
                 print!(" ECHOCTL");
             }
-            #[cfg(not(any(target_os = "redox")))]
+            #[cfg(not(any(target_os = "cygwin", target_os = "redox")))]
             if term.local_modes.contains(LocalModes::ECHOPRT) {
                 print!(" ECHOPRT");
             }
@@ -276,7 +276,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
             if term.local_modes.contains(LocalModes::TOSTOP) {
                 print!(" TOSTOP");
             }
-            #[cfg(not(any(target_os = "redox")))]
+            #[cfg(not(any(target_os = "cygwin", target_os = "redox")))]
             if term.local_modes.contains(LocalModes::PENDIN) {
                 print!(" PENDIN");
             }

examples/stdio.rs

@@ -518,3 +518,70 @@ pub(crate) use __fsid_t as fsid_t;
 #[cfg(feature = "mm")]
 #[cfg(target_os = "android")]
 pub(crate) const MAP_DROPPABLE: c_int = bitcast!(linux_raw_sys::general::MAP_DROPPABLE);
+
+// FreeBSD added `timerfd_*` in FreeBSD 14. NetBSD added then in NetBSD 10.
+#[cfg(all(feature = "time", any(target_os = "freebsd", target_os = "netbsd")))]
+syscall!(pub(crate) fn timerfd_create(
+    clockid: c_int,
+    flags: c_int
+) via SYS_timerfd_create -> c_int);
+#[cfg(all(feature = "time", any(target_os = "freebsd", target_os = "netbsd")))]
+syscall!(pub(crate) fn timerfd_gettime(
+    fd: c_int,
+    curr_value: *mut itimerspec
+) via SYS_timerfd_gettime -> c_int);
+#[cfg(all(feature = "time", any(target_os = "freebsd", target_os = "netbsd")))]
+syscall!(pub(crate) fn timerfd_settime(
+    fd: c_int,
+    flags: c_int,
+    new_value: *const itimerspec,
+    old_value: *mut itimerspec
+) via SYS_timerfd_settime -> c_int);
+
+#[cfg(all(feature = "time", target_os = "illumos"))]
+extern "C" {
+    pub(crate) fn timerfd_create(clockid: c_int, flags: c_int) -> c_int;
+    pub(crate) fn timerfd_gettime(fd: c_int, curr_value: *mut itimerspec) -> c_int;
+    pub(crate) fn timerfd_settime(
+        fd: c_int,
+        flags: c_int,
+        new_value: *const itimerspec,
+        old_value: *mut itimerspec,
+    ) -> c_int;
+}
+
+// illumos and NetBSD timerfd support.
+// Submitted upstream in <https://github.com/rust-lang/libc/pull/4333>.
+
+// <https://code.illumos.org/plugins/gitiles/illumos-gate/+/refs/heads/master/usr/src/uts/common/sys/timerfd.h#34>
+#[cfg(all(feature = "time", target_os = "illumos"))]
+pub(crate) const TFD_CLOEXEC: i32 = 0o2000000;
+#[cfg(all(feature = "time", target_os = "illumos"))]
+pub(crate) const TFD_NONBLOCK: i32 = 0o4000;
+#[cfg(all(feature = "time", target_os = "illumos"))]
+pub(crate) const TFD_TIMER_ABSTIME: i32 = 1 << 0;
+#[cfg(all(feature = "time", target_os = "illumos"))]
+pub(crate) const TFD_TIMER_CANCEL_ON_SET: i32 = 1 << 1;
+
+// <https://nxr.netbsd.org/xref/src/sys/sys/timerfd.h#44>
+#[cfg(all(feature = "time", target_os = "netbsd"))]
+pub(crate) const TFD_CLOEXEC: i32 = O_CLOEXEC;
+#[cfg(all(feature = "time", target_os = "netbsd"))]
+pub(crate) const TFD_NONBLOCK: i32 = O_NONBLOCK;
+#[cfg(all(feature = "time", target_os = "netbsd"))]
+pub(crate) const TFD_TIMER_ABSTIME: i32 = O_WRONLY;
+#[cfg(all(feature = "time", target_os = "netbsd"))]
+pub(crate) const TFD_TIMER_CANCEL_ON_SET: i32 = O_RDWR;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[cfg(linux_kernel)]
+    fn test_flags() {
+        // libc may publicly define `O_LARGEFILE` to 0, but we want the real
+        // non-zero value.
+        assert_ne!(O_LARGEFILE, 0);
+    }
+}

src/backend/libc/c.rs

@@ -66,7 +66,6 @@ bitflags! {
         const WAKEUP = bitcast!(c::EPOLLWAKEUP);
 
         /// `EPOLLEXCLUSIVE`
-        #[cfg(not(target_os = "android"))]
         const EXCLUSIVE = bitcast!(c::EPOLLEXCLUSIVE);
 
         /// <https://docs.rs/bitflags/*/bitflags/#externally-defined-flags>

src/backend/libc/event/epoll.rs

@@ -6,6 +6,8 @@ use crate::backend::conv::ret;
 use crate::backend::conv::ret_c_int;
 #[cfg(any(linux_kernel, target_os = "illumos", target_os = "redox"))]
 use crate::backend::conv::ret_u32;
+#[cfg(bsd)]
+use crate::event::kqueue::Event;
 #[cfg(solarish)]
 use crate::event::port::Event;
 #[cfg(any(
@@ -47,8 +49,6 @@ use {crate::backend::conv::borrowed_fd, crate::fd::BorrowedFd};
     target_os = "redox"
 ))]
 use {crate::backend::conv::ret_owned_fd, crate::fd::OwnedFd};
-#[cfg(bsd)]
-use {crate::event::kqueue::Event, crate::utils::as_ptr};
 
 #[cfg(any(
     linux_kernel,
@@ -96,8 +96,28 @@ pub(crate) unsafe fn kevent(
     kq: BorrowedFd<'_>,
     changelist: &[Event],
     eventlist: (*mut Event, usize),
-    timeout: Option<&c::timespec>,
+    timeout: Option<&Timespec>,
 ) -> io::Result<c::c_int> {
+    // If we don't have to fix y2038 on this platform, `Timespec` is the same
+    // as `c::timespec` and it's easy.
+    #[cfg(not(fix_y2038))]
+    let timeout = crate::timespec::option_as_libc_timespec_ptr(timeout);
+
+    // If we do have to fix y2038 on this platform, convert to `c::timespec`.
+    #[cfg(fix_y2038)]
+    let converted_timeout;
+    #[cfg(fix_y2038)]
+    let timeout = match timeout {
+        None => null(),
+        Some(timeout) => {
+            converted_timeout = c::timespec {
+                tv_sec: timeout.tv_sec.try_into().map_err(|_| io::Errno::OVERFLOW)?,
+                tv_nsec: timeout.tv_nsec as _,
+            };
+            &converted_timeout
+        }
+    };
+
     ret_c_int(c::kevent(
         borrowed_fd(kq),
         changelist.as_ptr().cast(),
@@ -107,7 +127,7 @@ pub(crate) unsafe fn kevent(
             .map_err(|_| io::Errno::OVERFLOW)?,
         eventlist.0.cast(),
         eventlist.1.try_into().map_err(|_| io::Errno::OVERFLOW)?,
-        timeout.map_or(null(), as_ptr),
+        timeout,
     ))
 }
 
@@ -229,7 +249,7 @@ pub(crate) unsafe fn select(
         Some(timeout) => {
             // Convert from `Timespec` to `c::timeval`.
             timeout_data = c::timeval {
-                tv_sec: timeout.tv_sec.try_into().map_err(|_| io::Errno::OVERFLOW)?,
+                tv_sec: timeout.tv_sec.try_into().map_err(|_| io::Errno::INVAL)?,
                 tv_usec: ((timeout.tv_nsec + 999) / 1000) as _,
             };
             &timeout_data
@@ -306,7 +326,7 @@ pub(crate) unsafe fn select(
         Some(timeout) => {
             // Convert from `Timespec` to `c::timeval`.
             timeout_data = c::timeval {
-                tv_sec: timeout.tv_sec.try_into().map_err(|_| io::Errno::OVERFLOW)?,
+                tv_sec: timeout.tv_sec.try_into().map_err(|_| io::Errno::INVAL)?,
                 tv_usec: ((timeout.tv_nsec + 999) / 1000) as _,
             };
             &timeout_data