From 83c3a1a0fb0d5a235883d7140aa1ebc93632fa50 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 9 May 2011 10:29:55 +0000 Subject: [PATCH] eina: check pending lock at the right time. SVN revision: 59286 --- legacy/eina/src/lib/eina_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/legacy/eina/src/lib/eina_main.c b/legacy/eina/src/lib/eina_main.c index d39f60b8f2..bb60c19d0f 100644 --- a/legacy/eina/src/lib/eina_main.c +++ b/legacy/eina/src/lib/eina_main.c @@ -283,7 +283,13 @@ eina_threads_shutdown(void) assert(pthread_equal(_eina_main_loop, pthread_self())); assert(_eina_main_thread_count > 0); +#endif + ret = --_eina_main_thread_count; + if(_eina_main_thread_count > 0) + return ret; + +#ifdef EINA_HAVE_DEBUG_THREADS pthread_mutex_lock(&_eina_tracking_lock); if (_eina_tracking) { @@ -297,13 +303,8 @@ eina_threads_shutdown(void) abort(); } pthread_mutex_unlock(&_eina_tracking_lock); - #endif - ret = --_eina_main_thread_count; - if(_eina_main_thread_count > 0) - return ret; - eina_share_common_threads_shutdown(); eina_log_threads_shutdown();