Commit-ID: 0f2a02d75d0f37f1624585c50c3250b6d096f050 Gitweb: http://git.kernel.org/tip/0f2a02d75d0f37f1624585c50c3250b6d096f050 Author: Lai Jiangshan <laijs@xxxxxxxxxxxxxx> AuthorDate: Mon, 12 Dec 2011 15:15:46 +0800 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Mon, 12 Dec 2011 23:35:35 +0200 kvm tools: fix function name In here, xxx_locked() should means "called with job_mutex locked", the original funtion are opposite, fix them. Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/threadpool.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/kvm/threadpool.c b/tools/kvm/threadpool.c index 2e59e62..bafbcd7 100644 --- a/tools/kvm/threadpool.c +++ b/tools/kvm/threadpool.c @@ -15,7 +15,7 @@ static LIST_HEAD(head); static pthread_t *threads; static long threadcount; -static struct thread_pool__job *thread_pool__job_pop(void) +static struct thread_pool__job *thread_pool__job_pop_locked(void) { struct thread_pool__job *job; @@ -28,25 +28,25 @@ static struct thread_pool__job *thread_pool__job_pop(void) return job; } -static void thread_pool__job_push(struct thread_pool__job *job) +static void thread_pool__job_push_locked(struct thread_pool__job *job) { list_add_tail(&job->queue, &head); } -static struct thread_pool__job *thread_pool__job_pop_locked(void) +static struct thread_pool__job *thread_pool__job_pop(void) { struct thread_pool__job *job; mutex_lock(&job_mutex); - job = thread_pool__job_pop(); + job = thread_pool__job_pop_locked(); mutex_unlock(&job_mutex); return job; } -static void thread_pool__job_push_locked(struct thread_pool__job *job) +static void thread_pool__job_push(struct thread_pool__job *job) { mutex_lock(&job_mutex); - thread_pool__job_push(job); + thread_pool__job_push_locked(job); mutex_unlock(&job_mutex); } @@ -59,11 +59,11 @@ static void thread_pool__handle_job(struct thread_pool__job *job) if (--job->signalcount > 0) /* If the job was signaled again while we were working */ - thread_pool__job_push_locked(job); + thread_pool__job_push(job); mutex_unlock(&job->mutex); - job = thread_pool__job_pop_locked(); + job = thread_pool__job_pop(); } } @@ -80,7 +80,7 @@ static void *thread_pool__threadfunc(void *param) struct thread_pool__job *curjob; mutex_lock(&job_mutex); - while ((curjob = thread_pool__job_pop()) == NULL) + while ((curjob = thread_pool__job_pop_locked()) == NULL) pthread_cond_wait(&job_cond, &job_mutex); mutex_unlock(&job_mutex); @@ -136,7 +136,7 @@ void thread_pool__do_job(struct thread_pool__job *job) mutex_lock(&jobinfo->mutex); if (jobinfo->signalcount++ == 0) - thread_pool__job_push_locked(job); + thread_pool__job_push(job); mutex_unlock(&jobinfo->mutex); mutex_lock(&job_mutex); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html