summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-07-12 09:17:26 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-07-12 09:17:26 -0400
commitf21fd7e2fd396bf62af22655f92e4c38ef62b0e7 (patch)
tree029f87291fa6e1bcb9b46bb0fb06ee4123dd40c9 /src/lib/ecore
parent4778a84824d4c059453d9ba1a4b0c912eeb54143 (diff)
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
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/ecore_signal.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/ecore/ecore_signal.c b/src/lib/ecore/ecore_signal.c
index 60d3233f2a..9fd9a7d8b9 100644
--- a/src/lib/ecore/ecore_signal.c
+++ b/src/lib/ecore/ecore_signal.c
@@ -247,6 +247,11 @@ _ecore_signal_pipe_init(void)
247static void 247static void
248_ecore_signal_pipe_shutdown(void) 248_ecore_signal_pipe_shutdown(void)
249{ 249{
250 if (sig_pipe_handler)
251 {
252 efl_del(sig_pipe_handler);
253 sig_pipe_handler = NULL;
254 }
250 if (sig_pipe[0] != -1) 255 if (sig_pipe[0] != -1)
251 { 256 {
252 close(sig_pipe[0]); 257 close(sig_pipe[0]);
@@ -254,11 +259,6 @@ _ecore_signal_pipe_shutdown(void)
254 sig_pipe[0] = -1; 259 sig_pipe[0] = -1;
255 sig_pipe[1] = -1; 260 sig_pipe[1] = -1;
256 } 261 }
257 if (sig_pipe_handler)
258 {
259 efl_del(sig_pipe_handler);
260 sig_pipe_handler = NULL;
261 }
262 eina_spinlock_free(&sig_pid_lock); 262 eina_spinlock_free(&sig_pid_lock);
263} 263}
264 264