eina: add Eina_Thread API.

[profile/ivi/eina.git] / src / lib / eina_main.c

diff --git a/src/lib/eina_main.c b/src/lib/eina_main.c
index 3780ada..fb2bb0d 100644 (file)
--- a/src/lib/eina_main.c
+++ b/src/lib/eina_main.c
@@ -37,7 +37,7 @@
 # endif
 #endif
 
-#ifdef HAVE_MCHECK
+#ifdef HAVE_MCHECK_H
 # ifdef HAVE_MTRACE
 #  define MT 1
 # endif
@@ -66,6 +66,12 @@
 #include "eina_magic.h"
 #include "eina_rectangle.h"
 #include "eina_safety_checks.h"
+#include "eina_inlist.h"
+#include "eina_inarray.h"
+#include "eina_value.h"
+/* no model for now
+#include "eina_model.h"
+ */
 
 /*============================================================================*
 *                                  Local                                     *
@@ -111,10 +117,12 @@ static pid_t _eina_pid;
 static int _mt_enabled = 0;
 #endif
 
-#ifdef EINA_HAVE_DEBUG_THREADS
+#ifdef EFL_HAVE_THREADS
 EAPI int _eina_threads_debug = 0;
+# if !defined(_WIN32_WCE) && !defined(_WIN32)
 EAPI pthread_mutex_t _eina_tracking_lock;
 EAPI Eina_Inlist *_eina_tracking = NULL;
+# endif
 #endif
 
 /* place module init/shutdown functions here to avoid other modules
@@ -128,6 +136,7 @@ EAPI Eina_Inlist *_eina_tracking = NULL;
    S(magic_string);
    S(iterator);
    S(accessor);
+   S(inarray);
    S(array);
    S(module);
    S(mempool);
@@ -146,6 +155,12 @@ EAPI Eina_Inlist *_eina_tracking = NULL;
    S(simple_xml);
    S(file);
    S(prefix);
+   S(value);
+   S(tmpstr);
+   S(thread);
+/* no model for now
+   S(model);
+ */
 #undef S
 
 struct eina_desc_setup
@@ -158,17 +173,18 @@ struct eina_desc_setup
 static const struct eina_desc_setup _eina_desc_setup[] = {
 #define S(x) {# x, eina_ ## x ## _init, eina_ ## x ## _shutdown}
    /* log is a special case as it needs printf */
+   S(stringshare),
    S(error),
    S(safety_checks),
    S(magic_string),
    S(iterator),
    S(accessor),
+   S(inarray),
    S(array),
    S(module),
    S(mempool),
    S(list),
    S(binshare),
-   S(stringshare),
    S(ustringshare),
    S(matrixsparse),
    S(convert),
@@ -180,7 +196,13 @@ static const struct eina_desc_setup _eina_desc_setup[] = {
    S(quadtree),
    S(simple_xml),
    S(file),
-   S(prefix)
+   S(prefix),
+   S(value),
+   S(tmpstr),
+   S(thread)
+/* no model for now
+   S(model)
+ */
 #undef S
 };
 static const size_t _eina_desc_setup_len = sizeof(_eina_desc_setup) /
@@ -233,8 +255,8 @@ eina_init(void)
         _mt_enabled = 1;
         mtrace();
      }
-#endif   
-   
+#endif
+
    if (!eina_log_init())
      {
         fprintf(stderr, "Could not initialize eina logging system.\n");
@@ -280,6 +302,8 @@ eina_init(void)
           }
      }
 
+   eina_cpu_count_internal();
+
    _eina_main_count = 1;
    return 1;
 }
@@ -287,6 +311,11 @@ eina_init(void)
 EAPI int
 eina_shutdown(void)
 {
+   if (_eina_main_count <= 0)
+     {
+        ERR("Init count not greater than 0 in shutdown.");
+        return 0;
+     }
    _eina_main_count--;
    if (EINA_UNLIKELY(_eina_main_count == 0))
      {
@@ -301,7 +330,7 @@ eina_shutdown(void)
              muntrace();
              _mt_enabled = 0;
           }
-#endif   
+#endif
      }
 
    return _eina_main_count;
@@ -360,7 +389,10 @@ eina_threads_shutdown(void)
        fprintf(stderr, "* LOCK STILL TAKEN :    *\n");
        fprintf(stderr, "*************************\n");
        EINA_INLIST_FOREACH(_eina_tracking, lk)
-        eina_lock_debug(lk);
+        {
+            fprintf(stderr, "=======\n");
+            eina_lock_debug(lk);
+        }
        fprintf(stderr, "*************************\n");
        abort();
      }
@@ -382,18 +414,25 @@ EAPI Eina_Bool
 eina_main_loop_is(void)
 {
 #ifdef EFL_HAVE_THREADS
-   pid_t pid = getpid();
+  pid_t pid;
 
 # ifdef _WIN32
+   if (_eina_main_loop == GetCurrentThreadId())
+     return EINA_TRUE;
+# else
+   if (pthread_equal(_eina_main_loop, pthread_self()))
+     return EINA_TRUE;
+# endif
+
+   pid = getpid();
+# ifdef _WIN32
    if (pid != _eina_pid)
      {
         _eina_pid = pid;
         _eina_main_loop = GetCurrentThreadId();
         return EINA_TRUE;
      }
-   if (_eina_main_loop == GetCurrentThreadId())
-     return EINA_TRUE;
-# else
+#else
    if (pid != _eina_pid)
      {
         /* This is in case of a fork, but don't like the solution */
@@ -401,11 +440,9 @@ eina_main_loop_is(void)
         _eina_main_loop = pthread_self();
         return EINA_TRUE;
      }
-
-   if (pthread_equal(_eina_main_loop, pthread_self()))
-     return EINA_TRUE;
-# endif
 #endif
+#endif
+
    return EINA_FALSE;
 }