NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* ecore: remove thread from the correct list. 

SVN revision: 53029
This commit is contained in:
Cedric BAIL 2010-10-04 15:24:34 +00:00
parent 21a7dde012
commit 05262d2120
1 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,30 +504,49 @@ ecore_thread_cancel(Ecore_Thread *thread)
#ifdef EFL_HAVE_PTHREAD #ifdef EFL_HAVE_PTHREAD
Ecore_Pthread_Worker *work = (Ecore_Pthread_Worker *)thread; Ecore_Pthread_Worker *work = (Ecore_Pthread_Worker *)thread;
Eina_List *l; Eina_List *l;
if (!work) if (!work)
return EINA_TRUE; return EINA_TRUE;
if (work->cancel)
return EINA_FALSE;
pthread_mutex_lock(&_ecore_pending_job_threads_mutex); pthread_mutex_lock(&_ecore_pending_job_threads_mutex);
if ((have_main_loop_thread) && if ((have_main_loop_thread) &&
(pthread_equal(main_loop_thread, pthread_self()))) (pthread_equal(main_loop_thread, pthread_self())))
{ {
EINA_LIST_FOREACH(_ecore_pending_job_threads, l, work) if (!work->feedback_run)
{ 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(&_ecore_pending_job_threads_mutex);
pthread_mutex_unlock(&_ecore_pending_job_threads_mutex);
if (work->func_cancel)
work->func_cancel((void *) work->data); if (work->func_cancel)
free(work); work->func_cancel((void *) work->data);
free(work);
return EINA_TRUE;
} return EINA_TRUE;
} }
}
else
EINA_LIST_FOREACH(_ecore_pending_job_threads_feedback, l, work)
{
if ((void *) work == (void *) thread)
{
_ecore_pending_job_threads_feedback = eina_list_remove_list(_ecore_pending_job_threads_feedback, l);
pthread_mutex_unlock(&_ecore_pending_job_threads_mutex);
if (work->func_cancel)
work->func_cancel((void *) work->data);
free(work);
return EINA_TRUE;
}
}
} }
pthread_mutex_unlock(&_ecore_pending_job_threads_mutex); pthread_mutex_unlock(&_ecore_pending_job_threads_mutex);