Skip to content

Commit

Permalink
chore: update cargo dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
sevenautumns authored and dadada committed Jun 11, 2024
1 parent eda9f39 commit bef69b8
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 16 deletions.
26 changes: 21 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ members = [
[workspace.dependencies]
a653rs = "0.5"
log = "0"
nix = { version = "0.27", features = ["socket", "process", "fs", "uio", "signal", "user", "mount", "event", "sched"] }
nix = { version = "0.29", features = ["socket", "process", "fs", "uio", "signal", "user", "mount", "event", "sched"] }
memmap2 = "0.9"
procfs = "0.16"
polling = "3.4"
itertools = "0.12.1"
itertools = "0.13"
once_cell = "1.19"
bytesize = "1.1"
4 changes: 3 additions & 1 deletion core/src/ipc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,9 @@ where
let io_fd = self.socket.as_raw_fd();
match recvmsg::<()>(io_fd, &mut iov, Some(&mut cmsg), MsgFlags::MSG_DONTWAIT) {
Ok(msg) => {
if let Some(ControlMessageOwned::ScmRights(fds)) = msg.cmsgs().next() {
if let Some(ControlMessageOwned::ScmRights(fds)) =
msg.cmsgs().typ(SystemError::Panic)?.next()
{
if let &[raw_fd] = fds.as_slice() {
let sock = unsafe { T::from_raw_fd(raw_fd) };
return Ok(Some(sock));
Expand Down
8 changes: 4 additions & 4 deletions hypervisor/src/hypervisor/syscall.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fn recv_fd_triple(fd: BorrowedFd) -> Result<[OwnedFd; 3]> {
let mut iov = [IoSliceMut::new(&mut iobuf)];
let res = recvmsg::<()>(fd.as_raw_fd(), &mut iov, Some(&mut cmsg), MsgFlags::empty())?;

let fds: Vec<RawFd> = match res.cmsgs().next().unwrap() {
let fds: Vec<RawFd> = match res.cmsgs()?.next().unwrap() {
ControlMessageOwned::ScmRights(fds) => fds,
_ => bail!("received an unknown cmsg"),
};
Expand Down Expand Up @@ -97,7 +97,7 @@ pub fn handle(fd: BorrowedFd, timeout: Option<Duration>) -> Result<u32> {

// Trigger the event
let buf = 1_u64.to_ne_bytes();
unistd::write(event_fd.as_raw_fd(), &buf)?;
unistd::write(event_fd, &buf)?;

nsyscalls += 1;
}
Expand All @@ -110,7 +110,7 @@ mod tests {
use std::io::IoSlice;
use std::os::fd::{AsFd, AsRawFd};

use nix::sys::eventfd::{eventfd, EfdFlags};
use nix::sys::eventfd::EventFd;
use nix::sys::socket::{
sendmsg, socketpair, AddressFamily, ControlMessage, SockFlag, SockType,
};
Expand All @@ -132,7 +132,7 @@ mod tests {
let request_thread = std::thread::spawn(move || {
let mut request_fd = Mfd::create("requ").unwrap();
let mut response_fd = Mfd::create("resp").unwrap();
let event_fd = eventfd(0, EfdFlags::empty()).unwrap();
let event_fd = EventFd::new().unwrap();

// Initialize the request fd
request_fd
Expand Down
8 changes: 4 additions & 4 deletions partition/src/syscall.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::os::fd::{AsFd, AsRawFd, BorrowedFd};

use anyhow::Result;
use nix::libc::EINTR;
use nix::sys::eventfd::{self, EfdFlags};
use nix::sys::eventfd::EventFd;
use nix::sys::socket::{sendmsg, ControlMessage, MsgFlags};
use polling::{Event, Events, Poller};

Expand Down Expand Up @@ -57,7 +57,7 @@ fn execute_fd(fd: BorrowedFd, request: SyscallRequest) -> Result<SyscallResponse
// Create the file descriptor triple
let mut request_fd = Mfd::create("requ")?;
let mut response_fd = Mfd::create("resp")?;
let event_fd = eventfd::eventfd(0, EfdFlags::empty())?;
let event_fd = EventFd::new()?;

// Initialize the request file descriptor
request_fd.write(&request.serialize()?)?;
Expand Down Expand Up @@ -129,7 +129,7 @@ mod tests {
)
.unwrap();

let fds: Vec<OwnedFd> = match res.cmsgs().next().unwrap() {
let fds: Vec<OwnedFd> = match res.cmsgs().unwrap().next().unwrap() {
ControlMessageOwned::ScmRights(fds) => fds
.into_iter()
.map(|fd| unsafe { OwnedFd::from_raw_fd(fd) })
Expand Down Expand Up @@ -161,7 +161,7 @@ mod tests {

// Trigger the eventfd
let buf = 1_u64.to_ne_bytes();
unistd::write(event_fd.as_raw_fd(), &buf).unwrap();
unistd::write(event_fd, &buf).unwrap();
});

request_thread.join().unwrap();
Expand Down

0 comments on commit bef69b8

Please sign in to comment.