From patchwork Thu Jan 20 12:34:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Bharadwaj X-Patchwork-Id: 79682 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C7AABB70D5 for ; Thu, 20 Jan 2011 23:43:22 +1100 (EST) Received: from localhost ([127.0.0.1]:55414 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pftqs-0005xR-Dz for incoming@patchwork.ozlabs.org; Thu, 20 Jan 2011 07:42:58 -0500 Received: from [140.186.70.92] (port=37291 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PftiZ-0001gg-4K for qemu-devel@nongnu.org; Thu, 20 Jan 2011 07:34:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PftiX-0002jo-Np for qemu-devel@nongnu.org; Thu, 20 Jan 2011 07:34:22 -0500 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:33099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PftiW-0002jf-W9 for qemu-devel@nongnu.org; Thu, 20 Jan 2011 07:34:21 -0500 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) by e23smtp09.au.ibm.com (8.14.4/8.13.1) with ESMTP id p0KCYJhu016475 for ; Thu, 20 Jan 2011 23:34:19 +1100 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p0KCYJTs2420776 for ; Thu, 20 Jan 2011 23:34:19 +1100 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p0KCYJAe021134 for ; Thu, 20 Jan 2011 23:34:19 +1100 Received: from localhost6.localdomain6 (Crystal-Planet.in.ibm.com [9.124.35.20]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p0KCYHxs021109; Thu, 20 Jan 2011 23:34:17 +1100 To: qemu-devel@nongnu.org From: Arun R Bharadwaj Date: Thu, 20 Jan 2011 18:04:16 +0530 Message-ID: <20110120123416.17667.43009.stgit@localhost6.localdomain6> In-Reply-To: <20110120123236.17667.66688.stgit@localhost6.localdomain6> References: <20110120123236.17667.66688.stgit@localhost6.localdomain6> User-Agent: StGit/0.15 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: kwolf@redhat.com, aliguori@linux.vnet.ibm.com, jvrao@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 11/12] Threadlets: Add functionality to create private queues. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch allows subsystems to create their own private queues with associated pools of threads. Signed-off-by: Arun R Bharadwaj Reviewed-by: Stefan Hajnoczi --- qemu-threadlet.c | 85 +++++++++++++++++++++++++++++++++++++----------------- qemu-threadlet.h | 4 +++ 2 files changed, 63 insertions(+), 26 deletions(-) diff --git a/qemu-threadlet.c b/qemu-threadlet.c index 6523f08..4bad8c6 100644 --- a/qemu-threadlet.c +++ b/qemu-threadlet.c @@ -99,6 +99,25 @@ static void spawn_threadlet(ThreadletQueue *queue) } /** + * submit_work_to_queue: Submit a new task to a private queue to be + * executed asynchronously. + * @queue: Per-subsystem private queue to which the new task needs + * to be submitted. + * @work: Contains information about the task that needs to be submitted. + */ +void submit_work_to_queue(ThreadletQueue *queue, ThreadletWork *work) +{ + qemu_mutex_lock(&queue->lock); + if (queue->idle_threads == 0 && queue->cur_threads < queue->max_threads) { + spawn_threadlet(queue); + } else { + qemu_cond_signal(&queue->cond); + } + QTAILQ_INSERT_TAIL(&queue->request_list, work, node); + qemu_mutex_unlock(&queue->lock); +} + +/** * submit_work: Submit to the global queue a new task to be executed * asynchronously. * @work: Contains information about the task that needs to be submitted. @@ -106,49 +125,63 @@ static void spawn_threadlet(ThreadletQueue *queue) void submit_work(ThreadletWork *work) { if (!globalqueue_init) { - globalqueue.cur_threads = 0; - globalqueue.idle_threads = 0; - globalqueue.max_threads = MAX_GLOBAL_THREADS; - globalqueue.min_threads = MIN_GLOBAL_THREADS; - QTAILQ_INIT(&globalqueue.request_list); - qemu_mutex_init(&globalqueue.lock); - qemu_cond_init(&globalqueue.cond); - + threadlet_queue_init(&globalqueue, MAX_GLOBAL_THREADS, + MIN_GLOBAL_THREADS); globalqueue_init = 1; } - qemu_mutex_lock(&globalqueue.lock); - if (globalqueue.idle_threads == 0 && - globalqueue.cur_threads < globalqueue.max_threads) { - spawn_threadlet(&globalqueue); - } else { - qemu_cond_signal(&globalqueue.cond); - } - QTAILQ_INSERT_TAIL(&globalqueue.request_list, work, node); - qemu_mutex_unlock(&globalqueue.lock); + submit_work_to_queue(&globalqueue, work); } /** - * dequeue_work: Cancel a task queued on the global queue. + * dequeue_work_on_queue: Cancel a task queued on a Queue. + * @queue: The queue containing the task to be cancelled. * @work: Contains the information of the task that needs to be cancelled. - * - * Returns: 0 if successfully dequeued work. - * 1 otherwise. */ -int dequeue_work(ThreadletWork *work) +int dequeue_work_on_queue(ThreadletQueue *queue, ThreadletWork *work) { int ret = 1; ThreadletWork *ret_work; - qemu_mutex_lock(&globalqueue.lock); - QTAILQ_FOREACH(ret_work, &(globalqueue.request_list), node) { + qemu_mutex_lock(&queue->lock); + QTAILQ_FOREACH(ret_work, &(queue->request_list), node) { if (ret_work == work) { - QTAILQ_REMOVE(&globalqueue.request_list, ret_work, node); + QTAILQ_REMOVE(&queue->request_list, work, node); ret = 0; break; } } - qemu_mutex_unlock(&globalqueue.lock); + qemu_mutex_unlock(&queue->lock); return ret; } + +/** + * dequeue_work: Cancel a task queued on the global queue. + * @work: Contains the information of the task that needs to be cancelled. + * + * Returns: 0 if successfully dequeued work. + * 1 otherwise. + */ +int dequeue_work(ThreadletWork *work) +{ + return dequeue_work_on_queue(&globalqueue, work); +} + +/** + * threadlet_queue_init: Initialize a threadlet queue. + * @queue: The threadlet queue to be initialized. + * @max_threads: Maximum number of threads processing the queue. + * @min_threads: Minimum number of threads processing the queue. + */ +void threadlet_queue_init(ThreadletQueue *queue, + int max_threads, int min_threads) +{ + queue->cur_threads = 0; + queue->idle_threads = 0; + queue->max_threads = max_threads; + queue->min_threads = min_threads; + QTAILQ_INIT(&queue->request_list); + qemu_mutex_init(&queue->lock); + qemu_cond_init(&queue->cond); +} diff --git a/qemu-threadlet.h b/qemu-threadlet.h index 6b11c86..25e77f2 100644 --- a/qemu-threadlet.h +++ b/qemu-threadlet.h @@ -38,7 +38,11 @@ typedef struct ThreadletWork void (*func)(struct ThreadletWork *work); } ThreadletWork; +void submit_work_to_queue(ThreadletQueue *queue, ThreadletWork *work); void submit_work(ThreadletWork *work); +int dequeue_work_on_queue(ThreadletQueue *queue, ThreadletWork *work); int dequeue_work(ThreadletWork *work); void threadlet_init(void); +void threadlet_queue_init(ThreadletQueue *queue, int max_threads, + int min_threads); #endif