* eina: Add eina_cpu_count.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@41543 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/engines/common/evas_cpu.c b/src/lib/engines/common/evas_cpu.c
index 68a3821..1cc567f 100644 (file)
--- a/src/lib/engines/common/evas_cpu.c
+++ b/src/lib/engines/common/evas_cpu.c
@@ -245,30 +245,3 @@ evas_common_cpu_end_opt(void)
 {
 }
 #endif
-
-EAPI int
-evas_common_cpu_count(void)
-{
-#ifdef BUILD_PTHREAD
-   cpu_set_t cpu;
-   int i;
-   static int cpus = 0;
-
-   if (cpus != 0) return cpus;
-
-   CPU_ZERO(&cpu);
-   if (sched_getaffinity(0, sizeof(cpu), &cpu) != 0)
-     {
-       printf("[Evas] could not get cpu affinity: %s\n", strerror(errno));
-       return 1;
-     }
-   for (i = 0; i < TH_MAX; i++)
-     {
-       if (CPU_ISSET(i, &cpu)) cpus = i + 1;
-       else break;
-     }
-   return cpus;
-#else
-   return 1;
-#endif
-}

diff --git a/src/lib/engines/common/evas_pipe.c b/src/lib/engines/common/evas_pipe.c
index 8a2faf5..9d35b25 100644 (file)
--- a/src/lib/engines/common/evas_pipe.c
+++ b/src/lib/engines/common/evas_pipe.c
@@ -126,7 +126,7 @@ evas_common_pipe_begin(RGBA_Image *im)
      {
        int cpunum;
 
-       cpunum = evas_common_cpu_count();
+       cpunum = eina_cpu_count();
        thread_num = cpunum;
        if (thread_num == 1) return;
        pthread_barrier_init(&(thbarrier[0]), NULL, thread_num + 1);

diff --git a/src/lib/include/evas_common.h b/src/lib/include/evas_common.h
index f4b7286..c0c5cde 100644 (file)
--- a/src/lib/include/evas_common.h
+++ b/src/lib/include/evas_common.h
@@ -1069,7 +1069,6 @@ int  evas_common_cpu_have_cpuid                         (void);
 int  evas_common_cpu_has_feature                        (unsigned int feature);
 EAPI void evas_common_cpu_can_do                        (int *mmx, int *sse, int *sse2);
 EAPI void evas_common_cpu_end_opt                       (void);
-EAPI int evas_common_cpu_count                          (void);
 
 /****/
 #include "../engines/common/evas_blend.h"

diff --git a/src/modules/engines/software_generic/evas_engine.c b/src/modules/engines/software_generic/evas_engine.c
index 2816dfb..10776d7 100644 (file)
--- a/src/modules/engines/software_generic/evas_engine.c
+++ b/src/modules/engines/software_generic/evas_engine.c
@@ -1132,7 +1132,7 @@ module_open(Evas_Module *em)
 {
    if (!em) return 0;
    em->functions = (void *)(&func);
-   cpunum = evas_common_cpu_count();
+   cpunum = eina_cpu_count();
    return 1;
 }