RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:18:11 +00:00
Code Issues Activity Actions

Utilities: Make sure columns for ps are properly aligned

Browse source 
This updates ps so that it calculates the ideal column width instead
of relying on hard-coded values. Previously the STATE column was too
small to fit the state for "FinalizerTask".
This commit is contained in:
Gunnar Beutner 2021-06-03 17:08:03 +02:00 • committed by Andreas Kling
parent 5bbca2fa8b
commit bc174b0fd0
1 changed files with 59 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

99
Userland/Utilities/ps.cpp
View file

@ -65,45 +65,39 @@ int main(int argc, char** argv)
int tty_column = -1; int tty_column = -1;
int cmd_column = -1; int cmd_column = -1;
auto add_column = [&](auto title, auto alignment, auto width) { auto add_column = [&](auto title, auto alignment) {
columns.append({ title, alignment, width, {} }); columns.append({ title, alignment, 0, {} });
return columns.size() - 1; return columns.size() - 1;
}; };
if (full_format_flag) { if (full_format_flag) {
uid_column = add_column("UID", Alignment::Left, 9); uid_column = add_column("UID", Alignment::Left);
pid_column = add_column("PID", Alignment::Right, 5); pid_column = add_column("PID", Alignment::Right);
ppid_column = add_column("PPID", Alignment::Right, 5); ppid_column = add_column("PPID", Alignment::Right);
state_column = add_column("STATE", Alignment::Left, 12); state_column = add_column("STATE", Alignment::Left);
tty_column = add_column("TTY", Alignment::Left, 6); tty_column = add_column("TTY", Alignment::Left);
cmd_column = add_column("CMD", Alignment::Left, 0); cmd_column = add_column("CMD", Alignment::Left);
} else { } else {
pid_column = add_column("PID", Alignment::Right, 5); pid_column = add_column("PID", Alignment::Right);
tty_column = add_column("TTY", Alignment::Left, 6); tty_column = add_column("TTY", Alignment::Left);
cmd_column = add_column("CMD", Alignment::Left, 0); cmd_column = add_column("CMD", Alignment::Left);
} }
auto print_column = [](auto& column, auto& string) {
if (!column.width) {
out("{}", string);
return;
}
if (column.alignment == Alignment::Right)
out("{1:>{0}} ", column.width, string);
else
out("{1:{0}} ", column.width, string);
};
for (auto& column : columns)
print_column(column, column.title);
outln();
auto processes = Core::ProcessStatisticsReader::get_all(); auto processes = Core::ProcessStatisticsReader::get_all();
if (!processes.has_value()) if (!processes.has_value())
return 1; return 1;
quick_sort(processes.value(), [](auto& a, auto& b) { return a.pid < b.pid; }); quick_sort(processes.value(), [](auto& a, auto& b) { return a.pid < b.pid; });
Vector<Vector<String>> rows;
rows.ensure_capacity(1 + processes.value().size());
Vector<String> header;
header.ensure_capacity(columns.size());
for (auto& column : columns)
header.append(column.title);
rows.append(move(header));
for (auto const& process : processes.value()) { for (auto const& process : processes.value()) {
auto tty = process.tty; auto tty = process.tty;
@ -117,21 +111,46 @@ int main(int argc, char** argv)
auto* state = process.threads.is_empty() ? "Zombie" : process.threads.first().state.characters(); auto* state = process.threads.is_empty() ? "Zombie" : process.threads.first().state.characters();
if (uid_column != -1) Vector<String> row;
columns[uid_column].buffer = process.username; row.resize(columns.size());
if (pid_column != -1)
columns[pid_column].buffer = String::number(process.pid);
if (ppid_column != -1)
columns[ppid_column].buffer = String::number(process.ppid);
if (tty_column != -1)
columns[tty_column].buffer = tty;
if (state_column != -1)
columns[state_column].buffer = state;
if (cmd_column != -1)
columns[cmd_column].buffer = process.name;
for (auto& column : columns) if (uid_column != -1)
print_column(column, column.buffer); row[uid_column] = process.username;
if (pid_column != -1)
row[pid_column] = String::number(process.pid);
if (ppid_column != -1)
row[ppid_column] = String::number(process.ppid);
if (tty_column != -1)
row[tty_column] = tty;
if (state_column != -1)
row[state_column] = state;
if (cmd_column != -1)
row[cmd_column] = process.name;
rows.append(move(row));
}
for (size_t i = 0; i < columns.size(); i++) {
auto& column = columns[i];
for (auto& row : rows)
column.width = max(column.width, static_cast<int>(row[i].length()));
}
for (auto& row : rows) {
for (size_t i = 0; i < columns.size(); i++) {
auto& column = columns[i];
auto& cell_text = row[i];
if (!column.width) {
out("{}", cell_text);
continue;
}
if (column.alignment == Alignment::Right)
out("{1:>{0}} ", column.width, cell_text);
else
out("{1:{0}} ", column.width, cell_text);
if (i != columns.size() - 1)
out(" ");
}
outln(); outln();
} }