mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-10-03 14:50:02 +00:00
LibCore+LibSQL+LibWebView: Move launching a singleton process to LibCore
This just moves the code to launch a single process such as SQLServer to LibCore. This will allow re-using this feature for other processes, and will allow moving the launching of SQLServer to Ladybird.
This commit is contained in:
Timothy Flynn
Andrew Kaster
parent
5dd3b91f0e
commit
bf50881e61
Notes:
sideshowbarker
2024-07-16 23:34:49 +09:00
Author: https://github.com/trflynn89
Commit: bf50881e61
Pull-request: https://github.com/SerenityOS/serenity/pull/24074
Reviewed-by: https://github.com/ADKaster ✅
9 changed files with 242 additions and 169 deletions
|
|
@ -10,161 +10,8 @@
|
|||
#include <AK/String.h>
|
||||
#include <LibSQL/SQLClient.h>
|
||||
|
||||
#if !defined(AK_OS_SERENITY)
|
||||
# include <LibCore/Directory.h>
|
||||
# include <LibCore/Environment.h>
|
||||
# include <LibCore/SocketAddress.h>
|
||||
# include <LibCore/StandardPaths.h>
|
||||
# include <LibCore/System.h>
|
||||
# include <LibFileSystem/FileSystem.h>
|
||||
# include <signal.h>
|
||||
#endif
|
||||
|
||||
namespace SQL {
|
||||
|
||||
#if !defined(AK_OS_SERENITY)
|
||||
|
||||
// This is heavily based on how SystemServer's Service creates its socket.
|
||||
static ErrorOr<int> create_database_socket(ByteString const& socket_path)
|
||||
{
|
||||
if (FileSystem::exists(socket_path))
|
||||
TRY(Core::System::unlink(socket_path));
|
||||
|
||||
# ifdef SOCK_NONBLOCK
|
||||
auto socket_fd = TRY(Core::System::socket(AF_LOCAL, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0));
|
||||
# else
|
||||
auto socket_fd = TRY(Core::System::socket(AF_LOCAL, SOCK_STREAM, 0));
|
||||
|
||||
int option = 1;
|
||||
TRY(Core::System::ioctl(socket_fd, FIONBIO, &option));
|
||||
TRY(Core::System::fcntl(socket_fd, F_SETFD, FD_CLOEXEC));
|
||||
# endif
|
||||
|
||||
# if !defined(AK_OS_BSD_GENERIC) && !defined(AK_OS_GNU_HURD)
|
||||
TRY(Core::System::fchmod(socket_fd, 0600));
|
||||
# endif
|
||||
|
||||
auto socket_address = Core::SocketAddress::local(socket_path);
|
||||
auto socket_address_un = socket_address.to_sockaddr_un().release_value();
|
||||
|
||||
TRY(Core::System::bind(socket_fd, reinterpret_cast<sockaddr*>(&socket_address_un), sizeof(socket_address_un)));
|
||||
TRY(Core::System::listen(socket_fd, 16));
|
||||
|
||||
return socket_fd;
|
||||
}
|
||||
|
||||
static ErrorOr<void> launch_server(ByteString const& socket_path, ByteString const& pid_path, Vector<ByteString> candidate_server_paths)
|
||||
{
|
||||
auto server_fd_or_error = create_database_socket(socket_path);
|
||||
if (server_fd_or_error.is_error()) {
|
||||
warnln("Failed to create a database socket at {}: {}", socket_path, server_fd_or_error.error());
|
||||
return server_fd_or_error.release_error();
|
||||
}
|
||||
auto server_fd = server_fd_or_error.value();
|
||||
sigset_t original_set;
|
||||
sigset_t setting_set;
|
||||
sigfillset(&setting_set);
|
||||
(void)pthread_sigmask(SIG_BLOCK, &setting_set, &original_set);
|
||||
auto server_pid = TRY(Core::System::fork());
|
||||
|
||||
if (server_pid == 0) {
|
||||
(void)pthread_sigmask(SIG_SETMASK, &original_set, nullptr);
|
||||
TRY(Core::System::setsid());
|
||||
TRY(Core::System::signal(SIGCHLD, SIG_IGN));
|
||||
server_pid = TRY(Core::System::fork());
|
||||
|
||||
if (server_pid != 0) {
|
||||
auto server_pid_file = TRY(Core::File::open(pid_path, Core::File::OpenMode::Write));
|
||||
TRY(server_pid_file->write_until_depleted(ByteString::number(server_pid)));
|
||||
|
||||
TRY(Core::System::kill(getpid(), SIGTERM));
|
||||
}
|
||||
|
||||
server_fd = TRY(Core::System::dup(server_fd));
|
||||
|
||||
auto takeover_string = ByteString::formatted("SQLServer:{}", server_fd);
|
||||
TRY(Core::Environment::set("SOCKET_TAKEOVER"sv, takeover_string, Core::Environment::Overwrite::Yes));
|
||||
|
||||
ErrorOr<void> result;
|
||||
for (auto const& server_path : candidate_server_paths) {
|
||||
auto arguments = Array {
|
||||
server_path.view(),
|
||||
"--pid-file"sv,
|
||||
pid_path,
|
||||
};
|
||||
result = Core::System::exec(arguments[0], arguments, Core::System::SearchInPath::Yes);
|
||||
if (!result.is_error())
|
||||
break;
|
||||
}
|
||||
if (result.is_error()) {
|
||||
warnln("Could not launch any of {}: {}", candidate_server_paths, result.error());
|
||||
TRY(Core::System::unlink(pid_path));
|
||||
}
|
||||
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
VERIFY(server_pid > 0);
|
||||
|
||||
auto wait_err = Core::System::waitpid(server_pid);
|
||||
(void)pthread_sigmask(SIG_SETMASK, &original_set, nullptr);
|
||||
if (wait_err.is_error())
|
||||
return wait_err.release_error();
|
||||
return {};
|
||||
}
|
||||
|
||||
static ErrorOr<bool> should_launch_server(ByteString const& pid_path)
|
||||
{
|
||||
if (!FileSystem::exists(pid_path))
|
||||
return true;
|
||||
|
||||
Optional<pid_t> pid;
|
||||
{
|
||||
auto server_pid_file = Core::File::open(pid_path, Core::File::OpenMode::Read);
|
||||
if (server_pid_file.is_error()) {
|
||||
warnln("Could not open SQLServer PID file '{}': {}", pid_path, server_pid_file.error());
|
||||
return server_pid_file.release_error();
|
||||
}
|
||||
|
||||
auto contents = server_pid_file.value()->read_until_eof();
|
||||
if (contents.is_error()) {
|
||||
warnln("Could not read SQLServer PID file '{}': {}", pid_path, contents.error());
|
||||
return contents.release_error();
|
||||
}
|
||||
|
||||
pid = StringView { contents.value() }.to_number<pid_t>();
|
||||
}
|
||||
|
||||
if (!pid.has_value()) {
|
||||
warnln("SQLServer PID file '{}' exists, but with an invalid PID", pid_path);
|
||||
TRY(Core::System::unlink(pid_path));
|
||||
return true;
|
||||
}
|
||||
if (kill(*pid, 0) < 0) {
|
||||
warnln("SQLServer PID file '{}' exists with PID {}, but process cannot be found", pid_path, *pid);
|
||||
TRY(Core::System::unlink(pid_path));
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
ErrorOr<NonnullRefPtr<SQLClient>> SQLClient::launch_server_and_create_client(Vector<ByteString> candidate_server_paths)
|
||||
{
|
||||
auto runtime_directory = TRY(Core::StandardPaths::runtime_directory());
|
||||
auto socket_path = ByteString::formatted("{}/SQLServer.socket", runtime_directory);
|
||||
auto pid_path = ByteString::formatted("{}/SQLServer.pid", runtime_directory);
|
||||
|
||||
if (TRY(should_launch_server(pid_path)))
|
||||
TRY(launch_server(socket_path, pid_path, move(candidate_server_paths)));
|
||||
|
||||
auto socket = TRY(Core::LocalSocket::connect(move(socket_path)));
|
||||
TRY(socket->set_blocking(true));
|
||||
|
||||
return adopt_nonnull_ref_or_enomem(new (nothrow) SQLClient(move(socket)));
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
void SQLClient::execution_success(u64 statement_id, u64 execution_id, Vector<ByteString> const& column_names, bool has_results, size_t created, size_t updated, size_t deleted)
|
||||
{
|
||||
if (!on_execution_success) {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/Platform.h>
|
||||
#include <LibIPC/ConnectionToServer.h>
|
||||
#include <LibSQL/Result.h>
|
||||
#include <SQLServer/SQLClientEndpoint.h>
|
||||
|
|
@ -54,9 +53,10 @@ class SQLClient
|
|||
IPC_CLIENT_CONNECTION(SQLClient, "/tmp/session/%sid/portal/sql"sv)
|
||||
|
||||
public:
|
||||
#if !defined(AK_OS_SERENITY)
|
||||
static ErrorOr<NonnullRefPtr<SQLClient>> launch_server_and_create_client(Vector<ByteString> candidate_server_paths);
|
||||
#endif
|
||||
explicit SQLClient(NonnullOwnPtr<Core::LocalSocket> socket)
|
||||
: IPC::ConnectionToServer<SQLClientEndpoint, SQLServerEndpoint>(*this, move(socket))
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~SQLClient() = default;
|
||||
|
||||
|
|
@ -66,11 +66,6 @@ public:
|
|||
Function<void(ExecutionComplete)> on_results_exhausted;
|
||||
|
||||
private:
|
||||
explicit SQLClient(NonnullOwnPtr<Core::LocalSocket> socket)
|
||||
: IPC::ConnectionToServer<SQLClientEndpoint, SQLServerEndpoint>(*this, move(socket))
|
||||
{
|
||||
}
|
||||
|
||||
virtual void execution_success(u64 statement_id, u64 execution_id, Vector<ByteString> const& column_names, bool has_results, size_t created, size_t updated, size_t deleted) override;
|
||||
virtual void execution_error(u64 statement_id, u64 execution_id, SQLErrorCode const& code, ByteString const& message) override;
|
||||
virtual void next_result(u64 statement_id, u64 execution_id, Vector<SQL::Value> const&) override;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue