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

feature: Adds tree view #223

Merged
merged 21 commits into from
Sep 7, 2020
Merged

feature: Adds tree view #223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6df7014
Add back highlighting to CPU legend if not focused
ClementTsang Sep 3, 2020
8c4ea05
Get *very* basic tree-mode working
ClementTsang Sep 4, 2020
94d9267
Fix husky
ClementTsang Sep 4, 2020
d4d489a
Dang conflicts
ClementTsang Sep 4, 2020
8023f11
Merge branch 'master' into forestry
ClementTsang Sep 4, 2020
94dfafe
Add some comments to taste
ClementTsang Sep 4, 2020
7f7c8ee
Switch to using pid_t
ClementTsang Sep 4, 2020
cf8c01c
Apparently windows doesn't like that
ClementTsang Sep 4, 2020
c2b6065
Rudimentary trees work and look ok...
ClementTsang Sep 4, 2020
86f921e
Fix line generation, basic version of filtering
ClementTsang Sep 5, 2020
e44c025
Now we have sorting in tree mode
ClementTsang Sep 6, 2020
78046b3
Windows implementation
ClementTsang Sep 6, 2020
d8cc0b3
Let sort apply to top level as well
ClementTsang Sep 6, 2020
f442c50
attempt to fix conflict
ClementTsang Sep 6, 2020
243a743
Simplify tree orphan step
ClementTsang Sep 6, 2020
53ad270
Merge branch 'master' into forestry
ClementTsang Sep 6, 2020
5a403e1
Fix merge error
ClementTsang Sep 6, 2020
9ab2f2d
Update docs
ClementTsang Sep 6, 2020
0229261
Update changelog
ClementTsang Sep 7, 2020
d43b913
Update widths for now
ClementTsang Sep 7, 2020
3aba4b4
Fix sort being reversed for trees
ClementTsang Sep 7, 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
Prev Previous commit
Next Next commit
Let sort apply to top level as well
  • Loading branch information
@ClementTsang
ClementTsang committed Sep 6, 2020
commit d8cc0b35d0af82669fd520d3af27ba2e368c6279
2 changes: 1 addition & 1 deletion src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ impl App {
proc_widget_state.is_tree_mode = !proc_widget_state.is_tree_mode;

if proc_widget_state.is_tree_mode {
// We enabled... set PID sort type to descending.
// We enabled... set PID sort type to ascending.
proc_widget_state.process_sorting_type = processes::ProcessSorting::Pid;
proc_widget_state.is_process_sort_descending = false;
}
Expand Down
170 changes: 93 additions & 77 deletions src/data_conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,91 +601,98 @@ pub fn tree_process_data(
}

// Now let's sort the immediate children!
match sort_type {
ProcessSorting::CpuPercent => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(
a.1.cpu_percent_usage,
b.1.cpu_percent_usage,
is_sort_descending,
)
});
}
ProcessSorting::Mem => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(
a.1.mem_usage_bytes,
b.1.mem_usage_bytes,
is_sort_descending,
)
});
}
ProcessSorting::MemPercent => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(
a.1.mem_percent_usage,
b.1.mem_percent_usage,
is_sort_descending,
)
});
}
ProcessSorting::ProcessName => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(
&a.1.name.to_lowercase(),
&b.1.name.to_lowercase(),
is_sort_descending,
)
});
}
ProcessSorting::Command => to_sort_vec.sort_by(|a, b| {
sort_vec(&mut to_sort_vec, sort_type, is_sort_descending);

if let Some(current_mapping) = parent_child_mapping.get_mut(&current_pid) {
*current_mapping = to_sort_vec
.iter()
.map(|(pid, _proc)| *pid)
.collect::<IndexSet<Pid>>();
}
}
}

fn sort_vec(
to_sort_vec: &mut Vec<(Pid, &ConvertedProcessData)>, sort_type: &ProcessSorting,
is_sort_descending: bool,
) {
match sort_type {
ProcessSorting::CpuPercent => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(
&a.1.command.to_lowercase(),
&b.1.command.to_lowercase(),
a.1.cpu_percent_usage,
b.1.cpu_percent_usage,
is_sort_descending,
)
}),
ProcessSorting::Pid => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(a.1.pid, b.1.pid, is_sort_descending)
});
}
ProcessSorting::ReadPerSecond => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(a.1.rps_f64, b.1.rps_f64, is_sort_descending)
});
}
ProcessSorting::WritePerSecond => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(a.1.wps_f64, b.1.wps_f64, is_sort_descending)
});
}
ProcessSorting::TotalRead => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(a.1.tr_f64, b.1.tr_f64, is_sort_descending)
});
}
ProcessSorting::TotalWrite => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(a.1.tw_f64, b.1.tw_f64, is_sort_descending)
});
}
ProcessSorting::State => to_sort_vec.sort_by(|a, b| {
});
}
ProcessSorting::Mem => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(
&a.1.process_state.to_lowercase(),
&b.1.process_state.to_lowercase(),
a.1.mem_usage_bytes,
b.1.mem_usage_bytes,
is_sort_descending,
)
}),
ProcessSorting::Count => {}
});
}

if let Some(current_mapping) = parent_child_mapping.get_mut(&current_pid) {
*current_mapping = to_sort_vec
.iter()
.map(|(pid, _proc)| *pid)
.collect::<IndexSet<Pid>>();
ProcessSorting::MemPercent => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(
a.1.mem_percent_usage,
b.1.mem_percent_usage,
is_sort_descending,
)
});
}
ProcessSorting::ProcessName => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(
&a.1.name.to_lowercase(),
&b.1.name.to_lowercase(),
is_sort_descending,
)
});
}
ProcessSorting::Command => to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(
&a.1.command.to_lowercase(),
&b.1.command.to_lowercase(),
is_sort_descending,
)
}),
ProcessSorting::Pid => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(a.1.pid, b.1.pid, is_sort_descending)
});
}
ProcessSorting::ReadPerSecond => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(a.1.rps_f64, b.1.rps_f64, is_sort_descending)
});
}
ProcessSorting::WritePerSecond => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(a.1.wps_f64, b.1.wps_f64, is_sort_descending)
});
}
ProcessSorting::TotalRead => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(a.1.tr_f64, b.1.tr_f64, is_sort_descending)
});
}
ProcessSorting::TotalWrite => {
to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(a.1.tw_f64, b.1.tw_f64, is_sort_descending)
});
}
ProcessSorting::State => to_sort_vec.sort_by(|a, b| {
utils::gen_util::get_ordering(
&a.1.process_state.to_lowercase(),
&b.1.process_state.to_lowercase(),
is_sort_descending,
)
}),
ProcessSorting::Count => {}
}
}

Expand Down Expand Up @@ -740,6 +747,15 @@ pub fn tree_process_data(
(explored_pids, lines)
}

let mut to_sort_vec = Vec::new();
for pid in pids_to_explore {
if let Some(process) = pid_process_mapping.get(&pid) {
to_sort_vec.push((pid, *process));
}
}
sort_vec(&mut to_sort_vec, sort_type, is_sort_descending);
pids_to_explore = to_sort_vec.iter().map(|(pid, _proc)| *pid).collect();

while let Some(current_pid) = pids_to_explore.pop_front() {
if !prune_disabled_pids(current_pid, &mut parent_child_mapping, &pid_process_mapping) {
sort_remaining_pids(
Expand Down