forked from enlightenment/efl
Revert "ecore/thread: track "no_queue" threads"
This reverts commit 1e47db6a71
.
somehow arc managed to land an old revision of this which was not consistent
with the final version of D6354
This commit is contained in:
parent
32cebe903d
commit
8d2f5d7a7d
|
@ -460,13 +460,10 @@ _ecore_direct_worker_cleanup(void *data)
|
||||||
|
|
||||||
DBG("cleanup work=%p, thread=%" PRIu64 " (should join)", work, (uint64_t)work->self);
|
DBG("cleanup work=%p, thread=%" PRIu64 " (should join)", work, (uint64_t)work->self);
|
||||||
|
|
||||||
SLKL(_ecore_pending_job_threads_mutex);
|
|
||||||
_ecore_thread_count--;
|
|
||||||
ecore_main_loop_thread_safe_call_async(_ecore_thread_handler, work);
|
ecore_main_loop_thread_safe_call_async(_ecore_thread_handler, work);
|
||||||
|
|
||||||
ecore_main_loop_thread_safe_call_async((Ecore_Cb)_ecore_thread_join,
|
ecore_main_loop_thread_safe_call_async((Ecore_Cb)_ecore_thread_join,
|
||||||
(void *)(intptr_t)PHS());
|
(void *)(intptr_t)PHS());
|
||||||
SLKU(_ecore_pending_job_threads_mutex);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
|
@ -689,7 +686,7 @@ ecore_thread_run(Ecore_Thread_Cb func_blocking,
|
||||||
SLKL(_ecore_pending_job_threads_mutex);
|
SLKL(_ecore_pending_job_threads_mutex);
|
||||||
_ecore_pending_job_threads = eina_list_append(_ecore_pending_job_threads, work);
|
_ecore_pending_job_threads = eina_list_append(_ecore_pending_job_threads, work);
|
||||||
|
|
||||||
if (_ecore_thread_count >= _ecore_thread_count_max)
|
if (_ecore_thread_count == _ecore_thread_count_max)
|
||||||
{
|
{
|
||||||
SLKU(_ecore_pending_job_threads_mutex);
|
SLKU(_ecore_pending_job_threads_mutex);
|
||||||
return (Ecore_Thread *)work;
|
return (Ecore_Thread *)work;
|
||||||
|
@ -950,12 +947,7 @@ ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy,
|
||||||
|
|
||||||
retry_direct:
|
retry_direct:
|
||||||
if (PHC(t, _ecore_direct_worker, worker))
|
if (PHC(t, _ecore_direct_worker, worker))
|
||||||
{
|
return (Ecore_Thread *)worker;
|
||||||
SLKL(_ecore_pending_job_threads_mutex);
|
|
||||||
_ecore_thread_count++;
|
|
||||||
SLKU(_ecore_pending_job_threads_mutex);
|
|
||||||
return (Ecore_Thread *)worker;
|
|
||||||
}
|
|
||||||
if (!tried)
|
if (!tried)
|
||||||
{
|
{
|
||||||
_ecore_main_call_flush();
|
_ecore_main_call_flush();
|
||||||
|
@ -977,7 +969,7 @@ retry_direct:
|
||||||
SLKL(_ecore_pending_job_threads_mutex);
|
SLKL(_ecore_pending_job_threads_mutex);
|
||||||
_ecore_pending_job_threads_feedback = eina_list_append(_ecore_pending_job_threads_feedback, worker);
|
_ecore_pending_job_threads_feedback = eina_list_append(_ecore_pending_job_threads_feedback, worker);
|
||||||
|
|
||||||
if (_ecore_thread_count >= _ecore_thread_count_max)
|
if (_ecore_thread_count == _ecore_thread_count_max)
|
||||||
{
|
{
|
||||||
SLKU(_ecore_pending_job_threads_mutex);
|
SLKU(_ecore_pending_job_threads_mutex);
|
||||||
return (Ecore_Thread *)worker;
|
return (Ecore_Thread *)worker;
|
||||||
|
|
Loading…
Reference in New Issue