use epoll

Author: WhatAmISupposedToPutHere

Cargo.toml

@@ -18,7 +18,7 @@ input = "0.8"
 libc = "0.2"
 input-linux = { version = "0.6", features = ["serde"] }
 input-linux-sys = "0.8"
-nix = { version = "0.27", features = ["poll", "signal", "inotify"] }
+nix = { version = "0.27", features = ["event", "signal", "inotify"] }
 privdrop = "0.5.3"
 serde = { version = "1", features = ["derive"] }
 toml = "0.8"

src/config.rs

@@ -1,13 +1,17 @@
-use std::fs::read_to_string;
+use std::{
+    fs::read_to_string,
+    os::fd::AsFd
+};
 use anyhow::Error;
 use cairo::FontFace;
 use crate::FunctionLayer;
 use crate::fonts::{FontConfig, Pattern};
 use freetype::Library as FtLibrary;
 use input_linux::Key;
-use nix::errno::Errno;
-use nix::poll::{PollFd, PollFlags};
-use nix::sys::inotify::{AddWatchFlags, InitFlags, Inotify, WatchDescriptor};
+use nix::{
+    errno::Errno,
+    sys::inotify::{AddWatchFlags, InitFlags, Inotify, WatchDescriptor}
+};
 use serde::Deserialize;
 
 const USER_CFG_PATH: &'static str = "/etc/tiny-dfr/config.toml";
@@ -125,7 +129,7 @@ impl ConfigManager {
         }
         ret
     }
-    pub fn pollfd(&self) -> PollFd {
-        PollFd::new(&self.inotify_fd, PollFlags::POLLIN)
+    pub fn fd(&self) -> &impl AsFd {
+        &self.inotify_fd
     }
 }

src/main.rs

@@ -24,9 +24,9 @@ use input::{
 use libc::{O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY, c_char};
 use input_linux::{uinput::UInputHandle, EventKind, Key, SynchronizeKind};
 use input_linux_sys::{uinput_setup, input_id, timeval, input_event};
-use nix::{
-    poll::{poll, PollFd, PollFlags},
-    sys::signal::{Signal, SigSet},
+use nix::sys::{
+    signal::{Signal, SigSet},
+    epoll::{Epoll, EpollCreateFlags, EpollEvent, EpollFlags}
 };
 use privdrop::PrivDrop;
 
@@ -358,10 +358,10 @@ fn real_main(drm: &mut DrmBackend) {
     let mut input_main = Libinput::new_with_udev(Interface);
     input_tb.udev_assign_seat("seat-touchbar").unwrap();
     input_main.udev_assign_seat("seat0").unwrap();
-    let fd_tb = input_tb.as_fd().try_clone_to_owned().unwrap();
-    let fd_main = input_main.as_fd().try_clone_to_owned().unwrap();
-    let pollfd_tb = PollFd::new(&fd_tb, PollFlags::POLLIN);
-    let pollfd_main = PollFd::new(&fd_main, PollFlags::POLLIN);
+    let epoll = Epoll::new(EpollCreateFlags::empty()).unwrap();
+    epoll.add(input_main.as_fd(), EpollEvent::new(EpollFlags::EPOLLIN, 0)).unwrap();
+    epoll.add(input_tb.as_fd(), EpollEvent::new(EpollFlags::EPOLLIN, 1)).unwrap();
+    epoll.add(cfg_mgr.fd(), EpollEvent::new(EpollFlags::EPOLLIN, 2)).unwrap();
     uinput.set_evbit(EventKind::Key).unwrap();
     for layer in &layers {
         for button in &layer.buttons {
@@ -415,7 +415,7 @@ fn real_main(drm: &mut DrmBackend) {
             needs_complete_redraw = false;
         }
 
-        poll(&mut [pollfd_tb, pollfd_main, cfg_mgr.pollfd()], next_timeout_ms).unwrap();
+        epoll.wait(&mut [EpollEvent::new(EpollFlags::EPOLLIN, 0)], next_timeout_ms as isize).unwrap();
         input_tb.dispatch().unwrap();
         input_main.dispatch().unwrap();
         for event in &mut input_tb.clone().chain(input_main.clone()) {