Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(process-list): Always continue top stream #779

Merged
merged 1 commit into from
Jan 3, 2024
Merged

fix(process-list): Always continue top stream #779

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
93 changes: 46 additions & 47 deletions src/model/process_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,56 +72,55 @@ mod imp {
utils::run_stream(
processes_source,
move |top_source| top_source.stream(),
clone!(@weak obj => @default-return glib::ControlFlow::Break, move |result: podman::Result<ProcessFields>| match result {
Ok(process_fields) => {
let to_remove = obj
.imp()
.list
.borrow()
.keys()
.filter(|pid| {
!process_fields
.iter()
.any(|process_field| &process_field[1] == *pid)
})
.cloned()
.collect::<Vec<_>>();
to_remove.iter().for_each(|pid| {
obj.remove(pid);
});

process_fields.into_iter().for_each(|process_field| {
use indexmap::map::Entry;

let mut list = obj.imp().list.borrow_mut();
let index = list.len() as u32;

match list.entry(process_field[1].clone()) {
Entry::Vacant(e) => {
let process =
model::Process::new(&obj, process_field.as_slice());
e.insert(process.clone());

drop(list);

obj.items_changed(index, 0, 1);
clone!(@weak obj => @default-return glib::ControlFlow::Break, move |result: podman::Result<ProcessFields>| {
match result {
Ok(process_fields) => {
let to_remove = obj
.imp()
.list
.borrow()
.keys()
.filter(|pid| {
!process_fields
.iter()
.any(|process_field| &process_field[1] == *pid)
})
.cloned()
.collect::<Vec<_>>();
to_remove.iter().for_each(|pid| {
obj.remove(pid);
});

process_fields.into_iter().for_each(|process_field| {
use indexmap::map::Entry;

let mut list = obj.imp().list.borrow_mut();
let index = list.len() as u32;

match list.entry(process_field[1].clone()) {
Entry::Vacant(e) => {
let process =
model::Process::new(&obj, process_field.as_slice());
e.insert(process.clone());

drop(list);

obj.items_changed(index, 0, 1);
}
Entry::Occupied(e) => {
let process = e.get().clone();
drop(list);
process.update(process_field.as_slice());
}
}
Entry::Occupied(e) => {
let process = e.get().clone();
drop(list);
process.update(process_field.as_slice());
}
}
});

obj.emit_by_name::<()>("updated", &[]);
});

glib::ControlFlow::Continue
}
Err(e) => {
log::warn!("Stopping top stream due to error: {e}");
glib::ControlFlow::Break
obj.emit_by_name::<()>("updated", &[]);
}
Err(e) => log::warn!("Failed to read top stream element: {e}"),
}

glib::ControlFlow::Continue
}),
);
}
Expand Down
Loading