Skip to content
This repository was archived by the owner on Aug 29, 2020. It is now read-only.

[memory] Handle hosts without swap. #41

Open
rillian wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[memory] Handle hosts without swap. #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cee858e
[memory] Handle hosts without swap.
rillian Feb 19, 2020
d262227
[memory] Fix formatting.
rillian Feb 19, 2020
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
34 changes: 20 additions & 14 deletions src/widgets/mem.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,32 +68,38 @@ impl UpdatableWidget for MemWidget<'_> {
self.update_count += 1;

let main = memory::virtual_memory().unwrap();
let swap = memory::swap_memory().unwrap();
let swap = memory::swap_memory().ok();

self.main.total = main.total();
self.main.used = main.used();
self.main
.percents
.push((self.update_count as f64, main.percent().into()));

if swap.total() == 0 {
self.swap = None;
} else {
if self.swap.is_none() {
self.swap = Some(MemData::default());
match swap {
None => {
self.swap = None;
}
Some(swap) if swap.total() == 0 => {
self.swap = None;
}
Some(swap) => {
if self.swap.is_none() {
self.swap = Some(MemData::default());
self.swap
.as_mut()
.unwrap()
.percents
.push((self.update_count as f64 - 1.0, 0.0));
}
self.swap.as_mut().unwrap().total = swap.total();
self.swap.as_mut().unwrap().used = swap.used();
self.swap
.as_mut()
.unwrap()
.percents
.push((self.update_count as f64 - 1.0, 0.0));
.push((self.update_count as f64, swap.percent().into()));
}
self.swap.as_mut().unwrap().total = swap.total();
self.swap.as_mut().unwrap().used = swap.used();
self.swap
.as_mut()
.unwrap()
.percents
.push((self.update_count as f64, swap.percent().into()));
}
}

Expand Down