Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion crates/psh-system/src/disk/handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ impl DiskHandle {
}

pub fn stat(&self, interval: Option<Duration>) -> Result<Vec<DiskStat>> {
self.0.get(interval)
self.0
.get(interval)
// remove loop* devices from results
.map(|stats| {
stats
.into_iter()
.filter(|stat| !stat.name.starts_with("loop"))
.collect()
})
}
}
16 changes: 15 additions & 1 deletion crates/psh-system/src/network/handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,20 @@ impl NetworkHandle {
}

pub fn stat(&self, interval: Option<Duration>) -> Result<HashMap<String, DeviceStatus>> {
self.0.get(interval)
self.0.get(interval).map(|stats| {
stats
.into_iter()
.filter(|(dev, _)| {
!(dev == "lo"
// TODO: docker network interface statistics may be useful
|| dev.starts_with("docker")
|| dev.starts_with("veth")
|| dev.starts_with("br-")
|| dev.starts_with("virbr")
|| dev.starts_with("tun")
|| dev.starts_with("tap"))
})
.collect()
})
}
}
19 changes: 5 additions & 14 deletions crates/psh-system/src/rps/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ fn parse_queue_impl(dir: fs::DirEntry) -> Option<RpsQueue> {

fn parse_device_impl(dir: fs::DirEntry) -> Option<RpsDetails> {
let dev_path = dir.path();
// Check if device file exists
if !dev_path.join("device").exists() {
return None;
}
let cur_path = dev_path.join("queues");
match (dev_path.file_name(), fs::read_dir(cur_path)) {
(Some(dev_name), Ok(rx_list)) => {
Expand Down Expand Up @@ -78,20 +82,7 @@ mod tests {
rps_path.push("./test_resources/arch/x86_64/intel/net");
let result = parse_rps_impl(rps_path.to_str().unwrap());

assert_eq!(result.len(), 3);

let rps_lo = result.iter().find(|rps| rps.dev == "lo");
assert_eq!(
rps_lo,
Some(&RpsDetails {
dev: "lo".to_string(),
queues: vec![RpsQueue {
name: "rx-0".to_string(),
cpus: Some(CpuMask(vec![false; 20])),
flow_cnt: Some(0),
}]
})
);
assert_eq!(result.len(), 2);

let rps_enp3s0 = result.iter().find(|rps| rps.dev == "enp3s0");
assert_eq!(
Expand Down
Loading