enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

man I fail at formatting 

SVN revision: 50406
This commit is contained in:
Mike Blumenkrantz 2010-07-21 04:26:57 +00:00
parent 82d7183f47
commit 00023656af
1 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
legacy/ecore/src/lib/ecore/ecore_thread.c
View File

@ -20,16 +20,16 @@ struct _Ecore_Pthread_Worker
{ {
union { union {
struct { struct {
void (*func_blocking)(void *data); void (*func_blocking)(void *data);
} short_run; } short_run;
struct { struct {
void (*func_heavy)(Ecore_Thread *thread, void *data); void (*func_heavy)(Ecore_Thread *thread, void *data);
void (*func_notify)(Ecore_Thread *thread, void *msg_data, void *data); void (*func_notify)(Ecore_Thread *thread, void *msg_data, void *data);
Ecore_Pipe *notify; Ecore_Pipe *notify;
#ifdef EFL_HAVE_PTHREAD #ifdef EFL_HAVE_PTHREAD
pthread_t self; pthread_t self;
#endif #endif
} long_run; } long_run;
} u; } u;
@ -105,13 +105,13 @@ _ecore_thread_handler(void *data __UNUSED__, void *buffer, unsigned int nbyte)
if (work->cancel) if (work->cancel)
{ {
if (work->func_cancel) if (work->func_cancel)
work->func_cancel((void *) work->data); work->func_cancel((void *) work->data);
} }
else else
{ {
if (work->func_end) if (work->func_end)
work->func_end((void *) work->data); work->func_end((void *) work->data);
} }
if (work->long_run) ecore_pipe_del(work->u.long_run.notify); if (work->long_run) ecore_pipe_del(work->u.long_run.notify);
@ -139,22 +139,22 @@ _ecore_short_job(Ecore_Pipe *end_pipe)
while (_ecore_pending_job_threads) while (_ecore_pending_job_threads)
{ {
pthread_mutex_lock(&_mutex); pthread_mutex_lock(&_mutex);
if (!_ecore_pending_job_threads) if (!_ecore_pending_job_threads)
{ {
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
break; break;
} }
work = eina_list_data_get(_ecore_pending_job_threads); work = eina_list_data_get(_ecore_pending_job_threads);
_ecore_pending_job_threads = eina_list_remove_list(_ecore_pending_job_threads, _ecore_pending_job_threads); _ecore_pending_job_threads = eina_list_remove_list(_ecore_pending_job_threads, _ecore_pending_job_threads);
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
work->u.short_run.func_blocking((void *) work->data); work->u.short_run.func_blocking((void *) work->data);
ecore_pipe_write(end_pipe, &work, sizeof (Ecore_Pthread_Worker *)); ecore_pipe_write(end_pipe, &work, sizeof (Ecore_Pthread_Worker *));
} }
} }
@ -165,23 +165,23 @@ _ecore_long_job(Ecore_Pipe *end_pipe, pthread_t thread)
while (_ecore_pending_job_threads_long) while (_ecore_pending_job_threads_long)
{ {
pthread_mutex_lock(&_mutex); pthread_mutex_lock(&_mutex);
if (!_ecore_pending_job_threads_long) if (!_ecore_pending_job_threads_long)
{ {
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
break; break;
} }
work = eina_list_data_get(_ecore_pending_job_threads_long); work = eina_list_data_get(_ecore_pending_job_threads_long);
_ecore_pending_job_threads_long = eina_list_remove_list(_ecore_pending_job_threads_long, _ecore_pending_job_threads_long); _ecore_pending_job_threads_long = eina_list_remove_list(_ecore_pending_job_threads_long, _ecore_pending_job_threads_long);
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
work->u.long_run.self = thread; work->u.long_run.self = thread;
work->u.long_run.func_heavy((Ecore_Thread *) work, (void *) work->data); work->u.long_run.func_heavy((Ecore_Thread *) work, (void *) work->data);
ecore_pipe_write(end_pipe, &work, sizeof (Ecore_Pthread_Worker *)); ecore_pipe_write(end_pipe, &work, sizeof (Ecore_Pthread_Worker *));
} }
} }
@ -199,8 +199,8 @@ _ecore_direct_worker(Ecore_Pthread_Worker *work)
pth->p = ecore_pipe_add(_ecore_thread_handler, NULL); pth->p = ecore_pipe_add(_ecore_thread_handler, NULL);
if (!pth->p) if (!pth->p)
{ {
free(pth); free(pth);
return NULL; return NULL;
} }
pth->thread = pthread_self(); pth->thread = pthread_self();
@ -212,9 +212,9 @@ _ecore_direct_worker(Ecore_Pthread_Worker *work)
work = malloc(sizeof (Ecore_Pthread_Worker)); work = malloc(sizeof (Ecore_Pthread_Worker));
if (!work) if (!work)
{ {
ecore_pipe_del(pth->p); ecore_pipe_del(pth->p);
free(pth); free(pth);
return NULL; return NULL;
} }
work->data = pth; work->data = pth;
@ -250,13 +250,13 @@ _ecore_thread_worker(Ecore_Pthread_Data *pth)
pthread_mutex_lock(&_mutex); pthread_mutex_lock(&_mutex);
if (_ecore_pending_job_threads) if (_ecore_pending_job_threads)
{ {
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
goto on_error; goto on_error;
} }
if (_ecore_pending_job_threads_long) if (_ecore_pending_job_threads_long)
{ {
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
goto on_error; goto on_error;
} }
_ecore_thread_count--; _ecore_thread_count--;
@ -305,21 +305,21 @@ _ecore_thread_shutdown(void)
EINA_LIST_FREE(_ecore_pending_job_threads, work) EINA_LIST_FREE(_ecore_pending_job_threads, work)
{ {
if (work->func_cancel) if (work->func_cancel)
work->func_cancel((void *)work->data); work->func_cancel((void *)work->data);
free(work); free(work);
} }
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
EINA_LIST_FREE(_ecore_active_job_threads, pth) EINA_LIST_FREE(_ecore_active_job_threads, pth)
{ {
Ecore_Pipe *p; Ecore_Pipe *p;
pthread_cancel(pth->thread); pthread_cancel(pth->thread);
pthread_join(pth->thread, (void **) &p); pthread_join(pth->thread, (void **) &p);
ecore_pipe_del(pth->p); ecore_pipe_del(pth->p);
} }
ecore_event_handler_del(del_handler); ecore_event_handler_del(del_handler);
@ -329,7 +329,7 @@ _ecore_thread_shutdown(void)
/** /**
* @defgroup Ecore_Thread Ecore Thread Functions * @defgroup Ecore_Thread Ecore Thread Functions
* These functions allow for ecore-managed threads which integrate with ecore's main loop. * These functions allow for ecore-managed threads which integrate with ecore's main loop.
*/ */
/** /**
* @brief Run some blocking code in a parrallel thread to avoid locking the main loop. * @brief Run some blocking code in a parrallel thread to avoid locking the main loop.
@ -353,9 +353,9 @@ _ecore_thread_shutdown(void)
*/ */
EAPI Ecore_Thread * EAPI Ecore_Thread *
ecore_thread_run(void (*func_blocking)(void *data), ecore_thread_run(void (*func_blocking)(void *data),
void (*func_end)(void *data), void (*func_end)(void *data),
void (*func_cancel)(void *data), void (*func_cancel)(void *data),
const void *data) const void *data)
{ {
#ifdef EFL_HAVE_PTHREAD #ifdef EFL_HAVE_PTHREAD
Ecore_Pthread_Worker *work; Ecore_Pthread_Worker *work;
@ -367,7 +367,7 @@ ecore_thread_run(void (*func_blocking)(void *data),
if (!work) if (!work)
{ {
func_cancel((void *) data); func_cancel((void *) data);
return NULL; return NULL;
} }
work->u.short_run.func_blocking = func_blocking; work->u.short_run.func_blocking = func_blocking;
@ -382,8 +382,8 @@ ecore_thread_run(void (*func_blocking)(void *data),
if (_ecore_thread_count == _ecore_thread_count_max) if (_ecore_thread_count == _ecore_thread_count_max)
{ {
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
return (Ecore_Thread *) work; return (Ecore_Thread *) work;
} }
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
@ -401,16 +401,16 @@ ecore_thread_run(void (*func_blocking)(void *data),
on_error: on_error:
if (pth) if (pth)
{ {
if (pth->p) ecore_pipe_del(pth->p); if (pth->p) ecore_pipe_del(pth->p);
free(pth); free(pth);
} }
if (_ecore_thread_count == 0) if (_ecore_thread_count == 0)
{ {
if (work->func_cancel) if (work->func_cancel)
work->func_cancel((void *) work->data); work->func_cancel((void *) work->data);
free(work); free(work);
work = NULL; work = NULL;
} }
return (Ecore_Thread *) work; return (Ecore_Thread *) work;
#else #else
@ -452,15 +452,15 @@ ecore_thread_cancel(Ecore_Thread *thread)
EINA_LIST_FOREACH(_ecore_pending_job_threads, l, work) EINA_LIST_FOREACH(_ecore_pending_job_threads, l, work)
if ((void *) work == (void *) thread) if ((void *) work == (void *) thread)
{ {
_ecore_pending_job_threads = eina_list_remove_list(_ecore_pending_job_threads, l); _ecore_pending_job_threads = eina_list_remove_list(_ecore_pending_job_threads, l);
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
if (work->func_cancel) if (work->func_cancel)
work->func_cancel((void *) work->data); work->func_cancel((void *) work->data);
free(work); free(work);
return EINA_TRUE; return EINA_TRUE;
} }
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
@ -520,11 +520,11 @@ ecore_thread_check(Ecore_Thread *thread)
*/ */
EAPI Ecore_Thread * EAPI Ecore_Thread *
ecore_long_run(void (*func_heavy)(Ecore_Thread *thread, void *data), ecore_long_run(void (*func_heavy)(Ecore_Thread *thread, void *data),
void (*func_notify)(Ecore_Thread *thread, void *msg_data, void *data), void (*func_notify)(Ecore_Thread *thread, void *msg_data, void *data),
void (*func_end)(void *data), void (*func_end)(void *data),
void (*func_cancel)(void *data), void (*func_cancel)(void *data),
const void *data, const void *data,
Eina_Bool try_no_queue) Eina_Bool try_no_queue)
{ {
#ifdef EFL_HAVE_PTHREAD #ifdef EFL_HAVE_PTHREAD
@ -548,10 +548,10 @@ ecore_long_run(void (*func_heavy)(Ecore_Thread *thread, void *data),
if (!try_no_queue) if (!try_no_queue)
{ {
pthread_t t; pthread_t t;
if (pthread_create(&t, NULL, (void *) _ecore_direct_worker, worker) == 0) if (pthread_create(&t, NULL, (void *) _ecore_direct_worker, worker) == 0)
return (Ecore_Thread *) worker; return (Ecore_Thread *) worker;
} }
pthread_mutex_lock(&_mutex); pthread_mutex_lock(&_mutex);
@ -559,8 +559,8 @@ ecore_long_run(void (*func_heavy)(Ecore_Thread *thread, void *data),
if (_ecore_thread_count == _ecore_thread_count_max) if (_ecore_thread_count == _ecore_thread_count_max)
{ {
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
return (Ecore_Thread *) worker; return (Ecore_Thread *) worker;
} }
pthread_mutex_unlock(&_mutex); pthread_mutex_unlock(&_mutex);
@ -578,20 +578,20 @@ ecore_long_run(void (*func_heavy)(Ecore_Thread *thread, void *data),
on_error: on_error:
if (pth) if (pth)
{ {
if (pth->p) ecore_pipe_del(pth->p); if (pth->p) ecore_pipe_del(pth->p);
free(pth); free(pth);
} }
if (_ecore_thread_count == 0) if (_ecore_thread_count == 0)
{ {
if (func_cancel) func_cancel((void *) data); if (func_cancel) func_cancel((void *) data);
if (worker) if (worker)
{ {
ecore_pipe_del(worker->u.long_run.notify); ecore_pipe_del(worker->u.long_run.notify);
free(worker); free(worker);
worker = NULL; worker = NULL;
} }
} }
return (Ecore_Thread *) worker; return (Ecore_Thread *) worker;
@ -728,7 +728,7 @@ ecore_thread_pending_total_get(void)
EAPI int EAPI int
ecore_thread_max_get(void) ecore_thread_max_get(void)
{ {
return _ecore_thread_count_max; return _ecore_thread_count_max;
} }
/** /**