Add support for QNX Neutrino 7.1 #2055

flba-eb · 2023-06-16T13:03:19Z

This adds support for QNX Neutrino 7.1.

README.md

src/errno.rs

asomers · 2023-07-17T22:30:14Z

src/fcntl.rs

@@ -297,12 +304,12 @@ fn readlink_maybe_at<P: ?Sized + NixPath>(
                cstr.as_ptr(),
                v.as_mut_ptr() as *mut c_char,
                v.capacity() as size_t,
-            ),
+            ) as _,


as _ can mask a wide range of type errors. Could you please not do that?

Unfortunately, readlink returns an int on QNX Neutrino. Any suggestion on how to resolve this (maybe one that is also applicable to src/sys/select.rs, see https://github.com/nix-rust/nix/pull/2055/files#r1265967722)?

One possibility (similar to the existing redox handling could be):

path.with_nix_path(|cstr| unsafe { match dirfd { #[cfg(target_os = "redox")] Some(_) => unreachable!(), #[cfg(target_os = "nto")] Some(dirfd) => libc::readlinkat( dirfd, cstr.as_ptr(), v.as_mut_ptr() as *mut c_char, v.capacity() as size_t, ) as libc::ssize_t, #[cfg(not(any(target_os = "redox", target_os = "nto")))] Some(dirfd) => libc::readlinkat( dirfd, cstr.as_ptr(), v.as_mut_ptr() as *mut c_char, v.capacity() as size_t, ), None => libc::readlink( cstr.as_ptr(), v.as_mut_ptr() as *mut c_char, v.capacity(), ), } })

But this makes the code a bit hard to read. Would a small OS specific wrapper function help? This could look like this diff against master:

diff --git a/src/fcntl.rs b/src/fcntl.rs index d799ff3..0104bec 100644 --- a/src/fcntl.rs +++ b/src/fcntl.rs @@ -282,6 +289,26 @@ fn wrap_readlink_result(mut v: Vec<u8>, len: ssize_t) -> Result<OsString> { Ok(OsString::from_vec(v.to_vec())) } +#[cfg(target_os = "nto")] +#[inline(always)] +unsafe fn readlinkat_wrapper(dirfd: c_int, + pathname: *const c_char, + buf: *mut c_char, + bufsiz: size_t) -> ssize_t +{ + libc::readlinkat(dirfd, pathname, buf, bufsiz) as ssize_t +} + +#[cfg(not(target_os = "nto"))] +#[inline(always)] +unsafe fn readlinkat_wrapper(dirfd: c_int, + pathname: *const c_char, + buf: *mut c_char, + bufsiz: size_t) -> ssize_t +{ + libc::readlinkat(dirfd, pathname, buf, bufsiz) +} + fn readlink_maybe_at<P: ?Sized + NixPath>( dirfd: Option<RawFd>, path: &P, @@ -292,7 +319,7 @@ fn readlink_maybe_at<P: ?Sized + NixPath>( #[cfg(target_os = "redox")] Some(_) => unreachable!(), #[cfg(not(target_os = "redox"))] - Some(dirfd) => libc::readlinkat( + Some(dirfd) => readlinkat_wrapper( dirfd, cstr.as_ptr(), v.as_mut_ptr() as *mut c_char,

Either of those options would work, but I kind of like the first one better.

Should be fixed, please check.

src/sys/resource.rs

asomers · 2023-07-17T22:36:45Z

src/sys/select.rs

+    let res = match timeout {
+        Some(t) => {
+            let mut timeout = t.clone();
+            unsafe {libc::pselect(nfds, readfds, writefds, errorfds, timeout.as_mut() as *mut libc::timespec, sigmask)}


This looks like a bug in Neutrino. POSIX says that the timeout argument should be const. Frankly, given how complicated this makes Nix's code, I don't think it's worth it for the benefit this provides. I would rather just not bind pselect on this platform.

As also described in my previous comment, there are API differences that I'm trying to work around as I cannot change the libc API. Would a small wrapper function help (see other comment)?

We could make it work, but it would definitely ugly-up the code. And this const-mut conversion is worse than the size widening of readlink. Do we know that there are even any QNX users who want to use pselect?

@AkhilTThomas what do you think about removing pselect or do you know if it is used?

AkhilTThomas · 2024-03-27T23:36:54Z

@flba-eb Hey! Is this PR stuck? would like to have nto support for nix.

SteveLauC · 2024-03-30T13:26:54Z

Hi @AkhilTThomas, please see this comment: tokio-rs/tokio#6421 (comment)

AkhilTThomas · 2024-03-30T14:05:44Z

Hi @AkhilTThomas, please see this comment: tokio-rs/tokio#6421 (comment)

Awesome thanks!

flba-eb · 2024-03-30T17:00:50Z

@flba-eb Hey! Is this PR stuck? would like to have nto support for nix.

Adding QNX support to nix is still on my wish-list -- but I'm currently not needing nix in my projects, which is why it didn't get much attention.
I will have more time after the Embedded World (in about two weeks) and can continue, but feel free to "take over" this PR. Maybe it makes sense to fix this together?

AkhilTThomas · 2024-03-31T09:45:11Z

@flba-eb Hey! Is this PR stuck? would like to have nto support for nix.

Adding QNX support to nix is still on my wish-list -- but I'm currently not needing nix in my projects, which is why it didn't get much attention. I will have more time after the Embedded World (in about two weeks) and can continue, but feel free to "take over" this PR. Maybe it makes sense to fix this together?

That would be great! I will contact you over email.

flba-eb · 2024-03-31T13:54:27Z

Some tests are failing, does anybody have any idea why? On my machine other tests fail also with revision 4ab23c3 (current head on master).

AkhilTThomas · 2024-03-31T13:57:20Z

Some tests are failing, does anybody have any idea why? On my machine other tests fail also with revision 4ab23c3 (current head on master).

Can you try this patch file. With this all the test cases pass
nix_port_tested.patch

flba-eb mentioned this pull request Jun 16, 2023

Preview: Add QNX Neutrino support flba-eb/rust_nix#1

Closed

flba-eb force-pushed the add_qnx_support_cleaned branch from fed5769 to 3e79a22 Compare June 16, 2023 13:42

flba-eb changed the title ~~Ready for review: Add support for QNX Neutrino 7.1~~ Add support for QNX Neutrino 7.1 Jun 25, 2023

flba-eb marked this pull request as ready for review June 25, 2023 18:28

flba-eb force-pushed the add_qnx_support_cleaned branch 2 times, most recently from c9ced62 to 3e79a22 Compare June 26, 2023 12:27

asomers requested changes Jul 17, 2023

View reviewed changes

flba-eb force-pushed the add_qnx_support_cleaned branch from 4bb6f76 to 126a879 Compare July 31, 2023 11:40

SteveLauC mentioned this pull request Jan 6, 2024

Add sigsuspend #2279

Merged

3 tasks

SebastianSchildt mentioned this pull request Mar 28, 2024

Adding support for QNX OS tokio-rs/tokio#6421

Open

flba-eb force-pushed the add_qnx_support_cleaned branch 4 times, most recently from e6c6d7c to c208568 Compare March 31, 2024 13:46

SteveLauC mentioned this pull request Apr 1, 2024

Work Queue #2348

Open

flba-eb force-pushed the add_qnx_support_cleaned branch from c208568 to 6aedd9f Compare April 26, 2024 11:48

flba-eb added 2 commits May 2, 2024 16:26

Add support for QNX Neutrino 7.1

84821a0

Don't cast to anything (fix review finding)

ddc281e

flba-eb force-pushed the add_qnx_support_cleaned branch from 6aedd9f to ddc281e Compare May 2, 2024 14:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for QNX Neutrino 7.1 #2055

Add support for QNX Neutrino 7.1 #2055

flba-eb commented Jun 16, 2023 •

edited

asomers Jul 17, 2023

flba-eb Jul 31, 2023 •

edited

asomers Aug 6, 2023

flba-eb Mar 31, 2024

asomers Jul 17, 2023

flba-eb Jul 31, 2023

asomers Aug 6, 2023

flba-eb Mar 31, 2024

AkhilTThomas commented Mar 27, 2024

SteveLauC commented Mar 30, 2024

AkhilTThomas commented Mar 30, 2024

flba-eb commented Mar 30, 2024

AkhilTThomas commented Mar 31, 2024

flba-eb commented Mar 31, 2024

AkhilTThomas commented Mar 31, 2024 •

edited

Add support for QNX Neutrino 7.1 #2055

Are you sure you want to change the base?

Add support for QNX Neutrino 7.1 #2055

Conversation

flba-eb commented Jun 16, 2023 • edited

asomers Jul 17, 2023

Choose a reason for hiding this comment

flba-eb Jul 31, 2023 • edited

Choose a reason for hiding this comment

asomers Aug 6, 2023

Choose a reason for hiding this comment

flba-eb Mar 31, 2024

Choose a reason for hiding this comment

asomers Jul 17, 2023

Choose a reason for hiding this comment

flba-eb Jul 31, 2023

Choose a reason for hiding this comment

asomers Aug 6, 2023

Choose a reason for hiding this comment

flba-eb Mar 31, 2024

Choose a reason for hiding this comment

AkhilTThomas commented Mar 27, 2024

SteveLauC commented Mar 30, 2024

AkhilTThomas commented Mar 30, 2024

flba-eb commented Mar 30, 2024

AkhilTThomas commented Mar 31, 2024

flba-eb commented Mar 31, 2024

AkhilTThomas commented Mar 31, 2024 • edited

flba-eb commented Jun 16, 2023 •

edited

flba-eb Jul 31, 2023 •

edited

AkhilTThomas commented Mar 31, 2024 •

edited