From 10f9d3a21567bde6927d3a9d710cfe53526419ad Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 19 Oct 2012 10:56:34 +0000 Subject: [PATCH] evas: move to Eina_Thread. SVN revision: 78245 --- legacy/evas/src/lib/cache/evas_preload.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/legacy/evas/src/lib/cache/evas_preload.c b/legacy/evas/src/lib/cache/evas_preload.c index 6909d5c9f6..a9c79f3d97 100644 --- a/legacy/evas/src/lib/cache/evas_preload.c +++ b/legacy/evas/src/lib/cache/evas_preload.c @@ -4,7 +4,6 @@ #ifdef HAVE_EVIL # include #endif -#include #ifdef __linux__ # include #endif @@ -32,7 +31,7 @@ struct _Evas_Preload_Pthread_Worker struct _Evas_Preload_Pthread_Data { - pthread_t thread; + Eina_Thread thread; }; static int _threads_count = 0; @@ -46,7 +45,7 @@ _evas_preload_thread_end(void *data) Evas_Preload_Pthread_Data *pth = data; Evas_Preload_Pthread_Data *p = NULL; - if (pthread_join(pth->thread, (void **)&p) == 0) free(p); + if ((p = eina_thread_join(pth->thread))) free(p); else return; eina_threads_shutdown(); } @@ -66,14 +65,11 @@ _evas_preload_thread_done(void *target __UNUSED__, Evas_Callback_Type type __UNU } static void * -_evas_preload_thread_worker(void *data) +_evas_preload_thread_worker(void *data, Eina_Thread thread __UNUSED__) { Evas_Preload_Pthread_Data *pth = data; Evas_Preload_Pthread_Worker *work; - eina_sched_prio_drop(); - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); - pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); on_error: for (;;) { @@ -186,7 +182,7 @@ evas_preload_thread_run(void (*func_heavy) (void *data), eina_threads_init(); - if (pthread_create(&pth->thread, NULL, _evas_preload_thread_worker, pth) == 0) + if (eina_thread_create(&pth->thread, EINA_THREAD_BACKGROUND, -1, _evas_preload_thread_worker, pth)) { LKL(_mutex); _threads_count++;