From patchwork Tue Jan 4 05:27:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Bharadwaj X-Patchwork-Id: 77379 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 739DEB70E6 for ; Tue, 4 Jan 2011 16:34:40 +1100 (EST) Received: from localhost ([127.0.0.1]:35062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZzXV-0003if-Ru for incoming@patchwork.ozlabs.org; Tue, 04 Jan 2011 00:34:33 -0500 Received: from [140.186.70.92] (port=56114 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZzQc-000192-Vo for qemu-devel@nongnu.org; Tue, 04 Jan 2011 00:27:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZzQb-0004Y2-Lh for qemu-devel@nongnu.org; Tue, 04 Jan 2011 00:27:26 -0500 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:40667) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZzQb-0004Xx-5d for qemu-devel@nongnu.org; Tue, 04 Jan 2011 00:27:25 -0500 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp05.au.ibm.com (8.14.4/8.13.1) with ESMTP id p045M9lc014989 for ; Tue, 4 Jan 2011 16:22:09 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p045RMF52539654 for ; Tue, 4 Jan 2011 16:27:22 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p045RMpm023038 for ; Tue, 4 Jan 2011 16:27:22 +1100 Received: from localhost6.localdomain6 (Crystal-Planet.in.ibm.com [9.124.35.19]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p045RLUm023014; Tue, 4 Jan 2011 16:27:21 +1100 To: qemu-devel@nongnu.org From: Arun R Bharadwaj Date: Tue, 04 Jan 2011 10:57:20 +0530 Message-ID: <20110104052720.15887.59290.stgit@localhost6.localdomain6> In-Reply-To: <20110104052627.15887.43436.stgit@localhost6.localdomain6> References: <20110104052627.15887.43436.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: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 03/13] 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 --- posix-aio-compat.c | 88 +++++++++++++++++++++++++++++----------------------- 1 files changed, 49 insertions(+), 39 deletions(-) diff --git a/posix-aio-compat.c b/posix-aio-compat.c index de52eb5..0a4d82b 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,63 @@ 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 aio_thread(ThreadletWork *work) +{ + pid_t pid; + ssize_t ret = 0; + struct qemu_paiocb *aiocb; + + pid = getpid(); + aiocb = container_of(work, struct qemu_paiocb, work); + aiocb->active = 1; - if (kill(pid, aiocb->ev_signo)) die("kill failed"); + 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"); + } + return; } static void spawn_thread(void) @@ -391,7 +399,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 +414,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 = aio_thread; QTAILQ_INSERT_TAIL(&request_list, &aiocb->work, node); mutex_unlock(&lock); cond_signal(&cond);