Refactor AnonSocket::read/write for blocking socketpair #4037
Conversation
| // TODO: We might need to decide what to do if peer_fd is closed when read is blocked. | ||
| anonsocket_read(self, self.peer_fd().upgrade(), &mut bytes, ptr, dest, ecx) |
There was a problem hiding this comment.
I am not entirely sure if closing peer_fd when it is blocking should be allowed. I currently prefer to leave the TODO here and revisit it again when implementing blocking (and write a testcase for this).
There was a problem hiding this comment.
I would expect that closing one side wakes up the other side, and makes it return an EOF read.
I'm a bit surprised that all that if readbuf.borrow().buf.is_empty() { stuff is not insider the helper, but 🤷 I guess it can be moved later if it turns out to be useful.
There was a problem hiding this comment.
'm a bit surprised that all that if readbuf.borrow().buf.is_empty() { stuff is not insider the helper,
Ah right I should've moved them inside helper, I guess I will just separate this into another commit when I implement the blocking operation.
|
@rustbot ready |
src/shims/unix/unnamed_socket.rs
Outdated
| @@ -146,7 +146,7 @@ impl FileDescription for AnonSocket { | |||
| // corresponding ErrorKind variant. | |||
| throw_unsup_format!("reading from the write end of a pipe"); | |||
| }; | |||
| let mut readbuf = readbuf.borrow_mut(); | |||
| let readbuf = readbuf.borrow_mut(); | |||
| if readbuf.buf.is_empty() { | |||
There was a problem hiding this comment.
| if readbuf.buf.is_empty() { | |
| if readbuf.borrow_mut().buf.is_empty() { |
Then you don't need the explicit drop
There was a problem hiding this comment.
Nice! I wonder if it would be correct to assume that Ref or RefMut will be automatically dropped at the end of the statement if it is not used elsewhere?
There was a problem hiding this comment.
Yes. Temporary values are dropped at the end of their statement
|
Lgtm. Please squash |
This PR moves the actual read/write operations of
AnonSocket::read/writeinto separate functions, in preparation for #3665. The new functions will be used as blocking callback.