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

WebContent: Turn it into a MultiInstance service :^)

Browse source 
Port the WebContent service to the new MultiInstance mechanism that
Sergey added. This means that every new WebContentView gets its very
own segregated WebContent process.
This commit is contained in:
Andreas Kling 2020-06-21 21:22:10 +02:00
parent ed351c7493
commit 59537cf257
5 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Base/etc/SystemServer.ini
View file

@ -13,6 +13,8 @@ SocketPermissions=660
Lazy=1 Lazy=1
User=webcontent User=webcontent
BootModes=graphical BootModes=graphical
MultiInstance=1
AcceptSocketConnections=1
[LookupServer] [LookupServer]
Socket=/tmp/portal/lookup Socket=/tmp/portal/lookup

3
Demos/WebView/WebContentClient.cpp
View file

@ -37,8 +37,9 @@ WebContentClient::WebContentClient(WebContentView& view)
void WebContentClient::handshake() void WebContentClient::handshake()
{ {
auto response = send_sync<Messages::WebContentServer::Greet>(); auto response = send_sync<Messages::WebContentServer::Greet>(getpid());
set_my_client_id(response->client_id()); set_my_client_id(response->client_id());
set_server_pid(response->server_pid());
} }
void WebContentClient::handle(const Messages::WebContentClient::DidPaint& message) void WebContentClient::handle(const Messages::WebContentClient::DidPaint& message)

5
Services/WebContent/ClientConnection.cpp
View file

@ -62,9 +62,10 @@ const Web::Page& ClientConnection::page() const
return m_page_host->page(); return m_page_host->page();
} }
OwnPtr<Messages::WebContentServer::GreetResponse> ClientConnection::handle(const Messages::WebContentServer::Greet&) OwnPtr<Messages::WebContentServer::GreetResponse> ClientConnection::handle(const Messages::WebContentServer::Greet& message)
{ {
return make<Messages::WebContentServer::GreetResponse>(client_id()); set_client_pid(message.client_pid());
return make<Messages::WebContentServer::GreetResponse>(client_id(), getpid());
} }
void ClientConnection::handle(const Messages::WebContentServer::UpdateSystemTheme& message) void ClientConnection::handle(const Messages::WebContentServer::UpdateSystemTheme& message)

2
Services/WebContent/WebContentServer.ipc
View file

@ -1,6 +1,6 @@
endpoint WebContentServer = 89 endpoint WebContentServer = 89
{ {
Greet() => (i32 client_id) Greet(i32 client_pid) => (i32 client_id, i32 server_pid)
UpdateSystemTheme(i32 shbuf_id) =| UpdateSystemTheme(i32 shbuf_id) =|

15
Services/WebContent/main.cpp
View file

@ -49,18 +49,7 @@ int main(int, char**)
return 1; return 1;
} }
auto server = Core::LocalServer::construct(); auto socket = Core::LocalSocket::take_over_accepted_socket_from_system_server();
bool ok = server->take_over_from_system_server(); IPC::new_client_connection<WebContent::ClientConnection>(*socket, 1);
ASSERT(ok);
server->on_ready_to_accept = [&] {
auto client_socket = server->accept();
if (!client_socket) {
dbg() << "WebContent: accept failed.";
return;
}
static int s_next_client_id = 0;
int client_id = ++s_next_client_id;
IPC::new_client_connection<WebContent::ClientConnection>(*client_socket, client_id);
};
return event_loop.exec(); return event_loop.exec();
} }