Skip to content

fix fifo-test #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix fifo-test #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions zircon-object/src/ipc/fifo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,17 @@ impl Fifo {
let count_size = count * elem_size;
assert_eq!(data.len(), count_size);

let peer = self.peer.upgrade().ok_or(ZxError::PEER_CLOSED)?;
let peer = self.peer.upgrade();
let mut recv_queue = self.recv_queue.lock();
if recv_queue.is_empty() {
if peer.is_none() {
return Err(ZxError::PEER_CLOSED);
}
return Err(ZxError::SHOULD_WAIT);
}
let read_size = count_size.min(recv_queue.len());
if recv_queue.len() == self.capacity() {
peer.base.signal_set(Signal::WRITABLE);
if recv_queue.len() == self.capacity() && peer.is_some() {
peer.unwrap().base.signal_set(Signal::WRITABLE);
}
for (i, x) in recv_queue.drain(..read_size).enumerate() {
data[i] = x;
Expand Down
18 changes: 11 additions & 7 deletions zircon-syscall/src/object.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,17 @@ impl Syscall<'_> {
"object.wait_one: handle={:#x?}, signals={:#x?}, deadline={:#x?}, observed={:#x?}",
handle, signals, deadline, observed
);
let signals = Signal::from_bits(signals).ok_or_else(|| {
if !deadline.is_positive() {
ZxError::TIMED_OUT
} else {
ZxError::INVALID_ARGS
}
})?;
let signals = match signals{
0xFFFFFFFF => Signal::all(),
_ =>
Signal::from_bits(signals).ok_or_else(|| {
if !deadline.is_positive() {
ZxError::TIMED_OUT
} else {
ZxError::INVALID_ARGS
}
})?,
};
let proc = self.thread.proc();
let object = proc.get_dyn_object_with_rights(handle, Rights::WAIT)?;
let cancel_token = proc.get_cancel_token(handle)?;
Expand Down