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

eio/fallback: fix fallback shutdown when threads exist 

threads should not be waited on here during shutdown since these same
threads may be waiting on the main loop anyway

instead, perform as much deallocation as possible,
mark the monitor as deleted, and then set the thread to canceled and
allow the thread to clean itself up during its cancel/end callback

@fix

Differential Revision: https://phab.enlightenment.org/D6440
This commit is contained in:
Mike Blumenkrantz 2018-06-26 16:39:53 -04:00 committed by Marcel Hollerbach
parent 4987fd4ab8
commit 1b18a4e679
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/eio/eio_monitor_poll.c
View File

@ -220,6 +220,14 @@ _eio_monitor_fallback_end_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
Eio_Monitor_Backend *backend = data;
backend->work = NULL;
if (backend->delete_me)
{
eina_hash_free(backend->children);
free(backend);
return;
}
/* indicates eio shutdown is in progress */
if (!timer_hash) return;
backend->timer = ecore_timer_add(fallback_interval, _eio_monitor_fallback_timer_cb, backend);
eina_hash_set(timer_hash, &backend, backend->timer);
}
@ -232,9 +240,12 @@ _eio_monitor_fallback_cancel_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
backend->work = NULL;
if (backend->delete_me)
{
eina_hash_free(backend->children);
free(backend);
return;
}
/* indicates eio shutdown is in progress */
if (!timer_hash) return;
backend->timer = ecore_timer_add(fallback_interval, _eio_monitor_fallback_timer_cb, backend);
eina_hash_set(timer_hash, &backend, backend->timer);
}
@ -338,18 +349,16 @@ eio_monitor_fallback_del(Eio_Monitor *monitor)
monitor->backend = NULL;
if (!backend) return;
backend->delete_me = EINA_TRUE;
if (backend->work) ecore_thread_cancel(backend->work);
if (backend->timer) ecore_timer_del(backend->timer);
eina_hash_set(timer_hash, &backend, NULL);
backend->timer = NULL;
if (backend->idler) ecore_idler_del(backend->idler);
backend->idler = NULL;
if (backend->work && !ecore_thread_wait(backend->work, 0.3))
if (backend->work)
{
backend->delete_me = EINA_TRUE;
ecore_thread_cancel(backend->work);
return;
}