RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 17:45:07 +00:00
Code Issues Activity Actions

ps: Migrate from DeprecatedString to String

Browse source
This commit is contained in:
Sam Atkins 2023-05-15 15:44:16 +01:00 • committed by Andreas Kling
parent 61552415a3
commit 2b02c58cd3
1 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Userland/Utilities/ps.cpp
View file

@ -1,10 +1,12 @@
/* /*
* Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2023, Sam Atkins <atkinssj@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/QuickSort.h> #include <AK/QuickSort.h>
#include <AK/String.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/ProcessStatisticsReader.h> #include <LibCore/ProcessStatisticsReader.h>
#include <LibCore/System.h> #include <LibCore/System.h>
@ -12,20 +14,20 @@
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#include <unistd.h> #include <unistd.h>
static ErrorOr<DeprecatedString> determine_tty_pseudo_name() static ErrorOr<String> determine_tty_pseudo_name()
{ {
auto tty_stat = TRY(Core::System::fstat(STDIN_FILENO)); auto tty_stat = TRY(Core::System::fstat(STDIN_FILENO));
int tty_device_major = major(tty_stat.st_rdev); int tty_device_major = major(tty_stat.st_rdev);
int tty_device_minor = minor(tty_stat.st_rdev); int tty_device_minor = minor(tty_stat.st_rdev);
if (tty_device_major == 201) { if (tty_device_major == 201) {
return DeprecatedString::formatted("pts:{}", tty_device_minor); return String::formatted("pts:{}", tty_device_minor);
} }
if (tty_device_major == 4) { if (tty_device_major == 4) {
return DeprecatedString::formatted("tty:{}", tty_device_minor); return String::formatted("tty:{}", tty_device_minor);
} }
return "n/a"; return "n/a"_short_string;
} }
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)
@ -45,15 +47,15 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}; };
struct Column { struct Column {
DeprecatedString title; String title;
Alignment alignment { Alignment::Left }; Alignment alignment { Alignment::Left };
int width { 0 }; int width { 0 };
DeprecatedString buffer; String buffer;
}; };
bool every_process_flag = false; bool every_process_flag = false;
bool full_format_flag = false; bool full_format_flag = false;
DeprecatedString pid_list; StringView pid_list;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_option(every_process_flag, "Show every process", nullptr, 'e'); args_parser.add_option(every_process_flag, "Show every process", nullptr, 'e');
@ -78,18 +80,18 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}; };
if (full_format_flag) { if (full_format_flag) {
uid_column = add_column("UID", Alignment::Left); uid_column = add_column("UID"_short_string, Alignment::Left);
pid_column = add_column("PID", Alignment::Right); pid_column = add_column("PID"_short_string, Alignment::Right);
ppid_column = add_column("PPID", Alignment::Right); ppid_column = add_column("PPID"_short_string, Alignment::Right);
pgid_column = add_column("PGID", Alignment::Right); pgid_column = add_column("PGID"_short_string, Alignment::Right);
sid_column = add_column("SID", Alignment::Right); sid_column = add_column("SID"_short_string, Alignment::Right);
state_column = add_column("STATE", Alignment::Left); state_column = add_column("STATE"_short_string, Alignment::Left);
tty_column = add_column("TTY", Alignment::Left); tty_column = add_column("TTY"_short_string, Alignment::Left);
cmd_column = add_column("CMD", Alignment::Left); cmd_column = add_column("CMD"_short_string, Alignment::Left);
} else { } else {
pid_column = add_column("PID", Alignment::Right); pid_column = add_column("PID"_short_string, Alignment::Right);
tty_column = add_column("TTY", Alignment::Left); tty_column = add_column("TTY"_short_string, Alignment::Left);
cmd_column = add_column("CMD", Alignment::Left); cmd_column = add_column("CMD"_short_string, Alignment::Left);
} }
auto all_processes = TRY(Core::ProcessStatisticsReader::get_all()); auto all_processes = TRY(Core::ProcessStatisticsReader::get_all());
@ -124,44 +126,44 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
quick_sort(processes, [](auto& a, auto& b) { return a.pid < b.pid; }); quick_sort(processes, [](auto& a, auto& b) { return a.pid < b.pid; });
} }
Vector<Vector<DeprecatedString>> rows; Vector<Vector<String>> rows;
TRY(rows.try_ensure_capacity(1 + processes.size())); TRY(rows.try_ensure_capacity(1 + processes.size()));
Vector<DeprecatedString> header; Vector<String> header;
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.append(move(header));
for (auto const& process : processes) { for (auto const& process : processes) {
auto tty = process.tty; auto tty = TRY(String::from_deprecated_string(process.tty));
if (!every_process_flag && tty != this_pseudo_tty_name) if (!every_process_flag && tty != this_pseudo_tty_name)
continue; continue;
auto* state = process.threads.is_empty() ? "Zombie" : process.threads.first().state.characters(); Vector<String> row;
Vector<DeprecatedString> row;
TRY(row.try_resize(columns.size())); TRY(row.try_resize(columns.size()));
if (tty == "") if (tty == "")
tty = "n/a"; tty = "n/a"_short_string;
if (uid_column != -1) if (uid_column != -1)
row[uid_column] = process.username; row[uid_column] = TRY(String::from_deprecated_string(process.username));
if (pid_column != -1) if (pid_column != -1)
row[pid_column] = DeprecatedString::number(process.pid); row[pid_column] = TRY(String::number(process.pid));
if (ppid_column != -1) if (ppid_column != -1)
row[ppid_column] = DeprecatedString::number(process.ppid); row[ppid_column] = TRY(String::number(process.ppid));
if (pgid_column != -1) if (pgid_column != -1)
row[pgid_column] = DeprecatedString::number(process.pgid); row[pgid_column] = TRY(String::number(process.pgid));
if (sid_column != -1) if (sid_column != -1)
row[sid_column] = DeprecatedString::number(process.sid); row[sid_column] = TRY(String::number(process.sid));
if (tty_column != -1) if (tty_column != -1)
row[tty_column] = tty; row[tty_column] = tty;
if (state_column != -1) if (state_column != -1)
row[state_column] = state; row[state_column] = process.threads.is_empty()
? "Zombie"_short_string
: TRY(String::from_deprecated_string(process.threads.first().state));
if (cmd_column != -1) if (cmd_column != -1)
row[cmd_column] = process.name; row[cmd_column] = TRY(String::from_deprecated_string(process.name));
TRY(rows.try_append(move(row))); TRY(rows.try_append(move(row)));
} }
@ -169,7 +171,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
for (size_t i = 0; i < columns.size(); i++) { for (size_t i = 0; i < columns.size(); i++) {
auto& column = columns[i]; auto& column = columns[i];
for (auto& row : rows) for (auto& row : rows)
column.width = max(column.width, static_cast<int>(row[i].length())); column.width = max(column.width, static_cast<int>(row[i].code_points().length()));
} }
for (auto& row : rows) { for (auto& row : rows) {