mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 23:17:46 +00:00
LibIPC: Add IPC::take_over_accepted_client_from_system_server<Client>()
This is an encapsulation of the common work done by all of our single-client IPC servers on startup: 1. Create a Core::LocalSocket, taking over an accepted fd. 2. Create an application-specific ClientConnection object, wrapping the socket. It's not a huge change in terms of lines saved, but I do feel that it improves expressiveness. :^)
This commit is contained in:
parent
6d0f504822
commit
971b3645ef
18 changed files with 58 additions and 45 deletions
|
@ -14,10 +14,10 @@ namespace LanguageServers {
|
|||
|
||||
static HashMap<int, RefPtr<ClientConnection>> s_connections;
|
||||
|
||||
ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket, int client_id)
|
||||
: IPC::ClientConnection<LanguageClientEndpoint, LanguageServerEndpoint>(*this, move(socket), client_id)
|
||||
ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket)
|
||||
: IPC::ClientConnection<LanguageClientEndpoint, LanguageServerEndpoint>(*this, move(socket), 1)
|
||||
{
|
||||
s_connections.set(client_id, *this);
|
||||
s_connections.set(1, *this);
|
||||
}
|
||||
|
||||
ClientConnection::~ClientConnection()
|
||||
|
|
|
@ -20,7 +20,7 @@ namespace LanguageServers {
|
|||
|
||||
class ClientConnection : public IPC::ClientConnection<LanguageClientEndpoint, LanguageServerEndpoint> {
|
||||
public:
|
||||
explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id);
|
||||
explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>);
|
||||
~ClientConnection() override;
|
||||
|
||||
virtual void die() override;
|
||||
|
|
|
@ -15,8 +15,8 @@ class ClientConnection final : public LanguageServers::ClientConnection {
|
|||
C_OBJECT(ClientConnection);
|
||||
|
||||
private:
|
||||
ClientConnection(NonnullRefPtr<Core::LocalSocket> socket, int client_id)
|
||||
: LanguageServers::ClientConnection(move(socket), client_id)
|
||||
ClientConnection(NonnullRefPtr<Core::LocalSocket> socket)
|
||||
: LanguageServers::ClientConnection(move(socket))
|
||||
{
|
||||
m_autocomplete_engine = make<CppComprehensionEngine>(m_filedb);
|
||||
m_autocomplete_engine->set_declarations_of_document_callback = [this](const String& filename, Vector<GUI::AutocompleteProvider::Declaration>&& declarations) {
|
||||
|
|
|
@ -6,14 +6,12 @@
|
|||
|
||||
#include "ClientConnection.h"
|
||||
#include "Tests.h"
|
||||
#include <AK/LexicalPath.h>
|
||||
#include <LibCore/ArgsParser.h>
|
||||
#include <LibCore/EventLoop.h>
|
||||
#include <LibCore/LocalServer.h>
|
||||
#include <LibCore/System.h>
|
||||
#include <LibIPC/ClientConnection.h>
|
||||
#include <LibIPC/SingleServer.h>
|
||||
#include <LibMain/Main.h>
|
||||
#include <unistd.h>
|
||||
|
||||
static ErrorOr<int> mode_server();
|
||||
|
||||
|
@ -36,8 +34,7 @@ ErrorOr<int> mode_server()
|
|||
Core::EventLoop event_loop;
|
||||
TRY(Core::System::pledge("stdio unix recvfd rpath"));
|
||||
|
||||
auto socket = TRY(Core::LocalSocket::take_over_accepted_socket_from_system_server());
|
||||
(void)IPC::new_client_connection<LanguageServers::Cpp::ClientConnection>(move(socket), 1);
|
||||
auto client = TRY(IPC::take_over_accepted_client_from_system_server<LanguageServers::Cpp::ClientConnection>());
|
||||
|
||||
TRY(Core::System::pledge("stdio recvfd rpath"));
|
||||
TRY(Core::System::unveil("/usr/include", "r"));
|
||||
|
|
|
@ -16,8 +16,8 @@ class ClientConnection final : public LanguageServers::ClientConnection {
|
|||
C_OBJECT(ClientConnection);
|
||||
|
||||
private:
|
||||
ClientConnection(NonnullRefPtr<Core::LocalSocket> socket, int client_id)
|
||||
: LanguageServers::ClientConnection(move(socket), client_id)
|
||||
ClientConnection(NonnullRefPtr<Core::LocalSocket> socket)
|
||||
: LanguageServers::ClientConnection(move(socket))
|
||||
{
|
||||
m_autocomplete_engine = make<ShellComprehensionEngine>(m_filedb);
|
||||
m_autocomplete_engine->set_declarations_of_document_callback = [this](const String& filename, Vector<GUI::AutocompleteProvider::Declaration>&& declarations) {
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <LibCore/EventLoop.h>
|
||||
#include <LibCore/LocalServer.h>
|
||||
#include <LibCore/System.h>
|
||||
#include <LibIPC/ClientConnection.h>
|
||||
#include <LibIPC/SingleServer.h>
|
||||
#include <LibMain/Main.h>
|
||||
|
||||
ErrorOr<int> serenity_main(Main::Arguments)
|
||||
|
@ -16,8 +16,8 @@ ErrorOr<int> serenity_main(Main::Arguments)
|
|||
Core::EventLoop event_loop;
|
||||
TRY(Core::System::pledge("stdio unix rpath recvfd"));
|
||||
|
||||
auto socket = TRY(Core::LocalSocket::take_over_accepted_socket_from_system_server());
|
||||
(void)IPC::new_client_connection<LanguageServers::Shell::ClientConnection>(move(socket), 1);
|
||||
auto client = TRY(IPC::take_over_accepted_client_from_system_server<LanguageServers::Shell::ClientConnection>());
|
||||
|
||||
TRY(Core::System::pledge("stdio rpath recvfd"));
|
||||
TRY(Core::System::unveil("/etc/passwd", "r"));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue