enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

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 cd5e755951.

ref T5245
This commit is contained in:
Stefan Schmidt 2017-04-13 14:32:07 +02:00
parent 53fef30db0
commit 9a15eeaced
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/elementary/elm_module.c
View File

@ -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;

14
src/lib/evas/common/evas_thread_render.c
View File

@ -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);