aboutsummaryrefslogtreecommitdiffstats
path: root/legacy/ecore/src/lib/ecore/ecore.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2011-12-23 11:40:05 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-12-23 11:40:05 +0000
commitbd24931df18c774c5f43cc6d3bcc1e1baa0c2649 (patch)
tree9e8974872345623ebe6a36aaff35bfb9780b5b63 /legacy/ecore/src/lib/ecore/ecore.c
parentfix ico loader bug. (diff)
downloadefl-bd24931df18c774c5f43cc6d3bcc1e1baa0c2649.tar.gz
disable bugfix for now. leave commented as note.
SVN revision: 66477
Diffstat (limited to 'legacy/ecore/src/lib/ecore/ecore.c')
-rw-r--r--legacy/ecore/src/lib/ecore/ecore.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c
index 3430e974ac..7e0f9738d4 100644
--- a/legacy/ecore/src/lib/ecore/ecore.c
+++ b/legacy/ecore/src/lib/ecore/ecore.c
@@ -217,7 +217,6 @@ shutdown_evil:
EAPI int
ecore_shutdown(void)
{
- Ecore_Pipe *p;
/*
* take a lock here because _ecore_event_shutdown() does callbacks
*/
@@ -225,15 +224,21 @@ ecore_shutdown(void)
if (--_ecore_init_count != 0)
goto unlock;
- /* this looks horrible - a hack for now, but something to note. as
- * we delete the _thread_call pipe a thread COULD be doing
- * ecore_pipe_write() or what not to it at the same time - we
- * must ensure all possible users of this _thread_call are finished
- * and exited before we delete it here */
+ /* this looks horrible - a hack for now, but something to note. as
+ * we delete the _thread_call pipe a thread COULD be doing
+ * ecore_pipe_write() or what not to it at the same time - we
+ * must ensure all possible users of this _thread_call are finished
+ * and exited before we delete it here */
+ /*
+ * ok - this causes other valgrind complaints regarding glib aquiring
+ * locks internally. so fix bug a or bug b. let's leave the original
+ * bug in then and leave this as a note for now
+ Ecore_Pipe *p;
p = _thread_call;
_thread_call = NULL;
ecore_pipe_wait(p, 1, 0.1);
ecore_pipe_del(p);
+ */
eina_lock_free(&_thread_safety);
eina_condition_free(&_thread_cond);
eina_lock_free(&_thread_mutex);