Unix sockets on redox #51553

jD91mZM2 · 2018-06-14T14:03:44Z

This is done using the ipcd daemon. It's not exactly like unix sockets because there is not actually a physical file for the path, but it's close enough for a basic implementation :)
This allows mio-uds and tokio-uds to work with a few modifications as well, which is exciting!

rust-highfive · 2018-06-14T14:03:55Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @sfackler (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

sfackler · 2018-06-14T15:15:38Z

src/libstd/sys/redox/ext/net.rs

+/// ```
+#[stable(feature = "unix_socket", since = "1.10.0")]
+#[derive(Clone)]
+pub struct SocketAddr;


This can be constructed by third party code - is that intended?

Haven't thought about that at all. It's not really a problem, so should I bother to fix it? (Also, how? With a dummy variable?)

pub struct SocketAddr(()); is the standard approach.

sfackler · 2018-06-14T15:16:05Z

src/libstd/sys/redox/ext/net.rs

+/// };
+/// let addr = socket.local_addr().expect("Couldn't get local address");
+/// ```
+#[stable(feature = "unix_socket", since = "1.10.0")]


Seems like these should be on their own feature gate. They definitely haven't been stable since 1.10!

I copied the code from unix 😛. How do I make a feature gate?

sfackler · 2018-06-14T15:17:32Z

src/libstd/sys/redox/ext/net.rs

+    /// let addr = socket.local_addr().expect("Couldn't get local address");
+    /// ```
+    #[stable(feature = "unix_socket", since = "1.10.0")]
+    pub fn local_addr(&self) -> io::Result<SocketAddr> {


Why are these methods defined if they never succeed?

For compatibility with the unix interface. Anything using it will still compile, just maybe not work perfectly, depending on the error handling.

What kind of programs call methods like local_addr or set_write_timeout but don't care if the operation succeeds or not?

sfackler · 2018-06-17T23:42:50Z

src/libstd/sys/redox/ext/net.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.

-#![stable(feature = "unix_socket", since = "1.10.0")]
+#![stable(feature = "unix_socket_redox", since = "1.27.0")]


Stuff is always initially unstable when added to the standard library.

Alright, will fix. I'm just so excited to get this working 😛

Should I make a tracking issue for it and everything?

pietroalbini · 2018-06-25T11:14:26Z

Ping from triage @sfackler! This PR needs your review.

sfackler · 2018-06-25T14:20:42Z

src/libstd/sys/redox/ext/net.rs

+/// # Examples
+///
+/// ```
+/// use std::os::unix::net::UnixListener;


Redox extensions are still under os::unix

Redox is considered a unix?

Seems like it, since it's re-exported to os::unix in mod.rs

Hmm, so my previous impression was that it wasn't. It seems less reasonable to have a different API between redox and "normal" unix in that case. I guess it might be best to go back to having a matching API and just returning errors?

Having two copies of the public-facing bits of this seems pretty hard to deal with maintenance-wise though. I think we'll want to refactor to have a single unified public interface that wraps the Redox/non-Redox impls.

sfackler · 2018-06-25T14:20:49Z

src/libstd/sys/redox/ext/net.rs

+    /// With a pathname:
+    ///
+    /// ```no_run
+    /// use std::os::unix::net::UnixListener;


sfackler · 2018-06-25T14:20:54Z

src/libstd/sys/redox/ext/net.rs

+    /// Without a pathname:
+    ///
+    /// ```
+    /// use std::os::unix::net::UnixDatagram;


sfackler · 2018-06-25T14:20:59Z

src/libstd/sys/redox/ext/net.rs

+/// # Examples
+///
+/// ```no_run
+/// use std::os::unix::net::UnixStream;


sfackler · 2018-06-25T14:21:06Z

src/libstd/sys/redox/ext/net.rs

+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::os::unix::net::UnixStream;


sfackler · 2018-06-25T14:21:14Z

src/libstd/sys/redox/ext/net.rs

+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::os::unix::net::UnixStream;


sfackler · 2018-06-25T14:21:23Z

src/libstd/sys/redox/ext/net.rs

+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::os::unix::net::UnixStream;


sfackler · 2018-06-25T14:21:28Z

src/libstd/sys/redox/ext/net.rs

+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::os::unix::net::UnixStream;


sfackler · 2018-06-25T14:21:42Z

src/libstd/sys/redox/ext/net.rs

+    /// }
+    /// ```
+    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
+        Ok(None)


This should probably be removed.

Compatibility with the unix interface. Without it tokio-uds needs some extra cfg madness, meanwhile it works perfectly with it.

The documentation claims that this returns the value of the SO_ERROR option but that is not the case.

sfackler · 2018-06-25T14:22:01Z

src/libstd/sys/redox/ext/net.rs

+///
+/// ```no_run
+/// use std::thread;
+/// use std::os::unix::net::{UnixStream, UnixListener};


sfackler · 2018-06-25T14:22:05Z

src/libstd/sys/redox/ext/net.rs

+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::os::unix::net::UnixListener;


sfackler · 2018-06-25T14:22:13Z

src/libstd/sys/redox/ext/net.rs

+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::os::unix::net::UnixListener;


sfackler · 2018-06-25T14:22:17Z

src/libstd/sys/redox/ext/net.rs

+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::os::unix::net::UnixListener;


sfackler · 2018-06-25T14:22:25Z

src/libstd/sys/redox/ext/net.rs

+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::os::unix::net::UnixListener;


sfackler · 2018-06-25T14:22:30Z

src/libstd/sys/redox/ext/net.rs

+    /// # Examples
+    ///
+    /// ```no_run
+    /// use std::os::unix::net::UnixListener;


sfackler · 2018-06-25T14:22:35Z

src/libstd/sys/redox/ext/net.rs

+    ///
+    /// ```no_run
+    /// use std::thread;
+    /// use std::os::unix::net::{UnixStream, UnixListener};


sfackler · 2018-06-25T14:22:50Z

src/libstd/sys/redox/ext/net.rs

+    /// }
+    /// ```
+    pub fn take_error(&self) -> io::Result<Option<io::Error>> {
+        Ok(None)


This should probably be removed.

sfackler · 2018-06-25T14:22:56Z

src/libstd/sys/redox/ext/net.rs

+///
+/// ```no_run
+/// use std::thread;
+/// use std::os::unix::net::{UnixStream, UnixListener};


jD91mZM2 · 2018-07-06T16:09:20Z

Nothing in the interface is changing code-wise since everything is re-exported, but the docs might display it differently.

To clarify, I should revert the commit that merges the public side of the interfaces?

alexcrichton · 2018-07-08T15:25:55Z

src/libstd/sys_common/unixsocket.rs

@@ -0,0 +1,731 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT


Is this module included in sys_common or is this a stray file?

Stray file, good catch!

alexcrichton · 2018-07-08T15:26:07Z

src/libstd/sys/unix/ext/unixsocket.rs

@@ -0,0 +1,354 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT


Is this module included in sys/unix/ext or is this a stray file?

alexcrichton · 2018-07-09T14:34:12Z

I'd personally be ok with this as-is, but I'll leave approving to @sfackler

sfackler · 2018-07-11T04:29:19Z

@bors r+

bors · 2018-07-11T04:29:21Z

📌 Commit 0b56e7f has been approved by sfackler

bors · 2018-07-11T04:50:19Z

⌛ Testing commit 0b56e7f with merge 8784470...

Unix sockets on redox This is done using the ipcd daemon. It's not exactly like unix sockets because there is not actually a physical file for the path, but it's close enough for a basic implementation :) This allows mio-uds and tokio-uds to work with a few modifications as well, which is exciting!

bors · 2018-07-11T06:46:06Z

💔 Test failed - status-travis

rust-highfive · 2018-07-11T06:46:08Z

The job x86_64-gnu-distcheck of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[01:49:37] warning: spurious network error (2 tries remaining): curl error: Couldn't resolve host 'github.com'
[01:49:37] ; class=Net (12)
[01:50:33] warning: spurious network error (1 tries remaining): curl error: Couldn't resolve host 'github.com'
[01:50:33] ; class=Net (12)
[01:51:29] error: failed to load source for a dependency on `rand`
[01:51:29] Caused by:
[01:51:29]   Unable to update registry `https://github.com/rust-lang/crates.io-index`
[01:51:29] 
[01:51:29] Caused by:
[01:51:29] Caused by:
[01:51:29]   failed to fetch `https://github.com/rust-lang/crates.io-index`
[01:51:29] 
[01:51:29] Caused by:
[01:51:29]   curl error: Couldn't resolve host 'github.com'
[01:51:29] ; class=Net (12)
[01:51:29] 
[01:51:29] 
[01:51:29] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "generate-lockfile" "--manifest-path" "/checkout/obj/build/tmp/distcheck-src/rust-src/lib/rustlib/src/rust/src/libstd/Cargo.toml"
[01:51:29] 
[01:51:29] 
[01:51:29] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[01:51:29] Build completed unsuccessfully in 1:48:36
---
travis_time:end:107ed913:start=1531291444480539795,finish=1531291444488798003,duration=8258208
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:01d74c20
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0e635a16
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

rust-highfive · 2018-07-11T06:46:37Z

The job x86_64-gnu-distcheck of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[01:49:37] warning: spurious network error (2 tries remaining): curl error: Couldn't resolve host 'github.com'
[01:49:37] ; class=Net (12)
[01:50:33] warning: spurious network error (1 tries remaining): curl error: Couldn't resolve host 'github.com'
[01:50:33] ; class=Net (12)
[01:51:29] error: failed to load source for a dependency on `rand`
[01:51:29] Caused by:
[01:51:29]   Unable to update registry `https://github.com/rust-lang/crates.io-index`
[01:51:29] 
[01:51:29] Caused by:
[01:51:29] Caused by:
[01:51:29]   failed to fetch `https://github.com/rust-lang/crates.io-index`
[01:51:29] 
[01:51:29] Caused by:
[01:51:29]   curl error: Couldn't resolve host 'github.com'
[01:51:29] ; class=Net (12)
[01:51:29] 
[01:51:29] 
[01:51:29] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "generate-lockfile" "--manifest-path" "/checkout/obj/build/tmp/distcheck-src/rust-src/lib/rustlib/src/rust/src/libstd/Cargo.toml"
[01:51:29] 
[01:51:29] 
[01:51:29] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[01:51:29] Build completed unsuccessfully in 1:48:36
---
travis_time:end:107ed913:start=1531291444480539795,finish=1531291444488798003,duration=8258208
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:01d74c20
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0e635a16
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

jD91mZM2 · 2018-07-11T08:22:34Z

Looks like network errors, shouldn't be related to my changes

pietroalbini · 2018-07-11T09:06:36Z

@bors retry travis-ci/travis-ci#9696

bors · 2018-07-11T14:15:11Z

⌛ Testing commit 0b56e7f with merge 66787e0...

Unix sockets on redox This is done using the ipcd daemon. It's not exactly like unix sockets because there is not actually a physical file for the path, but it's close enough for a basic implementation :) This allows mio-uds and tokio-uds to work with a few modifications as well, which is exciting!

bors · 2018-07-11T16:24:42Z

☀️ Test successful - status-appveyor, status-travis
Approved by: sfackler
Pushing 66787e0 to master...

jD91mZM2 · 2018-07-22T18:02:25Z

Should I make a stabilization issue/PR for unix_socket_redox? I have no idea how this stuff works, this is my first PR

alexcrichton · 2018-07-23T21:52:09Z

For platform-specific modules there's not really much process, and especially if these APIs match the rest of libstd then it should be fine to just send a PR to stabilize them

jD91mZM2 · 2018-07-24T03:04:44Z

Awesome, thanks 😄

rust-highfive assigned sfackler Jun 14, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 14, 2018

This comment has been minimized.

Sign in to view

sfackler reviewed Jun 14, 2018

View reviewed changes

sfackler reviewed Jun 17, 2018

View reviewed changes

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// With a pathname:

///

/// ```no_run

/// use std::os::unix::net::UnixListener;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

os::unix

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// Without a pathname:

///

/// ```

/// use std::os::unix::net::UnixDatagram;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

os::unix

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// # Examples

///

/// ```no_run

/// use std::os::unix::net::UnixStream;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

os::unix

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// # Examples

///

/// ```no_run

/// use std::os::unix::net::UnixStream;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// # Examples

///

/// ```no_run

/// use std::os::unix::net::UnixStream;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// # Examples

///

/// ```no_run

/// use std::os::unix::net::UnixStream;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// # Examples

///

/// ```no_run

/// use std::os::unix::net::UnixStream;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

///

/// ```no_run

/// use std::thread;

/// use std::os::unix::net::{UnixStream, UnixListener};

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// # Examples

///

/// ```no_run

/// use std::os::unix::net::UnixListener;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// # Examples

///

/// ```no_run

/// use std::os::unix::net::UnixListener;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// # Examples

///

/// ```no_run

/// use std::os::unix::net::UnixListener;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// # Examples

///

/// ```no_run

/// use std::os::unix::net::UnixListener;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

/// # Examples

///

/// ```no_run

/// use std::os::unix::net::UnixListener;

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

///

/// ```no_run

/// use std::thread;

/// use std::os::unix::net::{UnixStream, UnixListener};

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

sfackler reviewed Jun 25, 2018

View reviewed changes

src/libstd/sys/redox/ext/net.rs

///

/// ```no_run

/// use std::thread;

/// use std::os::unix::net::{UnixStream, UnixListener};

Copy link

Member

sfackler Jun 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

jD91mZM2 added 3 commits June 26, 2018 20:31

Unix sockets on redox!

2394549

Make UnixStream::take_error return None on redox

3b866b0

Trim all lines to 100

4195007

jD91mZM2 added 2 commits July 7, 2018 06:50

Revert unification of interfaces

abac5e7

Add is_unnamed

c007a78

alexcrichton reviewed Jul 8, 2018

View reviewed changes

Delete leftover files

0b56e7f

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 11, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 11, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 11, 2018

bors merged commit 0b56e7f into rust-lang:master Jul 11, 2018

Mark-Simulacrum mentioned this pull request Feb 24, 2024

OpenBSD fix long socket addresses #118349

Closed

		@@ -0,0 +1,731 @@
		// Copyright 2016 The Rust Project Developers. See the COPYRIGHT

		@@ -0,0 +1,354 @@
		// Copyright 2016 The Rust Project Developers. See the COPYRIGHT

Unix sockets on redox #51553

Unix sockets on redox #51553

Conversation

jD91mZM2 commented Jun 14, 2018

rust-highfive commented Jun 14, 2018

This comment has been minimized.

Choose a reason for hiding this comment

jD91mZM2 Jun 14, 2018 • edited

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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pietroalbini commented Jun 25, 2018

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

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

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

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

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

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

jD91mZM2 commented Jul 6, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexcrichton commented Jul 9, 2018

sfackler commented Jul 11, 2018

bors commented Jul 11, 2018

bors commented Jul 11, 2018

bors commented Jul 11, 2018

rust-highfive commented Jul 11, 2018

rust-highfive commented Jul 11, 2018

jD91mZM2 commented Jul 11, 2018

pietroalbini commented Jul 11, 2018

bors commented Jul 11, 2018

bors commented Jul 11, 2018

jD91mZM2 commented Jul 22, 2018 • edited

alexcrichton commented Jul 23, 2018

jD91mZM2 commented Jul 24, 2018

jD91mZM2 Jun 14, 2018 •

edited

jD91mZM2 commented Jul 22, 2018 •

edited