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

LibCore+LibSystem: Move syscall wrappers from LibSystem to LibCore

Browse source 
With this change, System::foo() becomes Core::System::foo().

Since LibCore builds on other systems than SerenityOS, we now have to
make sure that wrappers work with just a standard C library underneath.
This commit is contained in:
Andreas Kling 2021-11-23 10:59:50 +01:00
parent acc2eccede
commit 21a5fb0fa2
32 changed files with 165 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,13 +9,13 @@
#include <AK/JsonObject.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <LibCore/System.h>
#include <LibGUI/Application.h>
#include <LibGUI/Frame.h>
#include <LibGUI/Painter.h>
#include <LibGUI/Window.h>
#include <LibGfx/Palette.h>
#include <LibMain/Main.h>
#include <LibSystem/Wrappers.h>
#include <serenity.h>
#include <spawn.h>
#include <stdio.h>
@ -185,11 +185,11 @@ private:
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
TRY(System::pledge("stdio recvfd sendfd proc exec rpath unix", nullptr));
TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath unix", nullptr));
auto app = GUI::Application::construct(arguments);
TRY(System::pledge("stdio recvfd sendfd proc exec rpath", nullptr));
TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath", nullptr));
const char* cpu = nullptr;
const char* memory = nullptr;
@ -231,11 +231,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
if (memory)
create_applet(GraphType::Memory, memory);
TRY(System::unveil("/res", "r"));
TRY(System::unveil("/proc/stat", "r"));
TRY(System::unveil("/proc/memstat", "r"));
TRY(System::unveil("/bin/SystemMonitor", "x"));
TRY(System::unveil(nullptr, nullptr));
TRY(Core::System::unveil("/res", "r"));
TRY(Core::System::unveil("/proc/stat", "r"));
TRY(Core::System::unveil("/proc/memstat", "r"));
TRY(Core::System::unveil("/bin/SystemMonitor", "x"));
TRY(Core::System::unveil(nullptr, nullptr));
return app->exec();
}