dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore: fix order of signal fd shutdown 

Summary:
When closing the fd handler, it checks if the fd is already closed and prints
an annoying  warning: "fd %d closed, can't remove from epoll - reinit!"
We need to close the handler first and then the actual fd.
I am not familiar with this part of the code, but this fix removes the warnings
and does not seems to have adverse effects.

Test Plan: It had warnings before and now it doesn't, haven't observed any other adverse effect.

Reviewers: raster, zmike, devilhorns

Reviewed By: zmike

Subscribers: cedric, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D6561
This commit is contained in:
Xavi Artigas 2018-07-12 09:17:26 -04:00 committed by Mike Blumenkrantz
parent 4778a84824
commit f21fd7e2fd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/ecore/ecore_signal.c
View File

@ -247,6 +247,11 @@ _ecore_signal_pipe_init(void)
static void static void
_ecore_signal_pipe_shutdown(void) _ecore_signal_pipe_shutdown(void)
{ {
if (sig_pipe_handler)
{
efl_del(sig_pipe_handler);
sig_pipe_handler = NULL;
}
if (sig_pipe[0] != -1) if (sig_pipe[0] != -1)
{ {
close(sig_pipe[0]); close(sig_pipe[0]);
@ -254,11 +259,6 @@ _ecore_signal_pipe_shutdown(void)
sig_pipe[0] = -1; sig_pipe[0] = -1;
sig_pipe[1] = -1; sig_pipe[1] = -1;
} }
if (sig_pipe_handler)
{
efl_del(sig_pipe_handler);
sig_pipe_handler = NULL;
}
eina_spinlock_free(&sig_pid_lock); eina_spinlock_free(&sig_pid_lock);
} }