From patchwork Thu Nov 18 18:07:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Bharadwaj X-Patchwork-Id: 72129 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 10D99B71A3 for ; Fri, 19 Nov 2010 05:20:43 +1100 (EST) Received: from localhost ([127.0.0.1]:39893 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PJ968-0004st-9W for incoming@patchwork.ozlabs.org; Thu, 18 Nov 2010 13:20:40 -0500 Received: from [140.186.70.92] (port=37116 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PJ8tC-00051F-Qt for qemu-devel@nongnu.org; Thu, 18 Nov 2010 13:07:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PJ8tA-0003nD-3R for qemu-devel@nongnu.org; Thu, 18 Nov 2010 13:07:17 -0500 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:55251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PJ8t9-0003n2-CJ for qemu-devel@nongnu.org; Thu, 18 Nov 2010 13:07:16 -0500 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp06.in.ibm.com (8.14.4/8.13.1) with ESMTP id oAII7CoY030533 for ; Thu, 18 Nov 2010 23:37:12 +0530 Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oAII7BAX2957338 for ; Thu, 18 Nov 2010 23:37:11 +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 oAII7BmS014058 for ; Fri, 19 Nov 2010 05:07:11 +1100 Received: from localhost6.localdomain6 ([9.77.206.31]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oAII7A20013940; Fri, 19 Nov 2010 05:07:10 +1100 To: qemu-devel@nongnu.org From: Arun R Bharadwaj Date: Thu, 18 Nov 2010 23:37:09 +0530 Message-ID: <20101118180709.4434.26482.stgit@localhost6.localdomain6> In-Reply-To: <20101118180547.4434.95904.stgit@localhost6.localdomain6> References: <20101118180547.4434.95904.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 Subject: [Qemu-devel] [PATCH 4/6] Cleanup posix-aio.compat.c off all the old code. 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 Cleanup posix-aio.compat.c off all the old code which is now useless after introducing the generic threadlet infrasturcture. Signed-off-by: Arun R Bharadwaj Acked-by: Venkateswararao Jujjuri --- posix-aio-compat.c | 57 +--------------------------------------------------- 1 files changed, 1 insertions(+), 56 deletions(-) diff --git a/posix-aio-compat.c b/posix-aio-compat.c index 3f3c461..eb82fa4 100644 --- a/posix-aio-compat.c +++ b/posix-aio-compat.c @@ -70,10 +70,8 @@ struct qemu_paiocb { int ev_signo; off_t aio_offset; - QTAILQ_ENTRY(qemu_paiocb) node; int aio_type; ssize_t ret; - int active; struct qemu_paiocb *next; int async_context_id; @@ -238,19 +236,10 @@ static void threadlet_queue_init(ThreadletQueue *queue, qemu_cond_init(&queue->cond); } -static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; -static pthread_cond_t cond = PTHREAD_COND_INITIALIZER; -static pthread_t thread_id; -static pthread_attr_t attr; -static int max_threads = 64; -static int cur_threads = 0; -static int idle_threads = 0; -static QTAILQ_HEAD(, qemu_paiocb) request_list; - #ifdef CONFIG_PREADV static int preadv_present = 1; #else -static int preadv_present = 0; +static int preadv_present; #endif static void die2(int err, const char *what) @@ -264,39 +253,6 @@ static void die(const char *what) die2(errno, what); } -static void mutex_lock(pthread_mutex_t *mutex) -{ - int ret = pthread_mutex_lock(mutex); - if (ret) die2(ret, "pthread_mutex_lock"); -} - -static void mutex_unlock(pthread_mutex_t *mutex) -{ - int ret = pthread_mutex_unlock(mutex); - if (ret) die2(ret, "pthread_mutex_unlock"); -} - -static int cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, - struct timespec *ts) -{ - int ret = pthread_cond_timedwait(cond, mutex, ts); - if (ret && ret != ETIMEDOUT) die2(ret, "pthread_cond_timedwait"); - return ret; -} - -static void cond_signal(pthread_cond_t *cond) -{ - int ret = pthread_cond_signal(cond); - if (ret) die2(ret, "pthread_cond_signal"); -} - -static void thread_create(pthread_t *thread, pthread_attr_t *attr, - void *(*start_routine)(void*), void *arg) -{ - int ret = pthread_create(thread, attr, start_routine, arg); - if (ret) die2(ret, "pthread_create"); -} - static ssize_t handle_aiocb_ioctl(struct qemu_paiocb *aiocb) { int ret; @@ -741,7 +697,6 @@ int paio_init(void) struct sigaction act; PosixAioState *s; int fds[2]; - int ret; if (posix_aio_state) return 0; @@ -771,16 +726,6 @@ int paio_init(void) qemu_aio_set_fd_handler(s->rfd, posix_aio_read, NULL, posix_aio_flush, posix_aio_process_queue, s); - ret = pthread_attr_init(&attr); - if (ret) - die2(ret, "pthread_attr_init"); - - ret = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - if (ret) - die2(ret, "pthread_attr_setdetachstate"); - - QTAILQ_INIT(&request_list); - posix_aio_state = s; return 0; }