stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=dbf7057bca7f36c8ffa2cb2e60d9c148433b3301

commit dbf7057bca7f36c8ffa2cb2e60d9c148433b3301
Author: Stefan Schmidt <ste...@osg.samsung.com>
Date:   Mon Aug 7 11:53:00 2017 +0200

    Revert "efl: terrible kludge so avoid termination crash on osx"
    
    This reverts commit 9368eedd353a88dd31ba50c71433f81a2978adb5.
    
    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.
---
 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 a987c9e23c..03f70dc032 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 2f3b291927..bbde81a657 100644
--- a/src/lib/evas/common/evas_thread_render.c
+++ b/src/lib/evas/common/evas_thread_render.c
@@ -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);

-- 


Reply via email to