Skip to content
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

transport: fix get_request in linux #62

Merged
merged 1 commit into from
Mar 22, 2022
+13 −7
Merged

transport: fix get_request in linux #62

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
20 changes: 13 additions & 7 deletions src/transport/fusedev/linux_session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use nix::errno::Errno;
use nix::fcntl::{fcntl, FcntlArg, OFlag};
use nix::mount::{mount, umount2, MntFlags, MsFlags};
use nix::poll::{poll, PollFd, PollFlags};
use nix::sys::epoll::{epoll_ctl, EpollEvent, EpollFlags, EpollOp};
use nix::unistd::{getgid, getuid, read};

use super::{
Expand Down Expand Up @@ -194,13 +195,18 @@ impl FuseChannel {
.map_err(|e| SessionFailure(format!("epoll register session fd: {}", e)))?;
let waker = Arc::new(waker);

poll.registry()
.register(
&mut SourceFd(&file.as_raw_fd()),
FUSE_DEV_EVENT,
Interest::READABLE,
)
.map_err(IoError)?;
// mio default add EPOLLET to event flags, so epoll will use edge-triggered mode.
// It may let poll miss some event, so manually register the fd with only EPOLLIN flag
// to use level-triggered mode.
let epoll = poll.as_raw_fd();
let mut event = EpollEvent::new(EpollFlags::EPOLLIN, usize::from(FUSE_DEV_EVENT) as u64);
epoll_ctl(
epoll,
EpollOp::EpollCtlAdd,
file.as_raw_fd(),
Some(&mut event),
)
.map_err(|e| SessionFailure(format!("epoll register channel fd: {}", e)))?;

Ok(FuseChannel {
file,
Expand Down