From nobody Tue Feb 10 16:22:27 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1512730685438452.1087393384129; Fri, 8 Dec 2017 02:58:05 -0800 (PST) Received: from localhost ([::1]:36550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNGLk-00021G-TI for importer@patchew.org; Fri, 08 Dec 2017 05:57:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNGKC-000153-KT for qemu-devel@nongnu.org; Fri, 08 Dec 2017 05:56:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eNGKB-0001nM-NI for qemu-devel@nongnu.org; Fri, 08 Dec 2017 05:56:12 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:41262) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eNGKB-0001n9-Gg for qemu-devel@nongnu.org; Fri, 08 Dec 2017 05:56:11 -0500 Received: by mail-wm0-x241.google.com with SMTP id g75so2682490wme.0 for ; Fri, 08 Dec 2017 02:56:11 -0800 (PST) Received: from donizetti.lan (dynamic-adsl-78-12-251-125.clienti.tiscali.it. [78.12.251.125]) by smtp.gmail.com with ESMTPSA id v195sm1325461wmf.25.2017.12.08.02.56.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Dec 2017 02:56:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xj4fH80eRXkRf4FC9SRWLTcUIDogFFhHVxxWPTBKkYk=; b=Izdm7dR+AIVCHLEAFqps6aXZZxRZ/5gfkigzKwIeKE23/eFD+h1gCKxG7r70I5zoyk ++xBUJw0Rp60fUaNLrmdLxjwHYEGwlL0Xqq5GoA1f3rHyPaO3h89EZKoJN842+IfrDbs IHmUaDne/2WpTIe8JQ/DccAVZ1Tmn253prOtHPRXbkQ+kCYs47zpqAS4lrbgSI9i4+6r Uq0tekJrPwgagumgY6zUmjiBo+OoXCzpvfiGcWY7m6UZtMhd7VbIngG/WdlqejNPCr4G AjERWkl8eDUKZOqApVsk53AVDbaXiqzDEI+WUoTJg+QGi8h0XXv7Iuk3SjYe0MdDBp52 S2IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=xj4fH80eRXkRf4FC9SRWLTcUIDogFFhHVxxWPTBKkYk=; b=rQEMnY1LqdfJ6N9z5AE4HaQl3qYjT9AeMDvP5s7ZYoO+/B5Sbu8VFp/VEtAKfogxZY RzBf+94yLPkrYADvL+ZUB+cnaLx0XzXf5yCcVJH/3Ed/LT0rSkFbjAIY7ksWrU6hWjI6 pDga7Xq53bcLoFtYg6M5wEJg0Pl2d+IHSiSRinaaplmhZ8iB70XbxbVBQFqVOwGraV06 p6fQOXPojKAR1UpYV/35bObhK0DGwsnMvzb9zzc/T7mKmcNfYZPliVSwKM+zO4uGx2LF TGtdFJNpFlc+AwBDXm/EhbzPkJejUWX4FxAPRERt4oeIofZ1SoB3AtxyoxAeuX1lvSze Mf0A== X-Gm-Message-State: AKGB3mI9iCXV+CdJ+dUB/vMHR6L3BaRZ/C1EXtGusTDa6t/biUslldBf j38mdLXM/Hu8CLYzgj2PL3k/9HSB X-Google-Smtp-Source: AGs4zMbGdP4vrti780Scast84S9YqjHLeUfVleyn7QsPKnY6VO6QdAmqrROh7jJ20Ri9PaKCjmQc9g== X-Received: by 10.28.174.20 with SMTP id x20mr3822415wme.27.1512730570032; Fri, 08 Dec 2017 02:56:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 8 Dec 2017 11:55:53 +0100 Message-Id: <20171208105553.12249-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171208105553.12249-1-pbonzini@redhat.com> References: <20171208105553.12249-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH 5/5] thread-pool: convert to use lock guards X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Emilio G . Cota" , Fam Zheng , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- util/thread-pool.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/util/thread-pool.c b/util/thread-pool.c index 610646d131..06ada38376 100644 --- a/util/thread-pool.c +++ b/util/thread-pool.c @@ -78,7 +78,7 @@ static void *worker_thread(void *opaque) { ThreadPool *pool =3D opaque; =20 - qemu_mutex_lock(&pool->lock); + QEMU_LOCK_GUARD(QemuMutex, pool_guard, &pool->lock); pool->pending_threads--; do_spawn_thread(pool); =20 @@ -88,9 +88,9 @@ static void *worker_thread(void *opaque) =20 do { pool->idle_threads++; - qemu_mutex_unlock(&pool->lock); + qemu_lock_guard_unlock(&pool_guard); ret =3D qemu_sem_timedwait(&pool->sem, 10000); - qemu_mutex_lock(&pool->lock); + qemu_lock_guard_lock(&pool_guard); pool->idle_threads--; } while (ret =3D=3D -1 && !QTAILQ_EMPTY(&pool->request_list)); if (ret =3D=3D -1 || pool->stopping) { @@ -100,7 +100,7 @@ static void *worker_thread(void *opaque) req =3D QTAILQ_FIRST(&pool->request_list); QTAILQ_REMOVE(&pool->request_list, req, reqs); req->state =3D THREAD_ACTIVE; - qemu_mutex_unlock(&pool->lock); + qemu_lock_guard_unlock(&pool_guard); =20 ret =3D req->func(req->arg); =20 @@ -109,14 +109,13 @@ static void *worker_thread(void *opaque) smp_wmb(); req->state =3D THREAD_DONE; =20 - qemu_mutex_lock(&pool->lock); + qemu_lock_guard_lock(&pool_guard); =20 qemu_bh_schedule(pool->completion_bh); } =20 pool->cur_threads--; qemu_cond_signal(&pool->worker_stopped); - qemu_mutex_unlock(&pool->lock); return NULL; } =20 @@ -139,9 +138,8 @@ static void spawn_thread_bh_fn(void *opaque) { ThreadPool *pool =3D opaque; =20 - qemu_mutex_lock(&pool->lock); + QEMU_LOCK_GUARD(QemuMutex, pool_guard, &pool->lock); do_spawn_thread(pool); - qemu_mutex_unlock(&pool->lock); } =20 static void spawn_thread(ThreadPool *pool) @@ -208,10 +206,10 @@ static void thread_pool_cancel(BlockAIOCB *acb) { ThreadPoolElement *elem =3D (ThreadPoolElement *)acb; ThreadPool *pool =3D elem->pool; + QEMU_LOCK_GUARD(QemuMutex, pool_guard, &pool->lock); =20 trace_thread_pool_cancel(elem, elem->common.opaque); =20 - qemu_mutex_lock(&pool->lock); if (elem->state =3D=3D THREAD_QUEUED && /* No thread has yet started working on elem. we can try to "steal" * the item from the worker if we can get a signal from the @@ -225,8 +223,6 @@ static void thread_pool_cancel(BlockAIOCB *acb) elem->state =3D THREAD_DONE; elem->ret =3D -ECANCELED; } - - qemu_mutex_unlock(&pool->lock); } =20 static AioContext *thread_pool_get_aio_context(BlockAIOCB *acb) @@ -258,12 +254,12 @@ BlockAIOCB *thread_pool_submit_aio(ThreadPool *pool, =20 trace_thread_pool_submit(pool, req, arg); =20 - qemu_mutex_lock(&pool->lock); + QEMU_LOCK_GUARD(QemuMutex, pool_guard, &pool->lock); if (pool->idle_threads =3D=3D 0 && pool->cur_threads < pool->max_threa= ds) { spawn_thread(pool); } QTAILQ_INSERT_TAIL(&pool->request_list, req, reqs); - qemu_mutex_unlock(&pool->lock); + qemu_lock_guard_unlock(&pool_guard); qemu_sem_post(&pool->sem); return &req->common; } @@ -330,7 +326,7 @@ void thread_pool_free(ThreadPool *pool) =20 assert(QLIST_EMPTY(&pool->head)); =20 - qemu_mutex_lock(&pool->lock); + QEMU_LOCK_GUARD(QemuMutex, pool_guard, &pool->lock); =20 /* Stop new threads from spawning */ qemu_bh_delete(pool->new_thread_bh); @@ -344,7 +340,7 @@ void thread_pool_free(ThreadPool *pool) qemu_cond_wait(&pool->worker_stopped, &pool->lock); } =20 - qemu_mutex_unlock(&pool->lock); + qemu_lock_guard_unlock(&pool_guard); =20 qemu_bh_delete(pool->completion_bh); qemu_sem_destroy(&pool->sem); --=20 2.14.3