fix high cpu usage

pythops · Sep 14, 2024 · 68eab7c · 68eab7c
1 parent 5754d83
commit 68eab7c
Show file tree

Hide file tree

Showing 11 changed files with 431 additions and 348 deletions.
diff --git a/oryx-tui/src/app.rs b/oryx-tui/src/app.rs
diff --git a/oryx-tui/src/ebpf.rs b/oryx-tui/src/ebpf.rs
@@ -59,10 +59,15 @@ impl Source for RingBuffer<'_> {
 }
 
 impl Ebpf {
-    pub fn load_ingress(iface: String, sender: kanal::Sender<Event>, terminate: Arc<AtomicBool>) {
+    pub fn load_ingress(
+        iface: String,
+        notification_sender: kanal::Sender<Event>,
+        data_sender: kanal::Sender<[u8; RawPacket::LEN]>,
+        terminate: Arc<AtomicBool>,
+    ) {
         thread::spawn({
             let iface = iface.to_owned();
-            let sender = sender.clone();
+            let notification_sender = notification_sender.clone();
 
             move || {
                 let rlim = libc::rlimit {
@@ -81,7 +86,7 @@ impl Ebpf {
                         Notification::send(
                             format!("Failed to load the ingress eBPF bytecode\n {}", e),
                             NotificationLevel::Error,
-                            sender,
+                            notification_sender,
                         )
                         .unwrap();
                         return;
@@ -97,7 +102,7 @@ impl Ebpf {
                         Notification::send(
                             format!("Failed to load the ingress eBPF bytecode\n {}", e),
                             NotificationLevel::Error,
-                            sender,
+                            notification_sender,
                         )
                         .unwrap();
                         return;
@@ -116,7 +121,7 @@ impl Ebpf {
                             e
                         ),
                         NotificationLevel::Error,
-                        sender,
+                        notification_sender,
                     )
                     .unwrap();
                     return;
@@ -129,7 +134,7 @@ impl Ebpf {
                             e
                         ),
                         NotificationLevel::Error,
-                        sender,
+                        notification_sender,
                     )
                     .unwrap();
                     return;
@@ -168,7 +173,7 @@ impl Ebpf {
                                 }
                                 let packet: [u8; RawPacket::LEN] =
                                     item.to_owned().try_into().unwrap();
-                                sender.send(Event::Packet(packet)).ok();
+                                data_sender.send(packet).ok();
                             }
                         }
                     }
@@ -181,10 +186,15 @@ impl Ebpf {
         });
     }
 
-    pub fn load_egress(iface: String, sender: kanal::Sender<Event>, terminate: Arc<AtomicBool>) {
+    pub fn load_egress(
+        iface: String,
+        notification_sender: kanal::Sender<Event>,
+        data_sender: kanal::Sender<[u8; RawPacket::LEN]>,
+        terminate: Arc<AtomicBool>,
+    ) {
         thread::spawn({
             let iface = iface.to_owned();
-            let sender = sender.clone();
+            let notification_sender = notification_sender.clone();
 
             move || {
                 let rlim = libc::rlimit {
@@ -203,7 +213,7 @@ impl Ebpf {
                         Notification::send(
                             format!("Fail to load the egress eBPF bytecode\n {}", e),
                             NotificationLevel::Error,
-                            sender,
+                            notification_sender,
                         )
                         .unwrap();
                         return;
@@ -219,7 +229,7 @@ impl Ebpf {
                         Notification::send(
                             format!("Failed to load the egress eBPF bytecode\n {}", e),
                             NotificationLevel::Error,
-                            sender,
+                            notification_sender,
                         )
                         .unwrap();
                         return;
@@ -234,7 +244,7 @@ impl Ebpf {
                     Notification::send(
                         format!("Fail to load the egress eBPF program to the kernel\n{}", e),
                         NotificationLevel::Error,
-                        sender,
+                        notification_sender,
                     )
                     .unwrap();
                     return;
@@ -247,7 +257,7 @@ impl Ebpf {
                             e
                         ),
                         NotificationLevel::Error,
-                        sender,
+                        notification_sender,
                     )
                     .unwrap();
                     return;
@@ -286,7 +296,7 @@ impl Ebpf {
                                 }
                                 let packet: [u8; RawPacket::LEN] =
                                     item.to_owned().try_into().unwrap();
-                                sender.send(Event::Packet(packet)).ok();
+                                data_sender.send(packet).ok();
                             }
                         }
                     }

diff --git a/oryx-tui/src/event.rs b/oryx-tui/src/event.rs
@@ -12,7 +12,6 @@ pub enum Event {
     Key(KeyEvent),
     Mouse(MouseEvent),
     Resize(u16, u16),
-    Packet([u8; 72]),
     Notification(Notification),
     Reset,
 }

diff --git a/oryx-tui/src/filters/fuzzy.rs b/oryx-tui/src/filters/fuzzy.rs
@@ -7,7 +7,7 @@ use tui_input::Input;
 
 use oryx_common::AppPacket;
 
-#[derive(Debug, Default)]
+#[derive(Debug, Clone, Default)]
 pub struct Fuzzy {
     enabled: bool,
     paused: bool,

diff --git a/oryx-tui/src/filters/link.rs b/oryx-tui/src/filters/link.rs
@@ -1,4 +1,7 @@
-use std::fmt::Display;
+use std::{
+    fmt::Display,
+    sync::{Arc, Mutex},
+};
 
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Flex, Layout, Rect},
@@ -15,7 +18,7 @@ pub const NB_LINK_PROTOCOL: u16 = 1;
 pub struct LinkFilter {
     pub state: TableState,
     pub selected_protocols: Vec<LinkProtocol>,
-    pub applied_protocols: Vec<LinkProtocol>,
+    pub applied_protocols: Arc<Mutex<Vec<LinkProtocol>>>,
 }
 
 #[derive(Debug, Copy, Clone, PartialEq)]
@@ -34,14 +37,15 @@ impl Default for LinkFilter {
         Self {
             state: TableState::default(),
             selected_protocols: vec![LinkProtocol::Arp],
-            applied_protocols: Vec::new(),
+            applied_protocols: Arc::new(Mutex::new(Vec::new())),
         }
     }
 }
 
 impl LinkFilter {
     pub fn apply(&mut self) {
-        self.applied_protocols = self.selected_protocols.clone();
+        let mut applied_protocols = self.applied_protocols.lock().unwrap();
+        *applied_protocols = self.selected_protocols.clone();
         self.selected_protocols.clear();
     }
 

diff --git a/oryx-tui/src/filters/network.rs b/oryx-tui/src/filters/network.rs
@@ -1,4 +1,7 @@
-use std::fmt::Display;
+use std::{
+    fmt::Display,
+    sync::{Arc, Mutex},
+};
 
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Flex, Layout, Rect},
@@ -15,7 +18,7 @@ pub const NB_NETWORK_PROTOCOL: u16 = 3;
 pub struct NetworkFilter {
     pub state: TableState,
     pub selected_protocols: Vec<NetworkProtocol>,
-    pub applied_protocols: Vec<NetworkProtocol>,
+    pub applied_protocols: Arc<Mutex<Vec<NetworkProtocol>>>,
 }
 
 impl Default for NetworkFilter {
@@ -27,7 +30,7 @@ impl Default for NetworkFilter {
                 NetworkProtocol::Ipv6,
                 NetworkProtocol::Icmp,
             ],
-            applied_protocols: Vec::new(),
+            applied_protocols: Arc::new(Mutex::new(Vec::new())),
         }
     }
 }
@@ -51,7 +54,8 @@ impl Display for NetworkProtocol {
 
 impl NetworkFilter {
     pub fn apply(&mut self) {
-        self.applied_protocols = self.selected_protocols.clone();
+        let mut applied_protocols = self.applied_protocols.lock().unwrap();
+        *applied_protocols = self.selected_protocols.clone();
         self.selected_protocols.clear();
     }
     pub fn render(&mut self, frame: &mut Frame, block: Rect, focused_block: &FocusedBlock) {

diff --git a/oryx-tui/src/filters/transport.rs b/oryx-tui/src/filters/transport.rs
@@ -1,4 +1,7 @@
-use std::fmt::Display;
+use std::{
+    fmt::Display,
+    sync::{Arc, Mutex},
+};
 
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Flex, Layout, Rect},
@@ -15,7 +18,7 @@ pub const NB_TRANSPORT_PROTOCOL: u16 = 2;
 pub struct TransportFilter {
     pub state: TableState,
     pub selected_protocols: Vec<TransportProtocol>,
-    pub applied_protocols: Vec<TransportProtocol>,
+    pub applied_protocols: Arc<Mutex<Vec<TransportProtocol>>>,
 }
 
 #[derive(Debug, Copy, Clone, PartialEq)]
@@ -38,14 +41,15 @@ impl Default for TransportFilter {
         Self {
             state: TableState::default(),
             selected_protocols: vec![TransportProtocol::TCP, TransportProtocol::UDP],
-            applied_protocols: Vec::new(),
+            applied_protocols: Arc::new(Mutex::new(Vec::new())),
         }
     }
 }
 
 impl TransportFilter {
     pub fn apply(&mut self) {
-        self.applied_protocols = self.selected_protocols.clone();
+        let mut applied_protocols = self.applied_protocols.lock().unwrap();
+        *applied_protocols = self.selected_protocols.clone();
         self.selected_protocols.clear();
     }