mirror of
https://github.com/ClementTsang/bottom.git
synced 2025-07-25 14:44:39 +02:00
Finished network polling.
This commit is contained in:
parent
ac85c42ce9
commit
8da38c061d
@ -17,10 +17,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
let mut list_of_timed_memory : Vec<mem::MemData> = Vec::new();
|
let mut list_of_timed_memory : Vec<mem::MemData> = Vec::new();
|
||||||
let mut list_of_timed_swap : Vec<mem::MemData> = Vec::new();
|
let mut list_of_timed_swap : Vec<mem::MemData> = Vec::new();
|
||||||
let mut list_of_timed_temperature : Vec<temperature::TimedTempData> = Vec::new();
|
let mut list_of_timed_temperature : Vec<temperature::TimedTempData> = Vec::new();
|
||||||
|
let mut list_of_timed_network : Vec<network::TimedNetworkData> = Vec::new();
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
println!("Start data loop...");
|
println!("Start data loop...");
|
||||||
sys.refresh_system();
|
sys.refresh_system();
|
||||||
|
sys.refresh_network();
|
||||||
|
|
||||||
// TODO: Get data, potentially store? Use a result to check!
|
// TODO: Get data, potentially store? Use a result to check!
|
||||||
let list_of_processes = processes::get_sorted_processes_list(processes::ProcessSorting::CPU, true).await;
|
let list_of_processes = processes::get_sorted_processes_list(processes::ProcessSorting::CPU, true).await;
|
||||||
@ -82,6 +84,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
list_of_timed_network.push(network::get_network_data(&sys));
|
||||||
|
if !list_of_timed_network.is_empty() {
|
||||||
|
let current_network = list_of_timed_network.last().unwrap();
|
||||||
|
println!("Network: {} rx, {} tx at {:?}", current_network.rx, current_network.tx, current_network.time);
|
||||||
|
}
|
||||||
|
|
||||||
// Send to drawing module
|
// Send to drawing module
|
||||||
println!("End data loop...");
|
println!("End data loop...");
|
||||||
window::draw_terminal();
|
window::draw_terminal();
|
||||||
|
@ -1,13 +1,16 @@
|
|||||||
|
use sysinfo::{NetworkExt, System, SystemExt};
|
||||||
|
|
||||||
pub struct TimedNetworkData {
|
pub struct TimedNetworkData {
|
||||||
pub rx : u32,
|
pub rx : u64,
|
||||||
pub tx : u32,
|
pub tx : u64,
|
||||||
pub time : std::time::SystemTime,
|
pub time : std::time::SystemTime,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_network_data() -> TimedNetworkData {
|
pub fn get_network_data(sys : &System) -> TimedNetworkData {
|
||||||
|
let network_data = sys.get_network();
|
||||||
TimedNetworkData {
|
TimedNetworkData {
|
||||||
rx : 0,
|
rx : network_data.get_income(),
|
||||||
tx : 0,
|
tx : network_data.get_outcome(),
|
||||||
time : std::time::SystemTime::now(),
|
time : std::time::SystemTime::now(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user