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

Applets/ResourceGraph: Port to LibMain :^)

Browse source 
This simplifies a bunch of calls to pledge() and unveil().
This commit is contained in:
Andreas Kling 2021-11-22 23:35:23 +01:00
parent d0db6c472c
commit b65a039db7
2 changed files with 13 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applets/ResourceGraph/CMakeLists.txt
View file

@ -9,4 +9,4 @@ set(SOURCES
) )
serenity_bin(ResourceGraph.Applet) serenity_bin(ResourceGraph.Applet)
target_link_libraries(ResourceGraph.Applet LibGUI LibCore LibGfx) target_link_libraries(ResourceGraph.Applet LibGUI LibCore LibGfx LibMain)

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

@ -14,6 +14,8 @@
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibGfx/Palette.h> #include <LibGfx/Palette.h>
#include <LibMain/Main.h>
#include <LibSystem/Wrappers.h>
#include <serenity.h> #include <serenity.h>
#include <spawn.h> #include <spawn.h>
#include <stdio.h> #include <stdio.h>
@ -181,26 +183,20 @@ private:
RefPtr<Core::File> m_proc_mem; RefPtr<Core::File> m_proc_mem;
}; };
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (pledge("stdio recvfd sendfd proc exec rpath unix", nullptr) < 0) { TRY(System::pledge("stdio recvfd sendfd proc exec rpath unix", nullptr));
perror("pledge");
return 1;
}
auto app = GUI::Application::construct(argc, argv); auto app = GUI::Application::construct(arguments.argc, arguments.argv);
if (pledge("stdio recvfd sendfd proc exec rpath", nullptr) < 0) { TRY(System::pledge("stdio recvfd sendfd proc exec rpath", nullptr));
perror("pledge");
return 1;
}
const char* cpu = nullptr; const char* cpu = nullptr;
const char* memory = nullptr; const char* memory = nullptr;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_option(cpu, "Create CPU graph", "cpu", 'C', "cpu"); args_parser.add_option(cpu, "Create CPU graph", "cpu", 'C', "cpu");
args_parser.add_option(memory, "Create memory graph", "memory", 'M', "memory"); args_parser.add_option(memory, "Create memory graph", "memory", 'M', "memory");
args_parser.parse(argc, argv); args_parser.parse(arguments.argc, arguments.argv);
if (!cpu && !memory) { if (!cpu && !memory) {
printf("At least one of --cpu or --memory must be used"); printf("At least one of --cpu or --memory must be used");
@ -235,27 +231,11 @@ int main(int argc, char** argv)
if (memory) if (memory)
create_applet(GraphType::Memory, memory); create_applet(GraphType::Memory, memory);
if (unveil("/res", "r") < 0) { TRY(System::unveil("/res", "r"));
perror("unveil"); TRY(System::unveil("/proc/stat", "r"));
return 1; TRY(System::unveil("/proc/memstat", "r"));
} TRY(System::unveil("/bin/SystemMonitor", "x"));
TRY(System::unveil(nullptr, nullptr));
if (unveil("/proc/stat", "r") < 0) {
perror("unveil");
return 1;
}
if (unveil("/proc/memstat", "r") < 0) {
perror("unveil");
return 1;
}
if (unveil("/bin/SystemMonitor", "x") < 0) {
perror("unveil");
return 1;
}
unveil(nullptr, nullptr);
return app->exec(); return app->exec();
} }