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

ps: Ensure columns capacity in advance

Browse source 
Also use unchecked_append() in a couple of other places where we can.
This commit is contained in:
Sam Atkins 2023-05-14 13:16:49 +01:00 • committed by Andreas Kling
parent 2b02c58cd3
commit e6f7b828c3
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Utilities/ps.cpp
View file

@ -75,11 +75,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
int cmd_column = -1; int cmd_column = -1;
auto add_column = [&](auto title, auto alignment) { auto add_column = [&](auto title, auto alignment) {
columns.append({ title, alignment, 0, {} }); columns.unchecked_append({ title, alignment, 0, {} });
return columns.size() - 1; return columns.size() - 1;
}; };
if (full_format_flag) { if (full_format_flag) {
TRY(columns.try_ensure_capacity(8));
uid_column = add_column("UID"_short_string, Alignment::Left); uid_column = add_column("UID"_short_string, Alignment::Left);
pid_column = add_column("PID"_short_string, Alignment::Right); pid_column = add_column("PID"_short_string, Alignment::Right);
ppid_column = add_column("PPID"_short_string, Alignment::Right); ppid_column = add_column("PPID"_short_string, Alignment::Right);
@ -89,6 +90,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
tty_column = add_column("TTY"_short_string, Alignment::Left); tty_column = add_column("TTY"_short_string, Alignment::Left);
cmd_column = add_column("CMD"_short_string, Alignment::Left); cmd_column = add_column("CMD"_short_string, Alignment::Left);
} else { } else {
TRY(columns.try_ensure_capacity(3));
pid_column = add_column("PID"_short_string, Alignment::Right); pid_column = add_column("PID"_short_string, Alignment::Right);
tty_column = add_column("TTY"_short_string, Alignment::Left); tty_column = add_column("TTY"_short_string, Alignment::Left);
cmd_column = add_column("CMD"_short_string, Alignment::Left); cmd_column = add_column("CMD"_short_string, Alignment::Left);
@ -133,7 +135,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(header.try_ensure_capacity(columns.size())); TRY(header.try_ensure_capacity(columns.size()));
for (auto& column : columns) for (auto& column : columns)
header.unchecked_append(column.title); header.unchecked_append(column.title);
rows.append(move(header)); rows.unchecked_append(move(header));
for (auto const& process : processes) { for (auto const& process : processes) {
auto tty = TRY(String::from_deprecated_string(process.tty)); auto tty = TRY(String::from_deprecated_string(process.tty));
@ -165,7 +167,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
if (cmd_column != -1) if (cmd_column != -1)
row[cmd_column] = TRY(String::from_deprecated_string(process.name)); row[cmd_column] = TRY(String::from_deprecated_string(process.name));
TRY(rows.try_append(move(row))); rows.unchecked_append(move(row));
} }
for (size_t i = 0; i < columns.size(); i++) { for (size_t i = 0; i < columns.size(); i++) {