Merge pull request #531 from Bluemangoo/feature/top-tui-i

top: tui impl `I` (irix or solaris)

Author: cakebaker

src/uu/top/src/picker.rs

@@ -223,13 +223,19 @@ fn todo(_pid: u32, _stat: Stat) -> Box<dyn Column> {
     Box::new("TODO".to_string())
 }
 
-fn cpu(pid: u32, _stat: Stat) -> Box<dyn Column> {
+fn cpu(pid: u32, stat: Stat) -> Box<dyn Column> {
     let binding = sysinfo().read().unwrap();
     let Some(proc) = binding.process(Pid::from_u32(pid)) else {
         return PercentValue::new_boxed(0.0);
     };
 
-    PercentValue::new_boxed(proc.cpu_usage())
+    let cpu_usage = if stat.1.irix_mode {
+        proc.cpu_usage()
+    } else {
+        proc.cpu_usage() / binding.cpus().len() as f32
+    };
+
+    PercentValue::new_boxed(cpu_usage)
 }
 
 fn pid(pid: u32, _stat: Stat) -> Box<dyn Column> {

src/uu/top/src/top.rs

@@ -121,7 +121,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
             {
                 let header = Header::new(&tui_stat.read().unwrap());
                 let proc_list = ProcList::new(&settings, &tui_stat.read().unwrap());
-                tui_stat.write().unwrap().input_error = None;
+                tui_stat.write().unwrap().input_message = None;
                 *data.write().unwrap() = (header, proc_list);
                 should_update.store(true, Ordering::Relaxed);
             }

src/uu/top/src/tui/input.rs

@@ -74,6 +74,19 @@ pub fn handle_input(
                 data.write().unwrap().1 = ProcList::new(settings, &tui_stat.read().unwrap());
                 should_update.store(true, Ordering::Relaxed);
             }
+            char!('I') => {
+                {
+                    let mut stat = tui_stat.write().unwrap();
+                    stat.irix_mode = !stat.irix_mode;
+                    stat.input_message = Some(format!(
+                        " Irix mode {} ",
+                        if stat.irix_mode { "On" } else { "Off" }
+                    ));
+                }
+
+                data.write().unwrap().1 = ProcList::new(settings, &tui_stat.read().unwrap());
+                should_update.store(true, Ordering::Relaxed);
+            }
             char!('l') => {
                 let mut stat = tui_stat.write().unwrap();
                 stat.show_load_avg = !stat.show_load_avg;
@@ -303,7 +316,7 @@ fn handle_input_value(
             if input_value.is_err() {
                 let mut stat = tui_stat.write().unwrap();
                 stat.reset_input();
-                stat.input_error = Some(" invalid number ".into());
+                stat.input_message = Some(" invalid number ".into());
                 should_update.store(true, Ordering::Relaxed);
                 return;
             }
@@ -323,7 +336,7 @@ fn handle_input_value(
             {
                 let mut stat = tui_stat.write().unwrap();
                 stat.reset_input();
-                stat.input_error = Some(" invalid numa node ".into());
+                stat.input_message = Some(" invalid numa node ".into());
                 should_update.store(true, Ordering::Relaxed);
                 return;
             }
@@ -350,7 +363,7 @@ fn handle_input_value(
                 Err(_) => {
                     let mut stat = tui_stat.write().unwrap();
                     stat.reset_input();
-                    stat.input_error = Some(" invalid user ".into());
+                    stat.input_message = Some(" invalid user ".into());
                     should_update.store(true, Ordering::Relaxed);
                     return;
                 }

src/uu/top/src/tui/mod.rs

@@ -354,7 +354,7 @@ impl<'a> Tui<'a> {
 
     fn render_input(&self, area: Rect, buf: &mut Buffer) {
         let colorful = self.stat.colorful;
-        if let Some(v) = self.stat.input_error.as_ref() {
+        if let Some(v) = self.stat.input_message.as_ref() {
             let layout = Layout::new(
                 Direction::Horizontal,
                 [Constraint::Length(v.len() as u16), Constraint::Fill(1)],

src/uu/top/src/tui/stat.rs

@@ -11,7 +11,7 @@ pub(crate) struct TuiStat {
     pub input_mode: InputMode,
     pub input_label: String,
     pub input_value: String,
-    pub input_error: Option<String>,
+    pub input_message: Option<String>, // Info or error
 
     pub show_load_avg: bool,
     pub cpu_graph_mode: CpuGraphMode,
@@ -30,6 +30,7 @@ pub(crate) struct TuiStat {
     pub highlight_bold: bool,
     pub show_coordinates: bool,
     pub show_zeros: bool,
+    pub irix_mode: bool,
 
     pub filter: Option<crate::Filter>,
 }
@@ -47,7 +48,7 @@ impl TuiStat {
             input_mode: InputMode::Command,
             input_label: String::new(),
             input_value: String::new(),
-            input_error: None,
+            input_message: None,
 
             show_load_avg: true,
             cpu_graph_mode: CpuGraphMode::default(),
@@ -66,6 +67,7 @@ impl TuiStat {
             highlight_bold: false,
             show_coordinates: false,
             show_zeros: true,
+            irix_mode: true,
 
             filter: None,
         }
@@ -75,7 +77,7 @@ impl TuiStat {
         self.input_mode = InputMode::Command;
         self.input_label.clear();
         self.input_value.clear();
-        self.input_error = None;
+        self.input_message = None;
     }
 }