Received: from eggs.gnu.org ([2001:4830:134:3::10]:43785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtwJi-0003o4-KE for qemu-devel@nongnu.org; Thu, 27 Nov 2014 05:29:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtwJY-0005mU-Kf for qemu-devel@nongnu.org; Thu, 27 Nov 2014 05:28:54 -0500 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:42670 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtwJY-0005ln-AT for qemu-devel@nongnu.org; Thu, 27 Nov 2014 05:28:44 -0500 From: Peter Lieven Date: Thu, 27 Nov 2014 11:27:04 +0100 Message-Id: <1417084026-12307-2-git-send-email-pl@kamp.de> In-Reply-To: <1417084026-12307-1-git-send-email-pl@kamp.de> References: <1417084026-12307-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [RFC PATCH 1/3] Revert "coroutine: make pool size dynamic" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, benoit@irqsave.net, ming.lei@canonical.com, Peter Lieven , armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com This reverts commit ac2662a913ee5854b1269256adbdc14e57ba480a. --- include/block/coroutine.h | 11 ----------- qemu-coroutine.c | 26 +++----------------------- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/include/block/coroutine.h b/include/block/coroutine.h index 793df0e..1d9343d 100644 --- a/include/block/coroutine.h +++ b/include/block/coroutine.h @@ -215,15 +215,4 @@ void coroutine_fn co_aio_sleep_ns(AioContext *ctx, QEMUClockType type, * Note that this function clobbers the handlers for the file descriptor. */ void coroutine_fn yield_until_fd_readable(int fd); - -/** - * Add or subtract from the coroutine pool size - * - * The coroutine implementation keeps a pool of coroutines to be reused by - * qemu_coroutine_create(). This makes coroutine creation cheap. Heavy - * coroutine users should call this to reserve pool space. Call it again with - * a negative number to release pool space. - */ -void qemu_coroutine_adjust_pool_size(int n); - #endif /* QEMU_COROUTINE_H */ diff --git a/qemu-coroutine.c b/qemu-coroutine.c index bd574aa..4708521 100644 --- a/qemu-coroutine.c +++ b/qemu-coroutine.c @@ -19,14 +19,14 @@ #include "block/coroutine_int.h" enum { - POOL_DEFAULT_SIZE = 64, + /* Maximum free pool size prevents holding too many freed coroutines */ + POOL_MAX_SIZE = 64, }; /** Free list to speed up creation */ static QemuMutex pool_lock; static QSLIST_HEAD(, Coroutine) pool = QSLIST_HEAD_INITIALIZER(pool); static unsigned int pool_size; -static unsigned int pool_max_size = POOL_DEFAULT_SIZE; Coroutine *qemu_coroutine_create(CoroutineEntry *entry) { @@ -55,7 +55,7 @@ static void coroutine_delete(Coroutine *co) { if (CONFIG_COROUTINE_POOL) { qemu_mutex_lock(&pool_lock); - if (pool_size < pool_max_size) { + if (pool_size < POOL_MAX_SIZE) { QSLIST_INSERT_HEAD(&pool, co, pool_next); co->caller = NULL; pool_size++; @@ -137,23 +137,3 @@ void coroutine_fn qemu_coroutine_yield(void) self->caller = NULL; coroutine_swap(self, to); } - -void qemu_coroutine_adjust_pool_size(int n) -{ - qemu_mutex_lock(&pool_lock); - - pool_max_size += n; - - /* Callers should never take away more than they added */ - assert(pool_max_size >= POOL_DEFAULT_SIZE); - - /* Trim oversized pool down to new max */ - while (pool_size > pool_max_size) { - Coroutine *co = QSLIST_FIRST(&pool); - QSLIST_REMOVE_HEAD(&pool, pool_next); - pool_size--; - qemu_coroutine_delete(co); - } - - qemu_mutex_unlock(&pool_lock); -} -- 1.7.9.5