mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-10-01 05:39:02 +00:00
LibCore: Support launching a singleton process with an IPC connection
This largely adapts the code from SingletonProcess.cpp to work a bit closer with Core::Process. Ideally, we'll move the daemonizing feature into Core::Process::disown() eventually.
This commit is contained in:
parent
8448897f14
commit
c723fc9611
Notes:
sideshowbarker
2024-07-17 09:47:09 +09:00
Author: https://github.com/trflynn89
Commit: c723fc9611
Pull-request: https://github.com/SerenityOS/serenity/pull/24092
Reviewed-by: https://github.com/ADKaster ✅
2 changed files with 148 additions and 0 deletions
|
@ -15,8 +15,11 @@
|
|||
#include <LibCore/File.h>
|
||||
#include <LibCore/Process.h>
|
||||
#include <LibCore/Socket.h>
|
||||
#include <LibCore/SocketAddress.h>
|
||||
#include <LibCore/StandardPaths.h>
|
||||
#include <LibCore/System.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <spawn.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
@ -376,4 +379,135 @@ ErrorOr<IPCProcess::ProcessAndIPCSocket> IPCProcess::spawn_and_connect_to_proces
|
|||
return ProcessAndIPCSocket { move(process), move(ipc_socket) };
|
||||
}
|
||||
|
||||
static ErrorOr<Optional<pid_t>> get_process_pid(StringView process_name, StringView pid_path)
|
||||
{
|
||||
if (System::stat(pid_path).is_error())
|
||||
return OptionalNone {};
|
||||
|
||||
Optional<pid_t> pid;
|
||||
{
|
||||
auto pid_file = File::open(pid_path, File::OpenMode::Read);
|
||||
if (pid_file.is_error()) {
|
||||
warnln("Could not open {} PID file '{}': {}", process_name, pid_path, pid_file.error());
|
||||
return pid_file.release_error();
|
||||
}
|
||||
|
||||
auto contents = pid_file.value()->read_until_eof();
|
||||
if (contents.is_error()) {
|
||||
warnln("Could not read {} PID file '{}': {}", process_name, pid_path, contents.error());
|
||||
return contents.release_error();
|
||||
}
|
||||
|
||||
pid = StringView { contents.value() }.to_number<pid_t>();
|
||||
}
|
||||
|
||||
if (!pid.has_value()) {
|
||||
warnln("{} PID file '{}' exists, but with an invalid PID", process_name, pid_path);
|
||||
TRY(System::unlink(pid_path));
|
||||
return OptionalNone {};
|
||||
}
|
||||
if (kill(*pid, 0) < 0) {
|
||||
warnln("{} PID file '{}' exists with PID {}, but process cannot be found", process_name, pid_path, *pid);
|
||||
TRY(System::unlink(pid_path));
|
||||
return OptionalNone {};
|
||||
}
|
||||
|
||||
return pid;
|
||||
}
|
||||
|
||||
// This is heavily based on how SystemServer's Service creates its socket.
|
||||
static ErrorOr<int> create_ipc_socket(ByteString const& socket_path)
|
||||
{
|
||||
if (!System::stat(socket_path).is_error())
|
||||
TRY(System::unlink(socket_path));
|
||||
|
||||
#ifdef SOCK_NONBLOCK
|
||||
auto socket_fd = TRY(System::socket(AF_LOCAL, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0));
|
||||
#else
|
||||
auto socket_fd = TRY(System::socket(AF_LOCAL, SOCK_STREAM, 0));
|
||||
|
||||
int option = 1;
|
||||
TRY(System::ioctl(socket_fd, FIONBIO, &option));
|
||||
TRY(System::fcntl(socket_fd, F_SETFD, FD_CLOEXEC));
|
||||
#endif
|
||||
|
||||
#if !defined(AK_OS_BSD_GENERIC) && !defined(AK_OS_GNU_HURD)
|
||||
TRY(System::fchmod(socket_fd, 0600));
|
||||
#endif
|
||||
|
||||
auto socket_address = SocketAddress::local(socket_path);
|
||||
auto socket_address_un = socket_address.to_sockaddr_un().release_value();
|
||||
|
||||
TRY(System::bind(socket_fd, reinterpret_cast<sockaddr*>(&socket_address_un), sizeof(socket_address_un)));
|
||||
TRY(System::listen(socket_fd, 16));
|
||||
|
||||
return socket_fd;
|
||||
}
|
||||
|
||||
struct ProcessPaths {
|
||||
ByteString socket_path;
|
||||
ByteString pid_path;
|
||||
};
|
||||
static ErrorOr<ProcessPaths> paths_for_process(StringView process_name)
|
||||
{
|
||||
auto runtime_directory = TRY(StandardPaths::runtime_directory());
|
||||
auto socket_path = ByteString::formatted("{}/{}.socket", runtime_directory, process_name);
|
||||
auto pid_path = ByteString::formatted("{}/{}.pid", runtime_directory, process_name);
|
||||
|
||||
return ProcessPaths { move(socket_path), move(pid_path) };
|
||||
}
|
||||
|
||||
ErrorOr<IPCProcess::ProcessAndIPCSocket> IPCProcess::spawn_singleton_and_connect_to_process(ProcessSpawnOptions const& options)
|
||||
{
|
||||
auto [socket_path, pid_path] = TRY(paths_for_process(options.name));
|
||||
Process process { -1 };
|
||||
|
||||
if (auto existing_pid = TRY(get_process_pid(options.name, pid_path)); existing_pid.has_value()) {
|
||||
process = Process { *existing_pid };
|
||||
} else {
|
||||
auto ipc_fd = TRY(create_ipc_socket(socket_path));
|
||||
|
||||
sigset_t original_set;
|
||||
sigset_t setting_set;
|
||||
sigfillset(&setting_set);
|
||||
(void)pthread_sigmask(SIG_BLOCK, &setting_set, &original_set);
|
||||
|
||||
// FIXME: Roll this daemon implementation into `Process::disown`.
|
||||
if (auto pid = TRY(System::fork()); pid == 0) {
|
||||
(void)pthread_sigmask(SIG_SETMASK, &original_set, nullptr);
|
||||
TRY(System::setsid());
|
||||
TRY(System::signal(SIGCHLD, SIG_IGN));
|
||||
|
||||
auto& arguments = const_cast<Vector<ByteString>&>(options.arguments);
|
||||
arguments.append("--pid-file"sv);
|
||||
arguments.append(pid_path);
|
||||
|
||||
auto takeover_string = ByteString::formatted("{}:{}", options.name, TRY(System::dup(ipc_fd)));
|
||||
TRY(Environment::set("SOCKET_TAKEOVER"sv, takeover_string, Environment::Overwrite::Yes));
|
||||
|
||||
auto process = TRY(Process::spawn(options));
|
||||
{
|
||||
auto pid_file = TRY(File::open(pid_path, File::OpenMode::Write));
|
||||
TRY(pid_file->write_until_depleted(ByteString::number(process.pid())));
|
||||
}
|
||||
|
||||
TRY(System::kill(getpid(), SIGTERM));
|
||||
} else {
|
||||
auto wait_err = System::waitpid(pid);
|
||||
(void)pthread_sigmask(SIG_SETMASK, &original_set, nullptr);
|
||||
TRY(wait_err);
|
||||
}
|
||||
|
||||
auto pid = TRY(get_process_pid(options.name, pid_path));
|
||||
VERIFY(pid.has_value());
|
||||
|
||||
process = Process { *pid };
|
||||
}
|
||||
|
||||
auto ipc_socket = TRY(LocalSocket::connect(socket_path));
|
||||
TRY(ipc_socket->set_blocking(true));
|
||||
|
||||
return ProcessAndIPCSocket { move(process), move(ipc_socket) };
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -44,6 +44,8 @@ struct ProcessSpawnOptions {
|
|||
Vector<FileActionType> const& file_actions {};
|
||||
};
|
||||
|
||||
class IPCProcess;
|
||||
|
||||
class Process {
|
||||
AK_MAKE_NONCOPYABLE(Process);
|
||||
|
||||
|
@ -98,6 +100,8 @@ public:
|
|||
ErrorOr<bool> wait_for_termination();
|
||||
|
||||
private:
|
||||
friend IPCProcess;
|
||||
|
||||
Process(pid_t pid)
|
||||
: m_pid(pid)
|
||||
, m_should_disown(true)
|
||||
|
@ -125,6 +129,15 @@ public:
|
|||
return ProcessAndIPCClient<ClientType> { move(process), move(client) };
|
||||
}
|
||||
|
||||
template<typename ClientType, typename... ClientArguments>
|
||||
static ErrorOr<ProcessAndIPCClient<ClientType>> spawn_singleton(ProcessSpawnOptions const& options, ClientArguments&&... client_arguments)
|
||||
{
|
||||
auto [process, socket] = TRY(spawn_singleton_and_connect_to_process(options));
|
||||
auto client = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ClientType { move(socket), forward<ClientArguments>(client_arguments)... }));
|
||||
|
||||
return ProcessAndIPCClient<ClientType> { move(process), move(client) };
|
||||
}
|
||||
|
||||
pid_t pid() const { return m_process.pid(); }
|
||||
|
||||
private:
|
||||
|
@ -133,6 +146,7 @@ private:
|
|||
NonnullOwnPtr<Core::LocalSocket> m_ipc_socket;
|
||||
};
|
||||
static ErrorOr<ProcessAndIPCSocket> spawn_and_connect_to_process(ProcessSpawnOptions const& options);
|
||||
static ErrorOr<ProcessAndIPCSocket> spawn_singleton_and_connect_to_process(ProcessSpawnOptions const& options);
|
||||
|
||||
Process m_process;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue