cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=aef1ee96e854cc0e4991559c9346288c5cd82c38
commit aef1ee96e854cc0e4991559c9346288c5cd82c38
Author: Cedric BAIL <ced...@osg.samsung.com>
Date: Thu Mar 9 16:16:45 2017 -0800
eio: avoid crash during shutdown due to Ecore_Event queue.
---
src/lib/eio/eio_monitor.c | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/lib/eio/eio_monitor.c b/src/lib/eio/eio_monitor.c
index 5c4eb8f..ccc13c4 100644
--- a/src/lib/eio/eio_monitor.c
+++ b/src/lib/eio/eio_monitor.c
@@ -140,17 +140,20 @@ _eio_monitor_error_cb(void *data, Eio_File *handler
EINA_UNUSED, int error)
void
eio_monitor_init(void)
{
- EIO_MONITOR_ERROR = ecore_event_type_new();
- EIO_MONITOR_SELF_RENAME = ecore_event_type_new();
- EIO_MONITOR_SELF_DELETED = ecore_event_type_new();
- EIO_MONITOR_FILE_CREATED = ecore_event_type_new();
- EIO_MONITOR_FILE_DELETED = ecore_event_type_new();
- EIO_MONITOR_FILE_MODIFIED = ecore_event_type_new();
- EIO_MONITOR_FILE_CLOSED = ecore_event_type_new();
- EIO_MONITOR_DIRECTORY_CREATED = ecore_event_type_new();
- EIO_MONITOR_DIRECTORY_DELETED = ecore_event_type_new();
- EIO_MONITOR_DIRECTORY_MODIFIED = ecore_event_type_new();
- EIO_MONITOR_DIRECTORY_CLOSED = ecore_event_type_new();
+ if (EIO_MONITOR_ERROR == 0)
+ {
+ EIO_MONITOR_ERROR = ecore_event_type_new();
+ EIO_MONITOR_SELF_RENAME = ecore_event_type_new();
+ EIO_MONITOR_SELF_DELETED = ecore_event_type_new();
+ EIO_MONITOR_FILE_CREATED = ecore_event_type_new();
+ EIO_MONITOR_FILE_DELETED = ecore_event_type_new();
+ EIO_MONITOR_FILE_MODIFIED = ecore_event_type_new();
+ EIO_MONITOR_FILE_CLOSED = ecore_event_type_new();
+ EIO_MONITOR_DIRECTORY_CREATED = ecore_event_type_new();
+ EIO_MONITOR_DIRECTORY_DELETED = ecore_event_type_new();
+ EIO_MONITOR_DIRECTORY_MODIFIED = ecore_event_type_new();
+ EIO_MONITOR_DIRECTORY_CLOSED = ecore_event_type_new();
+ }
eio_monitor_backend_init();
eio_monitor_fallback_init();
@@ -168,6 +171,18 @@ eio_monitor_shutdown(void)
Eina_Iterator *it;
Eio_Monitor *monitor;
+ ecore_event_type_flush(EIO_MONITOR_ERROR,
+ EIO_MONITOR_SELF_RENAME,
+ EIO_MONITOR_SELF_DELETED,
+ EIO_MONITOR_FILE_CREATED,
+ EIO_MONITOR_FILE_DELETED,
+ EIO_MONITOR_FILE_MODIFIED,
+ EIO_MONITOR_FILE_CLOSED,
+ EIO_MONITOR_DIRECTORY_CREATED,
+ EIO_MONITOR_DIRECTORY_DELETED,
+ EIO_MONITOR_DIRECTORY_MODIFIED,
+ EIO_MONITOR_DIRECTORY_CLOSED);
+
it = eina_hash_iterator_data_new(_eio_monitors);
EINA_ITERATOR_FOREACH(it, monitor)
{
--
