Fix nix on Dragonfly #799

mneumann · 2017-11-17T12:16:40Z

This commit replaces pull request #684. It fixes building nix on DragonFly. All tests pass. This requires most recent libc to build: rust-lang/libc#851.

Susurrus · 2017-11-18T02:05:22Z

src/unistd.rs

@@ -630,7 +630,7 @@ pub fn execvp(filename: &CString, args: &[CString]) -> Result<Void> {
 ///
 /// This function is similar to `execve`, except that the program to be executed
 /// is referenced as a file descriptor instead of a path.
-#[cfg(any(target_os = "android", target_os = "dragonfly", target_os = "freebsd",
+#[cfg(any(target_os = "android", target_os = "freebsd",


Can you alphabetize this list and wrap them with one target per line?

Susurrus · 2017-11-18T02:06:06Z

test/test_unistd.rs

                        target_os = "netbsd",
                        target_os = "openbsd",
                        target_os = "linux", ))] {
        execve_test_factory!(test_execve, execve, &CString::new("/bin/sh").unwrap());
        execve_test_factory!(test_fexecve, fexecve, File::open("/bin/sh").unwrap().into_raw_fd());
-    } else if #[cfg(any(target_os = "ios", target_os = "macos", ))] {
+    } else if #[cfg(any(target_os = "ios", target_os = "macos", target_os = "dragonfly"))] {


Please keep the targets in alphabetical order.

Susurrus · 2017-11-18T02:07:35Z

Also, is there a reason this is kept as a separate crate inside nix? I'm not certain we can do that and still publish nix to crates.io honestly. Additionally it just seems like an odd organization, can we not integrate everything with a lot less boilerplate by having it be part of the nix crate itself?

mneumann · 2017-11-18T10:21:39Z

