From nobody Wed Feb 11 03:26:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494322650625818.8030495724947; Tue, 9 May 2017 02:37:30 -0700 (PDT) Received: from localhost ([::1]:36093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d81aC-0005v2-8W for importer@patchew.org; Tue, 09 May 2017 05:37:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d81Yn-0004wh-26 for qemu-devel@nongnu.org; Tue, 09 May 2017 05:36:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d81Yl-0004u9-Qv for qemu-devel@nongnu.org; Tue, 09 May 2017 05:36:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53102) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d81Yl-0004t8-Ju; Tue, 09 May 2017 05:35:59 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 89DD68124D; Tue, 9 May 2017 09:35:58 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-23.ams2.redhat.com [10.36.117.23]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v499Zo7M015222; Tue, 9 May 2017 05:35:57 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 89DD68124D Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 89DD68124D From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 9 May 2017 11:35:49 +0200 Message-Id: <20170509093549.25157-5-pbonzini@redhat.com> In-Reply-To: <20170509093549.25157-1-pbonzini@redhat.com> References: <20170509093549.25157-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 09 May 2017 09:35:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] curl: improve search for unused CURLState 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: jcody@redhat.com, qemu-stable@nongnu.org, rjones@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The main change here is to pull the search loop to a new function, making it easier to switch from aio_poll to BDRV_POLL_WHILE. However, the "for (j...)" loop is also dead (there is no other read of "j" outside the loop), so remove it. Cc: jcody@redhat.com Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- block/curl.c | 52 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/block/curl.c b/block/curl.c index e8fcc5ca34..79e504a2cc 100644 --- a/block/curl.c +++ b/block/curl.c @@ -455,29 +455,41 @@ static void curl_multi_timeout_do(void *arg) } =20 /* Called with s->mutex held. */ +static bool curl_find_unused_state_locked(BDRVCURLState *s, CURLState **st= ate) +{ + int i; + + for (i =3D 0; i < CURL_NUM_STATES; i++) { + if (!s->states[i].in_use) { + s->states[i].in_use =3D 1; + *state =3D &s->states[i]; + return true; + } + } + + return false; +} + +static bool curl_find_unused_state(BDRVCURLState *s, CURLState **state) +{ + bool ret; + + qemu_mutex_lock(&s->mutex); + ret =3D curl_find_unused_state_locked(s, state); + qemu_mutex_unlock(&s->mutex); + return ret; +} + +/* Called with s->mutex held. */ static CURLState *curl_init_state(BlockDriverState *bs, BDRVCURLState *s) { CURLState *state =3D NULL; - int i, j; - - do { - for (i=3D0; istates[i].acb[j]) - continue; - if (s->states[i].in_use) - continue; - - state =3D &s->states[i]; - state->in_use =3D 1; - break; - } - if (!state) { - qemu_mutex_unlock(&s->mutex); - aio_poll(bdrv_get_aio_context(bs), true); - qemu_mutex_lock(&s->mutex); - } - } while(!state); + + if (!curl_find_unused_state_locked(s, &state)) { + qemu_mutex_unlock(&s->mutex); + BDRV_POLL_WHILE(bs, !curl_find_unused_state(s, &state)); + qemu_mutex_lock(&s->mutex); + } =20 if (!state->curl) { state->curl =3D curl_easy_init(); --=20 2.12.2