RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:57:35 +00:00
Code Issues Activity Actions

LibCore: Don't create an RPC server when built for lagom

Browse source 
There's no reason to have this, and it will most likely fail anyway
(since there's likely no /tmp/rpc).
This commit is contained in:
AnotherTest 2021-01-12 17:38:52 +03:30 • committed by Andreas Kling
parent 096d2d5071
commit b2b3ccb12d
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibCore/EventLoop.cpp
View file

@ -149,15 +149,16 @@ public:
: m_socket(move(socket)) : m_socket(move(socket))
, m_client_id(s_id_allocator->allocate()) , m_client_id(s_id_allocator->allocate())
{ {
#ifdef __serenity__
s_rpc_clients.set(m_client_id, this); s_rpc_clients.set(m_client_id, this);
add_child(*m_socket); add_child(*m_socket);
m_socket->on_ready_to_read = [this] { m_socket->on_ready_to_read = [this] {
u32 length; u32 length;
int nread = m_socket->read((u8*)&length, sizeof(length)); int nread = m_socket->read((u8*)&length, sizeof(length));
if (nread == 0) { if (nread == 0) {
#ifdef EVENTLOOP_DEBUG # ifdef EVENTLOOP_DEBUG
dbgln("RPC client disconnected"); dbgln("RPC client disconnected");
#endif # endif
shutdown(); shutdown();
return; return;
} }
@ -173,6 +174,9 @@ public:
handle_request(request_json.value().as_object()); handle_request(request_json.value().as_object());
}; };
#else
warnln("RPC Client constructed outside serenity, this is very likely a bug!");
#endif
} }
virtual ~RPCClient() override virtual ~RPCClient() override
{ {
@ -297,10 +301,12 @@ EventLoop::EventLoop()
ASSERT(rc == 0); ASSERT(rc == 0);
s_event_loop_stack->append(this); s_event_loop_stack->append(this);
#ifdef __serenity__
if (!s_rpc_server) { if (!s_rpc_server) {
if (!start_rpc_server()) if (!start_rpc_server())
dbgln("Core::EventLoop: Failed to start an RPC server"); dbgln("Core::EventLoop: Failed to start an RPC server");
} }
#endif
} }
#ifdef EVENTLOOP_DEBUG #ifdef EVENTLOOP_DEBUG
@ -314,12 +320,16 @@ EventLoop::~EventLoop()
bool EventLoop::start_rpc_server() bool EventLoop::start_rpc_server()
{ {
#ifdef __serenity__
s_rpc_server = LocalServer::construct(); s_rpc_server = LocalServer::construct();
s_rpc_server->set_name("Core::EventLoop_RPC_server"); s_rpc_server->set_name("Core::EventLoop_RPC_server");
s_rpc_server->on_ready_to_accept = [&] { s_rpc_server->on_ready_to_accept = [&] {
RPCClient::construct(s_rpc_server->accept()); RPCClient::construct(s_rpc_server->accept());
}; };
return s_rpc_server->listen(String::formatted("/tmp/rpc/{}", getpid())); return s_rpc_server->listen(String::formatted("/tmp/rpc/{}", getpid()));
#else
ASSERT_NOT_REACHED();
#endif
} }
EventLoop& EventLoop::main() EventLoop& EventLoop::main()
@ -597,8 +607,10 @@ void EventLoop::notify_forked(ForkEvent event)
info->next_signal_id = 0; info->next_signal_id = 0;
} }
s_pid = 0; s_pid = 0;
#ifdef __serenity__
s_rpc_server = nullptr; s_rpc_server = nullptr;
s_rpc_clients.clear(); s_rpc_clients.clear();
#endif
return; return;
} }