From 26a70367b8f4d71f3c2132a9f31ef94daf0dfebe Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 25 Aug 2014 12:27:54 -0700 Subject: [PATCH] pthreadpool: Slightly serialize jobs Using the new msg_source program with 1.500 instances against a single msg_sink I found the msg_source process to spawn two worker threads for synchronously sending the data towards the receiving socket. This should not happen: Per destination node we only create one queue. We strictly only add pthreadpool jobs one after the other, so a single helper thread should be perfectly sufficient. It turned out that under heavy overload the main sending thread was scheduled before the thread that just had finished its send() job. So the helper thread was not able to increment the pool->num_idle variable indicating that we don't have to create a new thread when the new job is added. This patch moves the signalling write under the mutex. This means that indicating readiness via the pipe and the pool->num_idle variable happen both under the same mutex lock and thus are atomic. No superfluous threads anymore. Back port of commit 1c4284c7395f23cefa61a407db74cf5067aee2aa that went into master. https://bugzilla.samba.org/show_bug.cgi?id=10779 Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/lib/pthreadpool/pthreadpool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/lib/pthreadpool/pthreadpool.c b/source3/lib/pthreadpool/pthreadpool.c index c5c9367da16..9c781cf1d6e 100644 --- a/source3/lib/pthreadpool/pthreadpool.c +++ b/source3/lib/pthreadpool/pthreadpool.c @@ -488,14 +488,14 @@ static void *pthreadpool_server(void *arg) job->fn(job->private_data); + res = pthread_mutex_lock(&pool->mutex); + assert(res == 0); + written = write(pool->sig_pipe[1], &job->id, sizeof(int)); free(job); - res = pthread_mutex_lock(&pool->mutex); - assert(res == 0); - if (written != sizeof(int)) { pthreadpool_server_exit(pool); pthread_mutex_unlock(&pool->mutex); -- 2.11.4.GIT