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

Revert "efl: terrible kludge so avoid termination crash on osx" 

This reverts commit 9368eedd35.

The release is out so we can revert this bandaid again. In the hope to
find the real culprit and solution before the next release.
This commit is contained in:
Stefan Schmidt 2017-08-07 11:53:00 +02:00
parent 40945d9859
commit dbf7057bca
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

@ -261,21 +261,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);