aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-06-25 16:53:40 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-06-25 16:53:40 -0400
commit8d2f5d7a7d4774739775fcec05e0d489270b5c1e (patch)
treebee8b1b4968375197f7b71d02c52559e1bb3bfec
parenttests: split a large failure case for eina_file tests to provide more info (diff)
downloadefl-8d2f5d7a7d4774739775fcec05e0d489270b5c1e.tar.gz
Revert "ecore/thread: track "no_queue" threads"
This reverts commit 1e47db6a711a1f605bc765cb694d575af28ab85e. somehow arc managed to land an old revision of this which was not consistent with the final version of https://phab.enlightenment.org/D6354
-rw-r--r--src/lib/ecore/ecore_thread.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c
index 97de931aea..c8f76139fd 100644
--- a/src/lib/ecore/ecore_thread.c
+++ b/src/lib/ecore/ecore_thread.c
@@ -460,13 +460,10 @@ _ecore_direct_worker_cleanup(void *data)
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_Cb)_ecore_thread_join,
(void *)(intptr_t)PHS());
- SLKU(_ecore_pending_job_threads_mutex);
}
static void *
@@ -689,7 +686,7 @@ ecore_thread_run(Ecore_Thread_Cb func_blocking,
SLKL(_ecore_pending_job_threads_mutex);
_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);
return (Ecore_Thread *)work;
@@ -950,12 +947,7 @@ ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy,
retry_direct:
if (PHC(t, _ecore_direct_worker, worker))
- {
- SLKL(_ecore_pending_job_threads_mutex);
- _ecore_thread_count++;
- SLKU(_ecore_pending_job_threads_mutex);
- return (Ecore_Thread *)worker;
- }
+ return (Ecore_Thread *)worker;
if (!tried)
{
_ecore_main_call_flush();
@@ -977,7 +969,7 @@ retry_direct:
SLKL(_ecore_pending_job_threads_mutex);
_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);
return (Ecore_Thread *)worker;