From patchwork Thu Jan 13 12:14:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Bharadwaj X-Patchwork-Id: 78736 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 CD57BB70AF for ; Thu, 13 Jan 2011 23:26:09 +1100 (EST) Received: from localhost ([127.0.0.1]:44627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PdMFi-0004lv-Vi for incoming@patchwork.ozlabs.org; Thu, 13 Jan 2011 07:26:07 -0500 Received: from [140.186.70.92] (port=41513 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PdM4s-0007qp-21 for qemu-devel@nongnu.org; Thu, 13 Jan 2011 07:14:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PdM4q-0001oD-Ir for qemu-devel@nongnu.org; Thu, 13 Jan 2011 07:14:54 -0500 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:41910) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PdM4p-0001nC-Qn for qemu-devel@nongnu.org; Thu, 13 Jan 2011 07:14:52 -0500 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp05.in.ibm.com (8.14.4/8.13.1) with ESMTP id p0DCEmQi031030 for ; Thu, 13 Jan 2011 17:44:48 +0530 Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p0DCEmZr4329500 for ; Thu, 13 Jan 2011 17:44:48 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p0DCEmYt031719 for ; Thu, 13 Jan 2011 23:14:48 +1100 Received: from localhost6.localdomain6 ([9.124.35.18]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p0DCEmxn031712; Thu, 13 Jan 2011 23:14:48 +1100 To: qemu-devel@nongnu.org From: Arun R Bharadwaj Date: Thu, 13 Jan 2011 17:44:48 +0530 Message-ID: <20110113121448.4487.44207.stgit@localhost6.localdomain6> In-Reply-To: <20110113120837.4487.95784.stgit@localhost6.localdomain6> References: <20110113120837.4487.95784.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 Subject: [Qemu-devel] [PATCH 06/12] Threadlet: Add dequeue_work threadlet API and remove active field. 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 adds dequeue_work threadlet API and shows how the paio_cancel changes to dequeue_work. The active field in the qemu_aiocb structure is now useless. Remove it. Signed-off-by: Arun R Bharadwaj --- posix-aio-compat.c | 38 ++++++++++++++++---------------------- 1 files changed, 16 insertions(+), 22 deletions(-) diff --git a/posix-aio-compat.c b/posix-aio-compat.c index 2ab1109..2d73846 100644 --- a/posix-aio-compat.c +++ b/posix-aio-compat.c @@ -69,7 +69,6 @@ struct qemu_paiocb { int aio_type; ssize_t ret; - int active; struct qemu_paiocb *next; int async_context_id; @@ -346,7 +345,6 @@ static void handle_work(ThreadletWork *work) pid = getpid(); qemu_mutex_lock(&aiocb_mutex); aiocb = container_of(work, struct qemu_paiocb, work); - aiocb->active = 1; qemu_mutex_unlock(&aiocb_mutex); switch (aiocb->aio_type & QEMU_AIO_TYPE_MASK) { @@ -452,7 +450,6 @@ static void qemu_paio_submit(struct qemu_paiocb *aiocb) { qemu_mutex_lock(&aiocb_mutex); aiocb->ret = -EINPROGRESS; - aiocb->active = 0; qemu_mutex_unlock(&aiocb_mutex); aiocb->work.func = handle_work; @@ -574,33 +571,30 @@ static void paio_remove(struct qemu_paiocb *acb) } } -static void paio_cancel(BlockDriverAIOCB *blockacb) +/** + * dequeue_work: Cancel a task queued on the global queue. + * @work: Contains the information of the task that needs to be cancelled. + */ +static int dequeue_work(ThreadletWork *work) { - struct qemu_paiocb *acb = (struct qemu_paiocb *)blockacb; - int active = 0; - - qemu_mutex_lock(&aiocb_mutex); qemu_mutex_lock(&globalqueue.lock); - if (!acb->active) { - QTAILQ_REMOVE(&globalqueue.request_list, &acb->work, node); - acb->ret = -ECANCELED; - } else if (acb->ret == -EINPROGRESS) { - active = 1; - } + QTAILQ_REMOVE(&globalqueue.request_list, work, node); qemu_mutex_unlock(&globalqueue.lock); - if (!active) { - acb->ret = -ECANCELED; - } else { + return 0; +} + +static void paio_cancel(BlockDriverAIOCB *blockacb) +{ + struct qemu_paiocb *acb = (struct qemu_paiocb *)blockacb; + if (dequeue_work(&acb->work) != 0) { + /* Wait for running work item to complete */ + qemu_mutex_lock(&aiocb_mutex); while (acb->ret == -EINPROGRESS) { - /* - * fail safe: if the aio could not be canceled, - * we wait for it - */ qemu_cond_wait(&aiocb_completion, &aiocb_mutex); } + qemu_mutex_unlock(&aiocb_mutex); } - qemu_mutex_unlock(&aiocb_mutex); paio_remove(acb); }