From nobody Mon Feb 9 17:23:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1645103044; cv=none; d=zohomail.com; s=zohoarc; b=gfpC+hAKfcWRbNpZAn+KK8kbXiKUnbHlSEkMwl+vqQ7johU3FIZPmHAvYsX7BhO+HGwm41FsGcIX+ysZHBCEgLp5yQO3aK4YKbku6ty6ioiIsrVz/imftknjYhrpTj8NS3qiE0T4H4zY2OLbi5Au/yVrDnSVgu+ZodriVw3z4do= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645103044; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0F4Y20Knou8yFcZcwgNZ3RnwyCxMihcl6XHLzE5XeJg=; b=CpPbW16CSC0p785HCtXOtIJCBdz814OqtA/PXcXMFGHouCaGMuvFfuBYs3B3WFEwQG2Rt0j7V5fD9XAfqiQPW1GBTtnOvuq0MGrCkxhKdRG15ygv0GQYKS3/Gis6eWfFJvzLS39SHgPZVRCUC9YoZm6PJl5pmzI8kZw86UvoQMI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1645103044020456.0292950819056; Thu, 17 Feb 2022 05:04:04 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-186-9J0d0D5OPoqxfnh375Bb0g-1; Thu, 17 Feb 2022 08:04:00 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC8D01006AA8; Thu, 17 Feb 2022 13:03:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AB9EB7316F; Thu, 17 Feb 2022 13:03:53 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7C9D646FA8; Thu, 17 Feb 2022 13:03:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21HD1DDh031235 for ; Thu, 17 Feb 2022 08:01:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2605B2B3A7; Thu, 17 Feb 2022 13:01:13 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.194.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 631DF2B4B4; Thu, 17 Feb 2022 13:01:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645103042; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0F4Y20Knou8yFcZcwgNZ3RnwyCxMihcl6XHLzE5XeJg=; b=HS0OgsqIipxFhaRDNClehNVal48/GzHApMRAC1yL/u7sbE4ZcA6hSxjcKK/JR07t1l4avH HTWUB5zjAwnPaIHzj0GsUt2JrbIRkaauWDkDWJMql/smPGQjIqv5CBAJofLk42/I9iJ2UZ 3v6uGdQspDDzcX1cQD/uIwMxFmQd3ps= X-MC-Unique: 9J0d0D5OPoqxfnh375Bb0g-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 07/11] esx_stream: Use automatic mutex management Date: Thu, 17 Feb 2022 14:00:59 +0100 Message-Id: <20220217130103.18543-8-twiederh@redhat.com> In-Reply-To: <20220217130103.18543-1-twiederh@redhat.com> References: <20220217130103.18543-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1645103052033100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/esx/esx_stream.c | 65 ++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 44 deletions(-) diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c index 5b20804bb1..2b49c8dd12 100644 --- a/src/esx/esx_stream.c +++ b/src/esx/esx_stream.c @@ -198,9 +198,8 @@ esxStreamTransfer(esxStreamPrivate *priv, bool blocking) static int esxStreamSend(virStreamPtr stream, const char *data, size_t nbytes) { - int result =3D -1; esxStreamPrivate *priv =3D stream->privateData; - int status; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->curl->lock); =20 if (nbytes =3D=3D 0) return 0; @@ -215,38 +214,29 @@ esxStreamSend(virStreamPtr stream, const char *data, = size_t nbytes) return -1; } =20 - virMutexLock(&priv->curl->lock); - priv->buffer =3D (char *)data; priv->buffer_size =3D nbytes; priv->buffer_used =3D nbytes; =20 if (stream->flags & VIR_STREAM_NONBLOCK) { if (esxStreamTransfer(priv, false) < 0) - goto cleanup; + return -1; =20 - if (priv->buffer_used < priv->buffer_size) - result =3D priv->buffer_size - priv->buffer_used; - else - result =3D -2; + if (priv->buffer_used >=3D priv->buffer_size) + return -2; } else /* blocking */ { do { - status =3D esxStreamTransfer(priv, true); + int status =3D esxStreamTransfer(priv, true); =20 if (status < 0) - goto cleanup; + return -1; =20 if (status > 0) break; } while (priv->buffer_used > 0); - - result =3D priv->buffer_size - priv->buffer_used; } =20 - cleanup: - virMutexUnlock(&priv->curl->lock); - - return result; + return priv->buffer_size - priv->buffer_used; } =20 static int @@ -255,9 +245,8 @@ esxStreamRecvFlags(virStreamPtr stream, size_t nbytes, unsigned int flags) { - int result =3D -1; esxStreamPrivate *priv =3D stream->privateData; - int status; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->curl->lock); =20 virCheckFlags(0, -1); =20 @@ -274,8 +263,6 @@ esxStreamRecvFlags(virStreamPtr stream, return -1; } =20 - virMutexLock(&priv->curl->lock); - priv->buffer =3D data; priv->buffer_size =3D nbytes; priv->buffer_used =3D 0; @@ -291,33 +278,25 @@ esxStreamRecvFlags(virStreamPtr stream, priv->backlog_used - priv->buffer_used); =20 priv->backlog_used -=3D priv->buffer_used; - result =3D priv->buffer_used; } else if (stream->flags & VIR_STREAM_NONBLOCK) { if (esxStreamTransfer(priv, false) < 0) - goto cleanup; + return -1; =20 - if (priv->buffer_used > 0) - result =3D priv->buffer_used; - else - result =3D -2; + if (priv->buffer_used <=3D 0) + return -2; } else /* blocking */ { do { - status =3D esxStreamTransfer(priv, true); + int status =3D esxStreamTransfer(priv, true); =20 if (status < 0) - goto cleanup; + return -1; =20 if (status > 0) break; } while (priv->buffer_used < priv->buffer_size); - - result =3D priv->buffer_used; } =20 - cleanup: - virMutexUnlock(&priv->curl->lock); - - return result; + return priv->buffer_used; } =20 static int @@ -348,18 +327,16 @@ esxStreamClose(virStreamPtr stream, bool finish) if (!priv) return 0; =20 - virMutexLock(&priv->curl->lock); + VIR_WITH_MUTEX_LOCK_GUARD(&priv->curl->lock) { + if (finish && priv->backlog_used > 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Stream has untransferred data left")); + result =3D -1; + } =20 - if (finish && priv->backlog_used > 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Stream has untransferred data left")); - result =3D -1; + stream->privateData =3D NULL; } =20 - stream->privateData =3D NULL; - - virMutexUnlock(&priv->curl->lock); - esxFreeStreamPrivate(&priv); =20 return result; --=20 2.31.1