RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:47:36 +00:00
Code Issues Activity Actions

Applets: Use new global variables at /sys/kernel/ directory

Browse source
This commit is contained in:
Liav A 2022-10-14 21:54:16 +03:00 • committed by Andrew Kaster
parent ec96aee8e3
commit 6e508573a0
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applets/Audio/main.cpp
View file

@ -243,7 +243,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Config::pledge_domain("AudioApplet");
TRY(Core::System::unveil("/tmp/session/%sid/portal/audio", "rw"));
TRY(Core::System::unveil("/res", "r"));
TRY(Core::System::unveil("/proc/all", "r"));
TRY(Core::System::unveil("/sys/kernel/processes", "r"));
TRY(Core::System::unveil(nullptr, nullptr));
auto window = TRY(GUI::Window::try_create());

8
Userland/Applets/Network/main.cpp
View file

@ -107,15 +107,15 @@ private:
{
StringBuilder adapter_info;
auto file_or_error = Core::Stream::File::open("/proc/net/adapters"sv, Core::Stream::OpenMode::Read);
auto file_or_error = Core::Stream::File::open("/sys/kernel/net/adapters"sv, Core::Stream::OpenMode::Read);
if (file_or_error.is_error()) {
dbgln("Error: Could not open /proc/net/adapters: {}", file_or_error.error());
dbgln("Error: Could not open /sys/kernel/net/adapters: {}", file_or_error.error());
return "";
}
auto file_contents_or_error = file_or_error.value()->read_all();
if (file_contents_or_error.is_error()) {
dbgln("Error: Could not read /proc/net/adapters: {}", file_contents_or_error.error());
dbgln("Error: Could not read /sys/kernel/net/adapters: {}", file_contents_or_error.error());
return "";
}
@ -168,7 +168,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::unveil("/tmp/session/%sid/portal/notify", "rw"));
TRY(Core::System::unveil("/res", "r"));
TRY(Core::System::unveil("/proc/net/adapters", "r"));
TRY(Core::System::unveil("/sys/kernel/net/adapters", "r"));
TRY(Core::System::unveil("/bin/SystemMonitor", "x"));
TRY(Core::System::unveil(nullptr, nullptr));

12
Userland/Applets/ResourceGraph/main.cpp
View file

@ -162,7 +162,7 @@ private:
total = 0;
idle = 0;
auto json = get_data_as_json(m_proc_stat, "/proc/stat"sv);
auto json = get_data_as_json(m_proc_stat, "/sys/kernel/stats"sv);
if (json.is_error())
return false;
@ -174,7 +174,7 @@ private:
bool get_memory_usage(u64& allocated, u64& available)
{
auto json = get_data_as_json(m_proc_mem, "/proc/memstat"sv);
auto json = get_data_as_json(m_proc_mem, "/sys/kernel/memstat"sv);
if (json.is_error())
return false;
@ -196,7 +196,7 @@ private:
{
tx = rx = link_speed = 0;
auto json = get_data_as_json(m_proc_net, "/proc/net/adapters"sv);
auto json = get_data_as_json(m_proc_net, "/sys/kernel/net/adapters"sv);
if (json.is_error())
return false;
@ -291,9 +291,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(create_applet(GraphType::Network, network));
TRY(Core::System::unveil("/res", "r"));
TRY(Core::System::unveil("/proc/stat", "r"));
TRY(Core::System::unveil("/proc/memstat", "r"));
TRY(Core::System::unveil("/proc/net/adapters", "r"));
TRY(Core::System::unveil("/sys/kernel/stats", "r"));
TRY(Core::System::unveil("/sys/kernel/memstat", "r"));
TRY(Core::System::unveil("/sys/kernel/net/adapters", "r"));
TRY(Core::System::unveil("/bin/SystemMonitor", "x"));
TRY(Core::System::unveil(nullptr, nullptr));