From: Lai Jiangshan <laijs@cn.fujitsu.com>
To: Pekka Enberg <penberg@kernel.org>, Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org, Lai Jiangshan <laijs@cn.fujitsu.com>
Subject: [PATCH 01/11] kvm tools: check condition before wait
Date: Mon, 12 Dec 2011 15:15:45 +0800 [thread overview]
Message-ID: <1323674155-17570-2-git-send-email-laijs@cn.fujitsu.com> (raw)
In-Reply-To: <1323674155-17570-1-git-send-email-laijs@cn.fujitsu.com>
We should check the condition before wait it,
otherewise we may get deadlock.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
tools/kvm/threadpool.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/kvm/threadpool.c b/tools/kvm/threadpool.c
index fdc5fa7..2e59e62 100644
--- a/tools/kvm/threadpool.c
+++ b/tools/kvm/threadpool.c
@@ -80,12 +80,11 @@ static void *thread_pool__threadfunc(void *param)
struct thread_pool__job *curjob;
mutex_lock(&job_mutex);
- pthread_cond_wait(&job_cond, &job_mutex);
- curjob = thread_pool__job_pop();
+ while ((curjob = thread_pool__job_pop()) == NULL)
+ pthread_cond_wait(&job_cond, &job_mutex);
mutex_unlock(&job_mutex);
- if (curjob)
- thread_pool__handle_job(curjob);
+ thread_pool__handle_job(curjob);
}
pthread_cleanup_pop(0);
--
1.7.4.4
next prev parent reply other threads:[~2011-12-12 7:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-12 7:15 [PATCH 00/11] kvm tools: cleanups Lai Jiangshan
2011-12-12 7:15 ` Lai Jiangshan [this message]
2011-12-12 7:15 ` [PATCH 02/11] kvm tools: fix function name Lai Jiangshan
2011-12-12 7:15 ` [PATCH 03/11] kvm tools: move threadpool.c to util/ Lai Jiangshan
2011-12-12 7:15 ` [PATCH 04/11] kvm tools: move rbtree.o " Lai Jiangshan
2011-12-12 7:15 ` [PATCH 05/11] kvm tools: add missing build output Lai Jiangshan
2011-12-12 7:15 ` [PATCH 06/11] kvm tools: move read-write.c to util/ Lai Jiangshan
2011-12-12 7:15 ` [PATCH 07/11] kvm tools: move util.c " Lai Jiangshan
2011-12-12 7:15 ` [PATCH 08/11] kvm tools: move strlcat() to util/strbuf.c Lai Jiangshan
2011-12-12 7:15 ` [PATCH 09/11] kvm tools: narrow the C.S. of compat_mtx Lai Jiangshan
2011-12-12 7:15 ` [PATCH 10/11] kvm tools: protect shared global id in compat_mtx C.S Lai Jiangshan
2011-12-12 7:15 ` [PATCH 11/11] kvm tools: remove duplicated code Lai Jiangshan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1323674155-17570-2-git-send-email-laijs@cn.fujitsu.com \
--to=laijs@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=penberg@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®