Skip to content

Fix IPC socket deleted on multi-output setups #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
apostolosSotiropoulos wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix IPC socket deleted on multi-output setups #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions src/ipc/ipc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,7 @@ class ipc_t : public wf::per_output_plugin_instance_t

void fini() override
{
/* Notify exit */
signal_shutdown_event();

unbind_events();

// Set a timeout of 100 ms to give some time to all clients to handle the
// "exit" signal before disconnecting them and finish this instance of plugin
display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(wf::get_core().display, &display_destroy);
fini_event_source =
wl_event_loop_add_timer(wf::get_core().ev_loop, handle_fini_timeout,
this);
wl_event_source_timer_update(fini_event_source, 100);
}

void fini_timeout() const
Expand Down
6 changes: 6 additions & 0 deletions src/ipc/server/i3-ipc-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ uint32_t i3_ipc_server::client_count()

void i3_ipc_server::serve() const
{
if (ipc_socket > 0)
{
return;
}

ipc_socket = -1;
ipc_event_source = nullptr;

Expand Down Expand Up @@ -229,6 +234,7 @@ void i3_ipc_server::handle_display_destroy(struct wl_listener *listener, void *d

close(ipc_socket);
unlink(ipc_sockaddr.sun_path);
ipc_socket = 0;

while (ipc_client_list.size())
{
Expand Down