0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-03 21:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

GEventLoop: Make the server fd/pid global, and only connect to server once.

Browse source
This commit is contained in:
Andreas Kling 2019-03-09 17:34:09 +01:00
parent b1c272a507
commit eac3a6ad52
Notes: sideshowbarker 2024-07-19 15:06:22 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/eac3a6ad528
2 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
LibGUI/GEventLoop.cpp
View file

@ -20,18 +20,14 @@
//#define GEVENTLOOP_DEBUG //#define GEVENTLOOP_DEBUG
static HashMap<GShortcut, GAction*>* g_actions; static HashMap<GShortcut, GAction*>* g_actions;
static GEventLoop* s_mainGEventLoop; static GEventLoop* s_main_event_loop;
int GEventLoop::s_event_fd = -1;
pid_t GEventLoop::s_server_pid = -1;
GEventLoop::GEventLoop() void GEventLoop::connect_to_server()
{ {
if (!s_mainGEventLoop) s_event_fd = socket(AF_LOCAL, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
s_mainGEventLoop = this; if (s_event_fd < 0) {
if (!g_actions)
g_actions = new HashMap<GShortcut, GAction*>;
m_event_fd = socket(AF_LOCAL, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
if (m_event_fd < 0) {
perror("socket"); perror("socket");
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
@ -43,7 +39,7 @@ GEventLoop::GEventLoop()
int retries = 1000; int retries = 1000;
int rc = 0; int rc = 0;
while (retries) { while (retries) {
rc = connect(m_event_fd, (const sockaddr*)&address, sizeof(address)); rc = connect(s_event_fd, (const sockaddr*)&address, sizeof(address));
if (rc == 0) if (rc == 0)
break; break;
#ifdef GEVENTLOOP_DEBUG #ifdef GEVENTLOOP_DEBUG
@ -55,6 +51,18 @@ GEventLoop::GEventLoop()
if (rc < 0) { if (rc < 0) {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
}
GEventLoop::GEventLoop()
{
if (!s_main_event_loop) {
s_main_event_loop = this;
connect_to_server();
}
if (!g_actions)
g_actions = new HashMap<GShortcut, GAction*>;
#ifdef GEVENTLOOP_DEBUG #ifdef GEVENTLOOP_DEBUG
dbgprintf("(%u) GEventLoop constructed :)\n", getpid()); dbgprintf("(%u) GEventLoop constructed :)\n", getpid());
#endif #endif
@ -66,8 +74,8 @@ GEventLoop::~GEventLoop()
GEventLoop& GEventLoop::main() GEventLoop& GEventLoop::main()
{ {
ASSERT(s_mainGEventLoop); ASSERT(s_main_event_loop);
return *s_mainGEventLoop; return *s_main_event_loop;
} }
void GEventLoop::quit(int code) void GEventLoop::quit(int code)
@ -219,7 +227,7 @@ void GEventLoop::wait_for_event()
max_fd = fd; max_fd = fd;
}; };
add_fd_to_set(m_event_fd, rfds); add_fd_to_set(s_event_fd, rfds);
for (auto& notifier : m_notifiers) { for (auto& notifier : m_notifiers) {
if (notifier->event_mask() & GNotifier::Read) if (notifier->event_mask() & GNotifier::Read)
add_fd_to_set(notifier->fd(), rfds); add_fd_to_set(notifier->fd(), rfds);
@ -265,7 +273,7 @@ void GEventLoop::wait_for_event()
} }
} }
if (!FD_ISSET(m_event_fd, &rfds)) if (!FD_ISSET(s_event_fd, &rfds))
return; return;
bool success = drain_messages_from_server(); bool success = drain_messages_from_server();
@ -277,7 +285,7 @@ void GEventLoop::process_unprocessed_messages()
auto unprocessed_events = move(m_unprocessed_messages); auto unprocessed_events = move(m_unprocessed_messages);
for (auto& event : unprocessed_events) { for (auto& event : unprocessed_events) {
if (event.type == WSAPI_ServerMessage::Type::Greeting) { if (event.type == WSAPI_ServerMessage::Type::Greeting) {
m_server_pid = event.greeting.server_pid; s_server_pid = event.greeting.server_pid;
continue; continue;
} }
@ -341,7 +349,7 @@ bool GEventLoop::drain_messages_from_server()
{ {
for (;;) { for (;;) {
WSAPI_ServerMessage message; WSAPI_ServerMessage message;
ssize_t nread = read(m_event_fd, &message, sizeof(WSAPI_ServerMessage)); ssize_t nread = read(s_event_fd, &message, sizeof(WSAPI_ServerMessage));
if (nread < 0) { if (nread < 0) {
perror("read"); perror("read");
quit(1); quit(1);
@ -416,7 +424,7 @@ void GEventLoop::unregister_notifier(Badge<GNotifier>, GNotifier& notifier)
bool GEventLoop::post_message_to_server(const WSAPI_ClientMessage& message) bool GEventLoop::post_message_to_server(const WSAPI_ClientMessage& message)
{ {
int nwritten = write(m_event_fd, &message, sizeof(WSAPI_ClientMessage)); int nwritten = write(s_event_fd, &message, sizeof(WSAPI_ClientMessage));
return nwritten == sizeof(WSAPI_ClientMessage); return nwritten == sizeof(WSAPI_ClientMessage);
} }
@ -425,10 +433,10 @@ bool GEventLoop::wait_for_specific_event(WSAPI_ServerMessage::Type type, WSAPI_S
for (;;) { for (;;) {
fd_set rfds; fd_set rfds;
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(m_event_fd, &rfds); FD_SET(s_event_fd, &rfds);
int rc = select(m_event_fd + 1, &rfds, nullptr, nullptr, nullptr); int rc = select(s_event_fd + 1, &rfds, nullptr, nullptr, nullptr);
ASSERT(rc > 0); ASSERT(rc > 0);
ASSERT(FD_ISSET(m_event_fd, &rfds)); ASSERT(FD_ISSET(s_event_fd, &rfds));
bool success = drain_messages_from_server(); bool success = drain_messages_from_server();
if (!success) if (!success)
return false; return false;

8
LibGUI/GEventLoop.h
View file

@ -39,7 +39,7 @@ public:
WSAPI_ServerMessage sync_request(const WSAPI_ClientMessage& request, WSAPI_ServerMessage::Type response_type); WSAPI_ServerMessage sync_request(const WSAPI_ClientMessage& request, WSAPI_ServerMessage::Type response_type);
pid_t server_pid() const { return m_server_pid; } pid_t server_pid() const { return s_server_pid; }
private: private:
void wait_for_event(); void wait_for_event();
@ -54,6 +54,7 @@ private:
void handle_menu_event(const WSAPI_ServerMessage&); void handle_menu_event(const WSAPI_ServerMessage&);
void handle_window_entered_or_left_event(const WSAPI_ServerMessage&, GWindow&); void handle_window_entered_or_left_event(const WSAPI_ServerMessage&, GWindow&);
void get_next_timer_expiration(timeval&); void get_next_timer_expiration(timeval&);
void connect_to_server();
struct QueuedEvent { struct QueuedEvent {
WeakPtr<GObject> receiver; WeakPtr<GObject> receiver;
@ -63,12 +64,13 @@ private:
Vector<WSAPI_ServerMessage> m_unprocessed_messages; Vector<WSAPI_ServerMessage> m_unprocessed_messages;
int m_event_fd { -1 };
bool m_running { false }; bool m_running { false };
bool m_exit_requested { false }; bool m_exit_requested { false };
int m_exit_code { 0 }; int m_exit_code { 0 };
int m_next_timer_id { 1 }; int m_next_timer_id { 1 };
pid_t m_server_pid { 0 };
static pid_t s_server_pid;
static pid_t s_event_fd;
struct EventLoopTimer { struct EventLoopTimer {
int timer_id { 0 }; int timer_id { 0 };