@Susurrus : Added two further commits to address your suggestions. Dunno, why the buildbot is failing :(

Susurrus · 2017-11-18T19:03:11Z

Yeah, I don't know why the buildbots are having problems either. @asomers any idea here?

Also, you'll want to rebase this now that #798 was merged that touches on this code.

Susurrus

Another thing that I don't see in here is documentation for why we need to do this or a reference to something within Rust or libc that we're waiting on to not need this workaround. I'd like to make sure that it's clear why we need this code here.

Susurrus · 2017-11-18T19:06:03Z

src/errno.rs

-unsafe fn errno_location() -> *mut c_int {
-    extern { fn __dfly_error() -> *mut c_int; }
-    __dfly_error()
+#[link(name="errno_dragonfly", kind="static")]


I thought this was thread-local. Do we just not use that yet because Rust doesn't support it on stable yet?

Exactly. And it's unclear when this will become stable. The suggestion to use a C extension for this purpose came from @alexcrichton in this thread rust-lang/rust#29594 (comment)

mneumann · 2017-11-20T09:53:57Z

@Susurrus Rebased on top of master, and stashed the errno changes into one single commit, describing why we do it this way (thread_local is not stable).

Susurrus

You'll want to rebase this once #800 lands as well.

Susurrus · 2017-11-21T04:25:34Z

src/sys/socket/ffi.rs

@@ -5,7 +5,7 @@ pub use libc::{socket, listen, bind, accept, connect, setsockopt, sendto, recvfr

 use libc::{c_int, c_void, socklen_t, ssize_t};

-#[cfg(not(target_os = "macos"))]
+#[cfg(not(any(target_os = "macos", target_os = "dragonfly")))]


These should be alphabetized as well.

Susurrus · 2017-11-21T04:25:40Z

src/sys/socket/ffi.rs

+#[cfg(target_os = "dragonfly")]
+pub type type_of_cmsg_data = c_int;
+
+#[cfg(not(any(target_os = "macos", target_os = "dragonfly")))]


Also alphabetized.

Susurrus · 2017-11-21T04:26:25Z

src/sys/socket/ffi.rs

@@ -23,7 +23,10 @@ pub type type_of_cmsg_len = socklen_t;
 #[cfg(target_os = "macos")]


I'd actually suggest putting these in a cfg_if! macro, as this will be a lot easier to understand.

Susurrus · 2017-12-03T04:54:39Z

@mneumann With #800 merged, now would be a good time to rebase this and get it merged.

mneumann · 2017-12-05T11:13:29Z

@Susurrus Rebased, alphabetized and used the cfg_if! in socket/ffi.rs. Hoping it still builds everywhere and we are finally ready to merge :)

Susurrus

Just 2 minor changes, and then please squash all of these commits into 1 and we'll get this merged!

Susurrus · 2017-12-13T16:14:25Z

test/sys/mod.rs

+// works or not heavily depends on which pthread implementation is chosen
+// by the user at link time. For this reason we do not want to run aio test
+// cases on DragonFly.
+#[cfg(any(target_os = "freebsd", target_os = "ios",


Can you use a single OS per line as done in other places?

Susurrus · 2017-12-13T16:14:57Z

build.rs

+}
+
+#[cfg(not(target_os = "dragonfly"))]
+fn main() {


Please put the braces on the same line.

* DragonFly does not have a O_DSYNC flag * Fix type_of_cmsg_data on DragonFly * No fexecve() on DragonFly * Do not run aio test cases on DragonFly * Keep target lists in alphabetical order * Unscrable #[cfg] directives and use cfg_if! macro instead * Fix errno on DragonFly Below follows an explanation why we have to use a C extension to get errno working on DragonFly: DragonFly uses a thread-local errno variable, but #[thread_local] is feature-gated and not available in stable Rust as of this writing (Rust 1.21.0). We have to use a C extension (src/errno_dragonfly.c) to access it. Tracking issue for `thread_local` stabilization: rust-lang/rust#29594 Once this becomes stable, we can remove build.rs, src/errno_dragonfly.c, remove the build-dependency from Cargo.toml, and use: extern { #[thread_local] static errno: c_int; } Now all targets will use the build.rs script, but only on DragonFly this will do something. Also, there are no additional dependencies for targets other than DragonFly (no gcc dep).

mneumann · 2017-12-19T09:51:32Z

@Susurrus : Fixed your above suggestions and squashed everything into one single commit.

Susurrus · 2017-12-19T15:23:36Z

LGTM, thanks @mneumann!

bors r+

799: Fix nix on Dragonfly r=Susurrus a=mneumann This commit replaces pull request #684. It fixes building `nix` on DragonFly. All tests pass. This requires most recent libc to build: rust-lang/libc#851.

bors · 2017-12-19T16:16:41Z

Build succeeded

mneumann · 2017-12-20T08:53:14Z

@Susurrus : Thank you very much for your reviews :).

mneumann mentioned this pull request Nov 17, 2017

Fix nix for Dragonfly #684

Closed

Susurrus suggested changes Nov 18, 2017

View reviewed changes

Susurrus suggested changes Nov 21, 2017

View reviewed changes

Susurrus suggested changes Dec 13, 2017

View reviewed changes

bors bot added a commit that referenced this pull request Dec 19, 2017

Merge #799

b68db41

799: Fix nix on Dragonfly r=Susurrus a=mneumann This commit replaces pull request #684. It fixes building `nix` on DragonFly. All tests pass. This requires most recent libc to build: rust-lang/libc#851.

bors bot merged commit 709cbdf into nix-rust:master Dec 19, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix nix on Dragonfly #799

Fix nix on Dragonfly #799

mneumann commented Nov 17, 2017

Susurrus Nov 18, 2017

Susurrus Nov 18, 2017

Susurrus commented Nov 18, 2017

mneumann commented Nov 18, 2017

Susurrus commented Nov 18, 2017

Susurrus left a comment

Susurrus Nov 18, 2017

mneumann Nov 20, 2017

mneumann commented Nov 20, 2017 •

edited

Loading

Susurrus left a comment

Susurrus Nov 21, 2017

Susurrus Nov 21, 2017

Susurrus Nov 21, 2017

Susurrus commented Dec 3, 2017

mneumann commented Dec 5, 2017

Susurrus left a comment

Susurrus Dec 13, 2017

Susurrus Dec 13, 2017

mneumann commented Dec 19, 2017

Susurrus commented Dec 19, 2017

bors bot commented Dec 19, 2017

mneumann commented Dec 20, 2017

		@@ -23,7 +23,10 @@ pub type type_of_cmsg_len = socklen_t;
		#[cfg(target_os = "macos")]

Fix nix on Dragonfly #799

Fix nix on Dragonfly #799

Conversation

mneumann commented Nov 17, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Susurrus commented Nov 18, 2017

mneumann commented Nov 18, 2017

Susurrus commented Nov 18, 2017

Susurrus left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mneumann commented Nov 20, 2017 • edited Loading

Susurrus left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Susurrus commented Dec 3, 2017

mneumann commented Dec 5, 2017

Susurrus left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mneumann commented Dec 19, 2017

Susurrus commented Dec 19, 2017

bors bot commented Dec 19, 2017

Build succeeded

mneumann commented Dec 20, 2017

mneumann commented Nov 20, 2017 •

edited

Loading