mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Close signal file descriptor in event loop on remove and failure.

Browse source 
When the signal handler is removed the corresponding fd is closed. This
should automatically remove it from the epoll set.
This commit is contained in:
Iskren Chernev 2011-03-13 21:08:37 +02:00
parent 1081bca2a8
commit 21e877f3f6
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
wayland/event-loop.c
View file

@ -265,13 +265,10 @@ wl_event_source_signal_remove(struct wl_event_source *source)
{ {
struct wl_event_source_signal *signal_source = struct wl_event_source_signal *signal_source =
(struct wl_event_source_signal *) source; (struct wl_event_source_signal *) source;
struct wl_event_loop *loop = source->loop;
int fd;
fd = signal_source->fd; close(signal_source->fd);
free(source); free(source);
return 0;
return epoll_ctl(loop->epoll_fd, EPOLL_CTL_DEL, fd, NULL);
} }
struct wl_event_source_interface signal_source_interface = { struct wl_event_source_interface signal_source_interface = {
@ -315,6 +312,7 @@ wl_event_loop_add_signal(struct wl_event_loop *loop,
ep.data.ptr = source; ep.data.ptr = source;
if (epoll_ctl(loop->epoll_fd, EPOLL_CTL_ADD, source->fd, &ep) < 0) { if (epoll_ctl(loop->epoll_fd, EPOLL_CTL_ADD, source->fd, &ep) < 0) {
close(source->fd);
free(source); free(source);
return NULL; return NULL;
} }