From patchwork Thu Jan 20 12:33:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Bharadwaj X-Patchwork-Id: 79676 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 3516CB70DA for ; Thu, 20 Jan 2011 23:35:07 +1100 (EST) Received: from localhost ([127.0.0.1]:56564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PftjD-0001EA-Tk for incoming@patchwork.ozlabs.org; Thu, 20 Jan 2011 07:35:03 -0500 Received: from [140.186.70.92] (port=45370 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pfthn-0001CM-DJ for qemu-devel@nongnu.org; Thu, 20 Jan 2011 07:33:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pfthl-0002fH-U1 for qemu-devel@nongnu.org; Thu, 20 Jan 2011 07:33:35 -0500 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:53653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pfthl-0002f6-7l for qemu-devel@nongnu.org; Thu, 20 Jan 2011 07:33:33 -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 p0KCXUAQ013052 for ; Thu, 20 Jan 2011 18:03:30 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p0KCXUWH3538968 for ; Thu, 20 Jan 2011 18:03:30 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p0KCXT3m019908 for ; Thu, 20 Jan 2011 18:03:30 +0530 Received: from localhost6.localdomain6 (Crystal-Planet.in.ibm.com [9.124.35.20]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p0KCXTP9019902; Thu, 20 Jan 2011 18:03:29 +0530 To: qemu-devel@nongnu.org From: Arun R Bharadwaj Date: Thu, 20 Jan 2011 18:03:29 +0530 Message-ID: <20110120123329.17667.86036.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 03/12] Add callback function to ThreadletWork structure. 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 the callback function to the ThreadletWork structure and moves aio handler as a callback function. Signed-off-by: Arun R Bharadwaj Reviewed-by: Stefan Hajnoczi --- posix-aio-compat.c | 89 +++++++++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 39 deletions(-) diff --git a/posix-aio-compat.c b/posix-aio-compat.c index ddf42f5..2792201 100644 --- a/posix-aio-compat.c +++ b/posix-aio-compat.c @@ -36,6 +36,7 @@ static QemuCond aiocb_completion; typedef struct ThreadletWork { QTAILQ_ENTRY(ThreadletWork) node; + void (*func)(struct ThreadletWork *work); } ThreadletWork; struct qemu_paiocb { @@ -308,18 +309,14 @@ static ssize_t handle_aiocb_rw(struct qemu_paiocb *aiocb) return nbytes; } -static void *aio_thread(void *unused) +static void *threadlet_worker(void *data) { - pid_t pid; - ThreadletWork *work; - - pid = getpid(); while (1) { - struct qemu_paiocb *aiocb; ssize_t ret = 0; qemu_timeval tv; struct timespec ts; + ThreadletWork *work; qemu_gettimeofday(&tv); ts.tv_sec = tv.tv_sec + 10; @@ -332,52 +329,64 @@ static void *aio_thread(void *unused) ret = cond_timedwait(&cond, &lock, &ts); } - if (QTAILQ_EMPTY(&request_list)) + if (QTAILQ_EMPTY(&request_list)) { + idle_threads--; + cur_threads--; + mutex_unlock(&lock); break; - + } work = QTAILQ_FIRST(&request_list); QTAILQ_REMOVE(&request_list, work, node); - - aiocb = container_of(work, struct qemu_paiocb, work); - - aiocb->active = 1; idle_threads--; mutex_unlock(&lock); - switch (aiocb->aio_type & QEMU_AIO_TYPE_MASK) { - case QEMU_AIO_READ: - case QEMU_AIO_WRITE: - ret = handle_aiocb_rw(aiocb); - break; - case QEMU_AIO_FLUSH: - ret = handle_aiocb_flush(aiocb); - break; - case QEMU_AIO_IOCTL: - ret = handle_aiocb_ioctl(aiocb); - break; - default: - fprintf(stderr, "invalid aio request (0x%x)\n", aiocb->aio_type); - ret = -EINVAL; - break; - } - + work->func(work); mutex_lock(&lock); idle_threads++; mutex_unlock(&lock); - qemu_mutex_lock(&aiocb_mutex); - aiocb->ret = ret; - qemu_cond_broadcast(&aiocb_completion); - qemu_mutex_unlock(&aiocb_mutex); + } + + return NULL; +} + +static void handle_work(ThreadletWork *work) +{ + pid_t pid; + ssize_t ret = 0; + struct qemu_paiocb *aiocb; - if (kill(pid, aiocb->ev_signo)) die("kill failed"); + pid = getpid(); + aiocb = container_of(work, struct qemu_paiocb, work); + qemu_mutex_lock(&aiocb_mutex); + aiocb->active = 1; + qemu_mutex_unlock(&aiocb_mutex); + + switch (aiocb->aio_type & QEMU_AIO_TYPE_MASK) { + case QEMU_AIO_READ: + case QEMU_AIO_WRITE: + ret = handle_aiocb_rw(aiocb); + break; + case QEMU_AIO_FLUSH: + ret = handle_aiocb_flush(aiocb); + break; + case QEMU_AIO_IOCTL: + ret = handle_aiocb_ioctl(aiocb); + break; + default: + fprintf(stderr, "invalid aio request (0x%x)\n", aiocb->aio_type); + ret = -EINVAL; + break; } - idle_threads--; - cur_threads--; - mutex_unlock(&lock); + qemu_mutex_lock(&aiocb_mutex); + aiocb->ret = ret; + qemu_cond_broadcast(&aiocb_completion); + qemu_mutex_unlock(&aiocb_mutex); - return NULL; + if (kill(pid, aiocb->ev_signo)) { + die("kill failed"); + } } static void spawn_thread(void) @@ -391,7 +400,7 @@ static void spawn_thread(void) if (sigfillset(&set)) die("sigfillset"); if (sigprocmask(SIG_SETMASK, &set, &oldset)) die("sigprocmask"); - thread_create(&thread_id, &attr, aio_thread, NULL); + thread_create(&thread_id, &attr, threadlet_worker, NULL); if (sigprocmask(SIG_SETMASK, &oldset, NULL)) die("sigprocmask restore"); } @@ -406,6 +415,8 @@ static void qemu_paio_submit(struct qemu_paiocb *aiocb) mutex_lock(&lock); if (idle_threads == 0 && cur_threads < max_threads) spawn_thread(); + + aiocb->work.func = handle_work; QTAILQ_INSERT_TAIL(&request_list, &aiocb->work, node); mutex_unlock(&lock); cond_signal(&cond);