stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9a15eeacedf2266f995f80d49c0b1b68f3e0b13d
commit 9a15eeacedf2266f995f80d49c0b1b68f3e0b13d
Author: Stefan Schmidt <ste...@osg.samsung.com>
Date: Thu Apr 13 14:32:07 2017 +0200
Revert "efl: terrible kludge so avoid termination crash on osx"
The only purpose of this commit was to allow efl 1.19 to be
released on macOS wothout crashing on termination. Time to revert
it and see that we can find a real fix for the next release.
This reverts commit cd5e755951c0126f136b6e7cfded14056d8336fa.
ref T5245
---
src/lib/elementary/elm_module.c | 14 --------------
src/lib/evas/common/evas_thread_render.c | 14 --------------
2 files changed, 28 deletions(-)
diff --git a/src/lib/elementary/elm_module.c b/src/lib/elementary/elm_module.c
index a987c9e..03f70dc 100644
--- a/src/lib/elementary/elm_module.c
+++ b/src/lib/elementary/elm_module.c
@@ -190,22 +190,8 @@ _elm_module_unload(Elm_Module *m)
if (m->module)
{
if (m->shutdown_func) m->shutdown_func(m);
-#if defined(__APPLE__) && defined(__MACH__)
- /*
- * FIXME
- *
- * MacOS currently undergo a fatal issue on shutdown: dlsym()
- * crashes. I still have no clue why... Sue to the imminent release,
- * let's NOT shutdown the module. Do nothing...
- *
- * THIS IS A TERRIBLE KLUDGE. IT MUST NOT STAY AFTER THE RELEASE OCCURS!
- *
- * FIXME
- */
-#else
eina_module_unload(m->module);
eina_module_free(m->module);
-#endif
m->module = NULL;
}
m->shutdown_func = NULL;
diff --git a/src/lib/evas/common/evas_thread_render.c
b/src/lib/evas/common/evas_thread_render.c
index e66acd5..8595566 100644
--- a/src/lib/evas/common/evas_thread_render.c
+++ b/src/lib/evas/common/evas_thread_render.c
@@ -220,21 +220,7 @@ evas_thread_shutdown(void)
}
}
-#if defined(__APPLE__) && defined(__MACH__)
- /*
- * FIXME
- *
- * MacOS currently undergo a fatal issue on shutdown: pthread_join()
- * crashes. I still have no clue why... Sue to the imminent release,
- * let's NOT join this thread: do nothing at all!
- *
- * THIS IS A TERRIBLE KLUDGE. IT MUST NOT STAY AFTER THE RELEASE OCCURS!
- *
- * FIXME
- */
-#else
eina_thread_join(evas_thread_worker);
-#endif
timeout_shutdown:
eina_lock_free(&evas_thread_queue_lock);
eina_condition_free(&evas_thread_queue_condition);
--
