From nobody Mon May 13 23:57:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1645103034; cv=none; d=zohomail.com; s=zohoarc; b=XORYPCk3Kb1G67ahhPdWqnNYq428qP2YPSrXtdVdP6oiZ7Amhn4e8K2zMCOrNCmOEn4yuqJZbxrgj7ryHhw5+Gn201Q6c2Ara9UF6Lii3We80xPz2eLWlI7JQai9Px5XKIky8tpWlnsS747u+6ziONXWJCcWskL9THkMC9/7BSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645103034; 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=wB5at+kE2IZlgB18aLU8CrY8d3d3SutOe3hBoUUSZmA=; b=Z+1+HxVaga5lJwLI48MutHNX26PZC9Gv1iIHMJY9r8sQdQJCdX3KnHYOwZSSxwMNVq+OHo5Q41aTfQxUF4vhAdJEQE53HURG5uYj6XbelwWMmfXKEH3tiRa7ohmyxFa1/LT7hUctkuhV2lwXNKAHOtULN2r/KbkkHMJbK8EG0kQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1645103033907602.4044718565502; Thu, 17 Feb 2022 05:03:53 -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-277-Fru31LBQMWSjFFiKglAH4w-1; Thu, 17 Feb 2022 08:03:52 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 80C181006AA4; Thu, 17 Feb 2022 13:03:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 60DB8108F833; Thu, 17 Feb 2022 13:03:47 +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 311AD183288C; Thu, 17 Feb 2022 13:03:47 +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 21HD16As031180 for ; Thu, 17 Feb 2022 08:01:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3EA362B4B1; Thu, 17 Feb 2022 13:01:06 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.194.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 858C92B3A7; Thu, 17 Feb 2022 13:01:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645103034; 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=wB5at+kE2IZlgB18aLU8CrY8d3d3SutOe3hBoUUSZmA=; b=VG1esP96U1/7xFo51aFy6laY6/5gKbIkzo6xHeuIKLPjOUJcOF+OoYF2HMT14k4NUADpli cj2eFFdVuqZxH6vKFyz6aaxzWC3DmPjh6ONAfV54L5MshgudXi0Amm5DINiSbXB5PMnYz9 G6WeeVMvNX2XFWnK5HD5n8QO0KtYTdk= X-MC-Unique: Fru31LBQMWSjFFiKglAH4w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 01/11] test: Use automatic mutex management Date: Thu, 17 Feb 2022 14:00:53 +0100 Message-Id: <20220217130103.18543-2-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.84 on 10.5.11.22 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: 1645103043347100005 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/test/test_driver.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 03c41ca192..0ee53a8469 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1386,16 +1386,14 @@ testOpenFromFile(virConnectPtr conn, const char *fi= le) static int testOpenDefault(virConnectPtr conn) { - int ret =3D VIR_DRV_OPEN_ERROR; testDriver *privconn =3D NULL; g_autoptr(xmlDoc) doc =3D NULL; g_autoptr(xmlXPathContext) ctxt =3D NULL; size_t i; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&defaultLock); =20 - virMutexLock(&defaultLock); if (defaultPrivconn) { conn->privateData =3D virObjectRef(defaultPrivconn); - virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_SUCCESS; } =20 @@ -1434,15 +1432,12 @@ testOpenDefault(virConnectPtr conn) goto error; =20 defaultPrivconn =3D privconn; - ret =3D VIR_DRV_OPEN_SUCCESS; - cleanup: - virMutexUnlock(&defaultLock); - return ret; + return VIR_DRV_OPEN_SUCCESS; =20 error: virObjectUnref(privconn); conn->privateData =3D NULL; - goto cleanup; + return VIR_DRV_OPEN_ERROR; } =20 static int @@ -1500,12 +1495,12 @@ testConnectAuthenticate(virConnectPtr conn, static void testDriverCloseInternal(testDriver *driver) { - virMutexLock(&defaultLock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&defaultLock); + testDriverDisposed =3D false; virObjectUnref(driver); if (testDriverDisposed && driver =3D=3D defaultPrivconn) defaultPrivconn =3D NULL; - virMutexUnlock(&defaultLock); } =20 =20 --=20 2.31.1 From nobody Mon May 13 23:57:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1645103031; cv=none; d=zohomail.com; s=zohoarc; b=S3DlkP69nUQ/4ITiwTZx693wdXlyfdSQnP1xS86+4uB390qhaqWaYmmDzsqBsObeGmJqG4HYQXyhaZhhz2V2CualyAsplIYnI48YvRPYxh/VC7FjH8QqB2xli69Bif72yM44lQyxrgV5De60M+k1qJ+ZHzmdMuyK0RsH/UpjM2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645103031; 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=z7bd/KKIaAPkjN8rJq0V6Prgo2fqSxQAXQLHQ1J7/yM=; b=loPJCVESkl+NFGeQKOA3ZWE4CFhqP+yJESX1xsTLUytUyO8wlyMScAIjiaIPKRaFqtzfRHqMAWO9dhDF2OK13HpEe3Quag2Wxu099cdv0UGitI5RW2mDIfHouS3Mg29HzeEemEK4Xtzw5Sj+lkHCsD9cEIzLc07e5nSLZ6KQX+8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 164510303123457.90846252610811; Thu, 17 Feb 2022 05:03:51 -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-389-pWNL1v_qNX6Q59kZ3mZXiA-1; Thu, 17 Feb 2022 08:03:46 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B06E2F4E; Thu, 17 Feb 2022 13:03:41 +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 E52A56FB88; Thu, 17 Feb 2022 13:03:40 +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 ACB8350049; Thu, 17 Feb 2022 13:03:40 +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 21HD179T031187 for ; Thu, 17 Feb 2022 08:01:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 87FE52B3DD; Thu, 17 Feb 2022 13:01:07 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.194.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97C7E2B3A7; Thu, 17 Feb 2022 13:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645103029; 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=z7bd/KKIaAPkjN8rJq0V6Prgo2fqSxQAXQLHQ1J7/yM=; b=VIEmW+muZIrgCdJxRasPVeHhQZELqYlR7PpY1Ud5CR1zN/14ZC7ID22bB6IcJVEAcEmi9F UkMmoar9iD2aFfvSEwnCpgLRrmx1/gSxFWQfoXI+HEiW+tmIGb0FIzsS7vzCM33svXfWJy 6JWfWyRdMWqboTiKH21pg50/mVug1bI= X-MC-Unique: pWNL1v_qNX6Q59kZ3mZXiA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 02/11] openvz: Use automatic mutex management Date: Thu, 17 Feb 2022 14:00:54 +0100 Message-Id: <20220217130103.18543-3-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.15 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: 1645103037605100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/openvz/openvz_driver.c | 91 ++++++++++++-------------------------- 1 file changed, 28 insertions(+), 63 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index b2589059c8..8cfde6a96e 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -65,16 +65,6 @@ static int openvzDomainSetMemoryInternal(virDomainObj *v= m, unsigned long long memory); static int openvzGetVEStatus(virDomainObj *vm, int *status, int *reason); =20 -static void openvzDriverLock(struct openvz_driver *driver) -{ - virMutexLock(&driver->lock); -} - -static void openvzDriverUnlock(struct openvz_driver *driver) -{ - virMutexUnlock(&driver->lock); -} - struct openvz_driver ovz_driver; =20 =20 @@ -101,12 +91,9 @@ static virDomainObj * openvzDomObjFromDomain(struct openvz_driver *driver, const unsigned char *uuid) { - virDomainObj *vm; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - openvzDriverLock(driver); - vm =3D openvzDomObjFromDomainLocked(driver, uuid); - openvzDriverUnlock(driver); - return vm; + return openvzDomObjFromDomainLocked(driver, uuid); } =20 =20 @@ -262,12 +249,12 @@ static virDomainPtr openvzDomainLookupByID(virConnect= Ptr conn, int id) { struct openvz_driver *driver =3D conn->privateData; - virDomainObj *vm; + virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; =20 - openvzDriverLock(driver); - vm =3D virDomainObjListFindByID(driver->domains, id); - openvzDriverUnlock(driver); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + vm =3D virDomainObjListFindByID(driver->domains, id); + } =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, @@ -285,9 +272,9 @@ static virDomainPtr openvzDomainLookupByID(virConnectPt= r conn, static int openvzConnectGetVersion(virConnectPtr conn, unsigned long *vers= ion) { struct openvz_driver *driver =3D conn->privateData; - openvzDriverLock(driver); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); + *version =3D driver->version; - openvzDriverUnlock(driver); return 0; } =20 @@ -334,12 +321,12 @@ static virDomainPtr openvzDomainLookupByName(virConne= ctPtr conn, const char *name) { struct openvz_driver *driver =3D conn->privateData; - virDomainObj *vm; + virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; =20 - openvzDriverLock(driver); - vm =3D virDomainObjListFindByName(driver->domains, name); - openvzDriverUnlock(driver); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + vm =3D virDomainObjListFindByName(driver->domains, name); + } =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, @@ -808,13 +795,13 @@ openvzDomainDefineXMLFlags(virConnectPtr conn, const = char *xml, unsigned int fla virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(VIR_DOMAIN_DEFINE_VALIDATE, NULL); =20 if (flags & VIR_DOMAIN_DEFINE_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - openvzDriverLock(driver); if ((vmdef =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; @@ -876,7 +863,6 @@ openvzDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla =20 cleanup: virDomainObjEndAPI(&vm); - openvzDriverUnlock(driver); return dom; } =20 @@ -896,13 +882,13 @@ openvzDomainCreateXML(virConnectPtr conn, const char = *xml, virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(VIR_DOMAIN_START_VALIDATE, NULL); =20 if (flags & VIR_DOMAIN_START_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - openvzDriverLock(driver); if ((vmdef =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; @@ -963,7 +949,6 @@ openvzDomainCreateXML(virConnectPtr conn, const char *x= ml, =20 cleanup: virDomainObjEndAPI(&vm); - openvzDriverUnlock(driver); return dom; } =20 @@ -972,15 +957,15 @@ openvzDomainCreateWithFlags(virDomainPtr dom, unsigne= d int flags) { g_autoptr(virCommand) cmd =3D virCommandNewArgList(VZCTL, "--quiet", "= start", NULL); struct openvz_driver *driver =3D dom->conn->privateData; - virDomainObj *vm; + virDomainObj *vm =3D NULL; int ret =3D -1; int status; =20 virCheckFlags(0, -1); =20 - openvzDriverLock(driver); - vm =3D virDomainObjListFindByName(driver->domains, dom->name); - openvzDriverUnlock(driver); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + vm =3D virDomainObjListFindByName(driver->domains, dom->name); + } =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, @@ -1028,10 +1013,10 @@ openvzDomainUndefineFlags(virDomainPtr dom, virDomainObj *vm; int ret =3D -1; int status; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(0, -1); =20 - openvzDriverLock(driver); if (!(vm =3D openvzDomObjFromDomainLocked(driver, dom->uuid))) goto cleanup; =20 @@ -1052,7 +1037,6 @@ openvzDomainUndefineFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - openvzDriverUnlock(driver); return ret; } =20 @@ -1321,13 +1305,9 @@ openvzConnectIsAlive(virConnectPtr conn G_GNUC_UNUSE= D) =20 static char *openvzConnectGetCapabilities(virConnectPtr conn) { struct openvz_driver *driver =3D conn->privateData; - char *ret; - - openvzDriverLock(driver); - ret =3D virCapabilitiesFormatXML(driver->caps); - openvzDriverUnlock(driver); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - return ret; + return virCapabilitiesFormatXML(driver->caps); } =20 static int openvzConnectListDomains(virConnectPtr conn G_GNUC_UNUSED, @@ -1370,13 +1350,9 @@ static int openvzConnectListDomains(virConnectPtr co= nn G_GNUC_UNUSED, static int openvzConnectNumOfDomains(virConnectPtr conn) { struct openvz_driver *driver =3D conn->privateData; - int n; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - openvzDriverLock(driver); - n =3D virDomainObjListNumOfDomains(driver->domains, true, NULL, NULL); - openvzDriverUnlock(driver); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, NULL, NULL); } =20 static int openvzConnectListDefinedDomains(virConnectPtr conn G_GNUC_UNUSE= D, @@ -1480,13 +1456,9 @@ Version: 2.2 static int openvzConnectNumOfDefinedDomains(virConnectPtr conn) { struct openvz_driver *driver =3D conn->privateData; - int n; - - openvzDriverLock(driver); - n =3D virDomainObjListNumOfDomains(driver->domains, false, NULL, NULL); - openvzDriverUnlock(driver); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - return n; + return virDomainObjListNumOfDomains(driver->domains, false, NULL, NULL= ); } =20 static int @@ -1818,11 +1790,11 @@ openvzDomainUpdateDeviceFlags(virDomainPtr dom, con= st char *xml, virDomainObj *vm =3D NULL; virDomainDef *def =3D NULL; bool persist =3D false; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG, -1); =20 - openvzDriverLock(driver); if (!(vm =3D openvzDomObjFromDomainLocked(driver, dom->uuid))) goto cleanup; =20 @@ -1849,7 +1821,6 @@ openvzDomainUpdateDeviceFlags(virDomainPtr dom, const= char *xml, ret =3D 0; =20 cleanup: - openvzDriverUnlock(driver); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); return ret; @@ -1861,16 +1832,10 @@ openvzConnectListAllDomains(virConnectPtr conn, unsigned int flags) { struct openvz_driver *driver =3D conn->privateData; - int ret =3D -1; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); - - openvzDriverLock(driver); - ret =3D virDomainObjListExport(driver->domains, conn, domains, - NULL, flags); - openvzDriverUnlock(driver); - - return ret; + return virDomainObjListExport(driver->domains, conn, domains, NULL, fl= ags); } =20 =20 --=20 2.31.1 From nobody Mon May 13 23:57:21 2024 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=1645103084; cv=none; d=zohomail.com; s=zohoarc; b=fLNLj2lTR00VML6H/kRjDJV7r2QxC3w7zgw0tOvWJ+IMLvB4TVyGonDFPbQQet7nZAYFz8+GCT/6bvltWOGy+P7z0veJCC0lRjcVR1XaV7MQULr8jF6khqlnDyGtdA1XY3Ruu+0x01Mlw0uHwqEtWPdPaUG0CQFVGYn4lADO0nQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645103084; 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=DMDEVY1ssgyayv8dVV2XDcSDapj98rwQuQM77jOPIA4=; b=TBIUKbHy6/Hso+k0tv8vAL/riT2G0yQ5mhRjNeqVjcdZnNDrUbxmiW3OAr8naQEYLu98Zsw5VHi+gisjWthKYXVvPs+OAHkDdgH3HUxoGGNsTXJqTaMvKyKfcPobUCKEoV5yckI79Cgrm9xneDgpyUYidBuw6bMsDG1Bdhj9DZE= 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 1645103084913275.86124442172536; Thu, 17 Feb 2022 05:04:44 -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-614-e0ufb6RNNgaStpgxTjCktQ-1; Thu, 17 Feb 2022 08:04:39 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 324171091DAB; Thu, 17 Feb 2022 13:04:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0BD136E20C; Thu, 17 Feb 2022 13:04:34 +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 CFE4D1832DA0; Thu, 17 Feb 2022 13:04:33 +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 21HD18OH031197 for ; Thu, 17 Feb 2022 08:01:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id C3B302B3DD; Thu, 17 Feb 2022 13:01:08 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.194.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFD742B4B4; Thu, 17 Feb 2022 13:01:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645103083; 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=DMDEVY1ssgyayv8dVV2XDcSDapj98rwQuQM77jOPIA4=; b=eRJT+c+jGjb6sljqGIFja8vecjf8of88uuq1UH+2ewC/i2Cf1YumfgCmcRMlPcpJdmd10G TOtwqlD3H2ZYGJqG+USYif5FbAc+VZty1T2PcSs5TQzx4oIiKJJyNqisM40MQ3rPtnrKgV TYb4rionZ6yR5aWQL4Uhnaq2vXDocRI= X-MC-Unique: e0ufb6RNNgaStpgxTjCktQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 03/11] remote_daemon_dispatch: Use automatic mutex management Date: Thu, 17 Feb 2022 14:00:55 +0100 Message-Id: <20220217130103.18543-4-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.11 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: 1645103091370100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/remote/remote_daemon_dispatch.c | 187 +++++++++------------------- 1 file changed, 58 insertions(+), 129 deletions(-) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 587cc0b3a5..c0577b07b7 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2057,14 +2057,13 @@ remoteDispatchConnectOpen(virNetServer *server G_GN= UC_UNUSED, #endif unsigned int flags; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(= client); - int rv =3D -1; #ifdef MODULE_NAME const char *type =3D NULL; #endif /* !MODULE_NAME */ bool preserveIdentity =3D false; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 VIR_DEBUG("priv=3D%p conn=3D%p", priv, priv->conn); - virMutexLock(&priv->lock); /* Already opened? */ if (priv->conn) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection already= open")); @@ -2184,17 +2183,14 @@ remoteDispatchConnectOpen(virNetServer *server G_GN= UC_UNUSED, * by default, but do accept RO flags, e.g. TCP */ virNetServerClientSetReadonly(client, (flags & VIR_CONNECT_RO)); - rv =3D 0; + return 0; =20 cleanup: - if (rv < 0) { - virNetMessageSaveError(rerr); - if (priv->conn) { - g_clear_pointer(&priv->conn, virObjectUnref); - } + virNetMessageSaveError(rerr); + if (priv->conn) { + g_clear_pointer(&priv->conn, virObjectUnref); } - virMutexUnlock(&priv->lock); - return rv; + return -1; } =20 =20 @@ -3656,8 +3652,7 @@ remoteDispatchAuthSaslInit(virNetServer *server G_GNU= C_UNUSED, virNetSASLSession *sasl =3D NULL; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 VIR_DEBUG("Initialize SASL auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) !=3D VIR_NET_SERVER_SERVICE_AUTH= _SASL || @@ -3702,7 +3697,6 @@ remoteDispatchAuthSaslInit(virNetServer *server G_GNU= C_UNUSED, VIR_DEBUG("Available mechanisms for client: '%s'", ret->mechlist); =20 priv->sasl =3D sasl; - virMutexUnlock(&priv->lock); return 0; =20 authfail: @@ -3714,7 +3708,6 @@ remoteDispatchAuthSaslInit(virNetServer *server G_GNU= C_UNUSED, "client=3D%p auth=3D%d", client, REMOTE_AUTH_SASL); virObjectUnref(sasl); - virMutexUnlock(&priv->lock); return -1; } =20 @@ -3783,8 +3776,7 @@ remoteDispatchAuthSaslStart(virNetServer *server, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); const char *identity; - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 VIR_DEBUG("Start SASL auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) !=3D VIR_NET_SERVER_SERVICE_AUTH= _SASL || @@ -3836,7 +3828,6 @@ remoteDispatchAuthSaslStart(virNetServer *server, ret->complete =3D 1; } =20 - virMutexUnlock(&priv->lock); return 0; =20 authfail: @@ -3858,7 +3849,6 @@ remoteDispatchAuthSaslStart(virNetServer *server, virReportError(VIR_ERR_AUTH_FAILED, "%s", _("authentication failed")); virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return -1; } =20 @@ -3877,8 +3867,7 @@ remoteDispatchAuthSaslStep(virNetServer *server, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); const char *identity; - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 VIR_DEBUG("Step SASL auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) !=3D VIR_NET_SERVER_SERVICE_AUTH= _SASL || @@ -3930,7 +3919,6 @@ remoteDispatchAuthSaslStep(virNetServer *server, ret->complete =3D 1; } =20 - virMutexUnlock(&priv->lock); return 0; =20 authfail: @@ -3952,7 +3940,6 @@ remoteDispatchAuthSaslStep(virNetServer *server, virReportError(VIR_ERR_AUTH_FAILED, "%s", _("authentication failed")); virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return -1; } #else @@ -4017,8 +4004,8 @@ remoteDispatchAuthPolkit(virNetServer *server, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); int rv; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 - virMutexLock(&priv->lock); action =3D virNetServerClientGetReadonly(client) ? "org.libvirt.unix.monitor" : "org.libvirt.unix.manage"; @@ -4062,13 +4049,10 @@ remoteDispatchAuthPolkit(virNetServer *server, ret->complete =3D 1; =20 virNetServerSetClientAuthenticated(server, client); - virMutexUnlock(&priv->lock); - return 0; =20 error: virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return -1; =20 authfail: @@ -4129,12 +4113,10 @@ remoteDispatchConnectRegisterCloseCallback(virNetSe= rver *server G_GNUC_UNUSED, virNetMessage *msg G_GNUC_UNUSE= D, struct virNetMessageError *rerr) { - int rv =3D -1; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4145,13 +4127,11 @@ remoteDispatchConnectRegisterCloseCallback(virNetSe= rver *server G_GNUC_UNUSED, goto cleanup; =20 priv->closeRegistered =3D true; - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -4160,12 +4140,10 @@ remoteDispatchConnectUnregisterCloseCallback(virNet= Server *server G_GNUC_UNUSED, virNetMessage *msg G_GNUC_UNU= SED, struct virNetMessageError *re= rr) { - int rv =3D -1; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4175,13 +4153,11 @@ remoteDispatchConnectUnregisterCloseCallback(virNet= Server *server G_GNUC_UNUSED, goto cleanup; =20 priv->closeRegistered =3D false; - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -4198,8 +4174,7 @@ remoteDispatchConnectDomainEventRegister(virNetServer= *server G_GNUC_UNUSED, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4240,7 +4215,6 @@ remoteDispatchConnectDomainEventRegister(virNetServer= *server G_GNUC_UNUSED, rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -4255,13 +4229,11 @@ remoteDispatchConnectDomainEventDeregister(virNetSe= rver *server G_GNUC_UNUSED, remote_connect_domain_event_der= egister_ret *ret G_GNUC_UNUSED) { int callbackID =3D -1; - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4286,13 +4258,11 @@ remoteDispatchConnectDomainEventDeregister(virNetSe= rver *server G_GNUC_UNUSED, VIR_DELETE_ELEMENT(priv->domainEventCallbacks, i, priv->ndomainEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static void @@ -4417,8 +4387,7 @@ remoteDispatchConnectDomainEventRegisterAny(virNetSer= ver *server G_GNUC_UNUSED, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4467,7 +4436,6 @@ remoteDispatchConnectDomainEventRegisterAny(virNetSer= ver *server G_GNUC_UNUSED, rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -4491,8 +4459,7 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(v= irNetServer *server G_GNUC_ virNetServerClientGetPrivateData(client); virDomainPtr dom =3D NULL; virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4541,7 +4508,6 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(v= irNetServer *server G_GNUC_ rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -4558,13 +4524,11 @@ remoteDispatchConnectDomainEventDeregisterAny(virNe= tServer *server G_GNUC_UNUSED remote_connect_domain_event_= deregister_any_args *args) { int callbackID =3D -1; - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4597,13 +4561,11 @@ remoteDispatchConnectDomainEventDeregisterAny(virNe= tServer *server G_GNUC_UNUSED VIR_DELETE_ELEMENT(priv->domainEventCallbacks, i, priv->ndomainEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 =20 @@ -4614,13 +4576,11 @@ remoteDispatchConnectDomainEventCallbackDeregisterA= ny(virNetServer *server G_GNU struct virNetMessage= Error *rerr G_GNUC_UNUSED, remote_connect_domai= n_event_callback_deregister_any_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4642,13 +4602,11 @@ remoteDispatchConnectDomainEventCallbackDeregisterA= ny(virNetServer *server G_GNU VIR_DELETE_ELEMENT(priv->domainEventCallbacks, i, priv->ndomainEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 =20 @@ -5965,8 +5923,7 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetSe= rver *server G_GNUC_UNUSED, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetNetworkConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6015,7 +5972,6 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetSe= rver *server G_GNUC_UNUSED, rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6031,13 +5987,11 @@ remoteDispatchConnectNetworkEventDeregisterAny(virN= etServer *server G_GNUC_UNUSE struct virNetMessageError *= rerr G_GNUC_UNUSED, remote_connect_network_even= t_deregister_any_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetNetworkConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6059,13 +6013,11 @@ remoteDispatchConnectNetworkEventDeregisterAny(virN= etServer *server G_GNUC_UNUSE VIR_DELETE_ELEMENT(priv->networkEventCallbacks, i, priv->nnetworkEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -6084,8 +6036,7 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virN= etServer *server G_GNUC_UNU virNetServerClientGetPrivateData(client); virStoragePoolPtr pool =3D NULL; virConnectPtr conn =3D remoteGetStorageConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6134,7 +6085,6 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virN= etServer *server G_GNUC_UNU rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6149,13 +6099,12 @@ remoteDispatchConnectStoragePoolEventDeregisterAny(= virNetServer *server G_GNUC_U struct virNetMessageError *= rerr G_GNUC_UNUSED, remote_connect_storage_pool= _event_deregister_any_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetStorageConn(client); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 - virMutexLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6177,13 +6126,11 @@ remoteDispatchConnectStoragePoolEventDeregisterAny(= virNetServer *server G_GNUC_U VIR_DELETE_ELEMENT(priv->storageEventCallbacks, i, priv->nstorageEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -6202,8 +6149,7 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNe= tServer *server G_GNUC_UNUS virNetServerClientGetPrivateData(client); virNodeDevicePtr dev =3D NULL; virConnectPtr conn =3D remoteGetNodeDevConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6252,7 +6198,6 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNe= tServer *server G_GNUC_UNUS rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6267,13 +6212,11 @@ remoteDispatchConnectNodeDeviceEventDeregisterAny(v= irNetServer *server G_GNUC_UN struct virNetMessageErro= r *rerr G_GNUC_UNUSED, remote_connect_node_devi= ce_event_deregister_any_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetNodeDevConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6295,13 +6238,11 @@ remoteDispatchConnectNodeDeviceEventDeregisterAny(v= irNetServer *server G_GNUC_UN VIR_DELETE_ELEMENT(priv->nodeDeviceEventCallbacks, i, priv->nnodeDeviceEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -6320,8 +6261,7 @@ remoteDispatchConnectSecretEventRegisterAny(virNetSer= ver *server G_GNUC_UNUSED, virNetServerClientGetPrivateData(client); virSecretPtr secret =3D NULL; virConnectPtr conn =3D remoteGetSecretConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6370,7 +6310,6 @@ remoteDispatchConnectSecretEventRegisterAny(virNetSer= ver *server G_GNUC_UNUSED, rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6385,13 +6324,11 @@ remoteDispatchConnectSecretEventDeregisterAny(virNe= tServer *server G_GNUC_UNUSED struct virNetMessageErro= r *rerr G_GNUC_UNUSED, remote_connect_secret_ev= ent_deregister_any_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetSecretConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6413,13 +6350,11 @@ remoteDispatchConnectSecretEventDeregisterAny(virNe= tServer *server G_GNUC_UNUSED VIR_DELETE_ELEMENT(priv->secretEventCallbacks, i, priv->nsecretEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -6439,8 +6374,7 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetS= erver *server G_GNUC_UNUSED virDomainPtr dom =3D NULL; const char *event =3D args->event ? *args->event : NULL; virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6484,7 +6418,6 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetS= erver *server G_GNUC_UNUSED rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6500,13 +6433,11 @@ qemuDispatchConnectDomainMonitorEventDeregister(vir= NetServer *server G_GNUC_UNUS struct virNetMessageError = *rerr G_GNUC_UNUSED, qemu_connect_domain_monito= r_event_deregister_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6529,13 +6460,11 @@ qemuDispatchConnectDomainMonitorEventDeregister(vir= NetServer *server G_GNUC_UNUS VIR_DELETE_ELEMENT(priv->qemuEventCallbacks, i, priv->nqemuEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int --=20 2.31.1 From nobody Mon May 13 23:57:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1645103035; cv=none; d=zohomail.com; s=zohoarc; b=XzREbxlXb/YsT1SLVWF/R3ZzdgZLgkDsZBHOhXoRoN/w7RTYonWjb6QYnYDFgjVC20hdeKGzdGoCqjc1plCXGLYhPhjjevVv1qI2PYtEyxHvYK1yvzG452QppiYnRAKxCOIM6WtVficfWlKV1y+F5QCtNck9QhbwHB6TAFf/f5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645103035; 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=Gdr8TjDkjLy5W7DExOHDVveJSeMoFA4QftzGqf+IoPE=; b=hiSytGQwyvH4/4r+bMJmJf7z1OUs5CgKYVtdI7tZXgP5Uj00XB2id1F2W/n2UehCKOkkmKSCCXLkmSYoU6c/138G7JTwNb0ga/m8HZr30W9TgGPqKltZ4aZSbyclmXL2mE2bv/baVvOZ1ZSS+Hl5m6cOdiH8jgEWkBNPgfrkuZA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1645103035934614.9056566189213; Thu, 17 Feb 2022 05:03:55 -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-221-Oik9rAaxM1iNr7JgzJlQBA-1; Thu, 17 Feb 2022 08:03:50 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DEC3B801AC5; Thu, 17 Feb 2022 13:03:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 966552B4B1; Thu, 17 Feb 2022 13:03:45 +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 6362C1826D28; Thu, 17 Feb 2022 13:03:45 +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 21HD19cP031207 for ; Thu, 17 Feb 2022 08:01:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id D2EB52B4B4; Thu, 17 Feb 2022 13:01:09 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.194.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 256AE2B3A7; Thu, 17 Feb 2022 13:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645103034; 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=Gdr8TjDkjLy5W7DExOHDVveJSeMoFA4QftzGqf+IoPE=; b=Rgb+QXY4A3d1sYI75ADRQp5zRDY4Ba9GD+DG4CHuu51sgaaNkyj8ugI7foWrYd3BopYW2h 5qGficdPY0QKSsfwrszIezpXnuxV9LB6GV1cNgJkr3CXsYZMNMgLR7uGTCoGeLaXrJ6w6W Lb5mC2HFix9H9RPN1q4rvHFbj6ZIioU= X-MC-Unique: Oik9rAaxM1iNr7JgzJlQBA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 04/11] netdev: Use automatic mutex management Date: Thu, 17 Feb 2022 14:00:56 +0100 Message-Id: <20220217130103.18543-5-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.84 on 10.5.11.23 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: 1645103041606100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/util/virnetdev.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index fcf679ec37..5df48af60c 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3568,12 +3568,10 @@ virNetDevReserveName(const char *name) idstr =3D name + strlen(virNetDevGenNames[type].prefix); =20 if (virStrToLong_ui(idstr, NULL, 10, &id) >=3D 0) { - virMutexLock(&virNetDevGenNames[type].mutex); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&virNetDevGenNames[type].= mutex); =20 if (virNetDevGenNames[type].lastID < (int)id) virNetDevGenNames[type].lastID =3D id; - - virMutexUnlock(&virNetDevGenNames[type].mutex); } } =20 @@ -3599,7 +3597,6 @@ virNetDevReserveName(const char *name) int virNetDevGenerateName(char **ifname, virNetDevGenNameType type) { - int id; const char *prefix =3D virNetDevGenNames[type].prefix; double maxIDd =3D pow(10, IFNAMSIZ - 1 - strlen(prefix)); int maxID =3D INT_MAX; @@ -3617,16 +3614,15 @@ virNetDevGenerateName(char **ifname, virNetDevGenNa= meType type) =20 do { g_autofree char *try =3D NULL; + int id =3D 0; =20 - virMutexLock(&virNetDevGenNames[type].mutex); - - id =3D ++virNetDevGenNames[type].lastID; + VIR_WITH_OBJECT_LOCK_GUARD(&virNetDevGenNames[type].mutex) { + id =3D ++virNetDevGenNames[type].lastID; =20 - /* reset before overflow */ - if (virNetDevGenNames[type].lastID >=3D maxID) - virNetDevGenNames[type].lastID =3D -1; - - virMutexUnlock(&virNetDevGenNames[type].mutex); + /* reset before overflow */ + if (virNetDevGenNames[type].lastID >=3D maxID) + virNetDevGenNames[type].lastID =3D -1; + } =20 if (*ifname) try =3D g_strdup_printf(*ifname, id); --=20 2.31.1 From nobody Mon May 13 23:57:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1645103043; cv=none; d=zohomail.com; s=zohoarc; b=J7J2DskPxIsGvOaRM6+7cPAGd/skNBKqiLW2BxtflelnIWmcSoSiDbI6BG/guaijIHXyqx9TI1O/LpUtWFG9ucdVkydQPbfVd2DxST7sfln5tsRIrEzH/m+U74MIZiRpdsOPZw/+PvKD7WlxNhPeTVgSW3B8Mgg35kVtQbSw6To= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645103043; 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=L0169zLxQaGZA46+Z78O/nBF05iK9oKuQw8oqQq/+ak=; b=Bi9TmH8Q5uGAAQHp+dyJySb/BuJbUOV6MI024ZMg3JTBob8J2r2hxzeRL43t1bqzmvbNmdcTqa5dnG5ItwLPwBKQnVEhuJ3H6ZdwBoC9L4T2bp20RtQz3z1BNT/j6SxhRtyHE1Mt4iX1aBx8tjcKl1r5goVj3Mz/rZt3N8/NZUU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1645103043513318.57354913686424; Thu, 17 Feb 2022 05:04:03 -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-351-b5CVf_DKPU-qkOw6oeElwg-1; Thu, 17 Feb 2022 08:03:53 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9AA91853024; Thu, 17 Feb 2022 13:03:48 +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 889AC66E3B; Thu, 17 Feb 2022 13:03:48 +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 59A4450486; Thu, 17 Feb 2022 13:03:48 +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 21HD1A0F031212 for ; Thu, 17 Feb 2022 08:01:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id E22E52B4B1; Thu, 17 Feb 2022 13:01:10 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.194.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 328712B3A7; Thu, 17 Feb 2022 13:01:10 +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=L0169zLxQaGZA46+Z78O/nBF05iK9oKuQw8oqQq/+ak=; b=bRLQmESmZg5qUIfTqL+ETZVYJ3t5AwR+v0X+e6aXsfLgXb+HwExwaPQPbnFyiY0Kd3oomD 8SDx14gIgaDJTEuZspjCfAEImyVx/28UnHHM0sgW76Yvg4R0o4Cq/AETuGD9+M/Nf/ck4S SzQzQPUT7CiM5GhSwPgalSSY62lqSos= X-MC-Unique: b5CVf_DKPU-qkOw6oeElwg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 05/11] nodesuspend: Use automatic mutex management Date: Thu, 17 Feb 2022 14:00:57 +0100 Message-Id: <20220217130103.18543-6-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.11 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: 1645103052033100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/util/virnodesuspend.c | 54 +++++++++++++-------------------------- 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index e1167605ca..5feef79c43 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -53,17 +53,6 @@ static virMutex virNodeSuspendMutex =3D VIR_MUTEX_INITIA= LIZER; =20 static bool aboutToSuspend; =20 -static void virNodeSuspendLock(void) -{ - virMutexLock(&virNodeSuspendMutex); -} - -static void virNodeSuspendUnlock(void) -{ - virMutexUnlock(&virNodeSuspendMutex); -} - - /** * virNodeSuspendSetNodeWakeup: * @alarmTime: time in seconds from now, at which the RTC alarm has to be = set. @@ -116,9 +105,9 @@ static void virNodeSuspendHelper(void *cmdString) * Now that we have resumed from suspend or the suspend failed, * reset 'aboutToSuspend' flag. */ - virNodeSuspendLock(); - aboutToSuspend =3D false; - virNodeSuspendUnlock(); + VIR_WITH_MUTEX_LOCK_GUARD(&virNodeSuspendMutex) { + aboutToSuspend =3D false; + } } =20 /** @@ -154,8 +143,8 @@ int virNodeSuspend(unsigned int target, { static virThread thread; const char *cmdString =3D NULL; - int ret =3D -1; unsigned int supported; + VIR_LOCK_GUARD lock =3D { NULL }; =20 virCheckFlags(0, -1); =20 @@ -166,13 +155,13 @@ int virNodeSuspend(unsigned int target, * Ensure that we are the only ones trying to suspend. * Fail if somebody has already initiated a suspend. */ - virNodeSuspendLock(); + lock =3D virLockGuardLock(&virNodeSuspendMutex); =20 if (aboutToSuspend) { /* A suspend operation is already in progress */ virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Suspend operation already in progress")); - goto cleanup; + return -1; } =20 /* Check if the host supports the requested suspend target */ @@ -180,7 +169,7 @@ int virNodeSuspend(unsigned int target, case VIR_NODE_SUSPEND_TARGET_MEM: if (!(supported & (1 << VIR_NODE_SUSPEND_TARGET_MEM))) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("Suspend-= to-RAM")); - goto cleanup; + return -1; } cmdString =3D "pm-suspend"; break; @@ -188,7 +177,7 @@ int virNodeSuspend(unsigned int target, case VIR_NODE_SUSPEND_TARGET_DISK: if (!(supported & (1 << VIR_NODE_SUSPEND_TARGET_DISK))) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("Suspend-= to-Disk")); - goto cleanup; + return -1; } cmdString =3D "pm-hibernate"; break; @@ -196,19 +185,19 @@ int virNodeSuspend(unsigned int target, case VIR_NODE_SUSPEND_TARGET_HYBRID: if (!(supported & (1 << VIR_NODE_SUSPEND_TARGET_HYBRID))) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("Hybrid-S= uspend")); - goto cleanup; + return -1; } cmdString =3D "pm-suspend-hybrid"; break; =20 default: virReportError(VIR_ERR_INVALID_ARG, "%s", _("Invalid suspend targe= t")); - goto cleanup; + return -1; } =20 /* Just set the RTC alarm. Don't suspend yet. */ if (virNodeSuspendSetNodeWakeup(duration) < 0) - goto cleanup; + return -1; =20 if (virThreadCreateFull(&thread, false, virNodeSuspendHelper, @@ -217,14 +206,11 @@ int virNodeSuspend(unsigned int target, (void *)cmdString) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to create thread to suspend the host")); - goto cleanup; + return -1; } =20 aboutToSuspend =3D true; - ret =3D 0; - cleanup: - virNodeSuspendUnlock(); - return ret; + return 0; } =20 #ifdef WITH_PM_UTILS @@ -348,11 +334,10 @@ virNodeSuspendSupportsTarget(unsigned int target, boo= l *supported) int virNodeSuspendGetTargetMask(unsigned int *bitmask) { - int ret =3D -1; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&virNodeSuspendMutex); =20 *bitmask =3D 0; =20 - virNodeSuspendLock(); /* Get the power management capabilities supported by the host */ if (!nodeSuspendTargetMaskInit) { bool supported; @@ -360,19 +345,19 @@ virNodeSuspendGetTargetMask(unsigned int *bitmask) =20 /* Check support for Suspend-to-RAM (S3) */ if (virNodeSuspendSupportsTarget(VIR_NODE_SUSPEND_TARGET_MEM, &sup= ported) < 0) - goto cleanup; + return -1; if (supported) nodeSuspendTargetMask |=3D (1 << VIR_NODE_SUSPEND_TARGET_MEM); =20 /* Check support for Suspend-to-Disk (S4) */ if (virNodeSuspendSupportsTarget(VIR_NODE_SUSPEND_TARGET_DISK, &su= pported) < 0) - goto cleanup; + return -1; if (supported) nodeSuspendTargetMask |=3D (1 << VIR_NODE_SUSPEND_TARGET_DISK); =20 /* Check support for Hybrid-Suspend */ if (virNodeSuspendSupportsTarget(VIR_NODE_SUSPEND_TARGET_HYBRID, &= supported) < 0) - goto cleanup; + return -1; if (supported) nodeSuspendTargetMask |=3D (1 << VIR_NODE_SUSPEND_TARGET_HYBRI= D); =20 @@ -380,8 +365,5 @@ virNodeSuspendGetTargetMask(unsigned int *bitmask) } =20 *bitmask =3D nodeSuspendTargetMask; - ret =3D 0; - cleanup: - virNodeSuspendUnlock(); - return ret; + return 0; } --=20 2.31.1 From nobody Mon May 13 23:57:21 2024 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=1645103038; cv=none; d=zohomail.com; s=zohoarc; b=E1RBirgFDEThfVvIVEGsIBiygOwFzWhAb33b0D/3yHkxwxRCR4zK7qwPfbSxD12aV64OF1fofdUcCALvO20W/9gaXfhC4gfNVfqRZ/klaLs3d8K7BULRFQGlKBSKZtLKbV4wmdHnZLfz92fJ1ktjIgGuBPBeX+hJS7u5sefrCjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645103038; 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=9NSrV46QdnuQhvay0CW7uLtgttgNB52xbjQF4Z88S88=; b=OZLpBGrdARlRbxqMwmASSV/tzJLsQ7GKLuyEgU1/v9LBSLyMAoC2BBG5z/c3BHyUkgvRX3vlp1HxTuZIBS52qAYWVo4LxwVTOdbYlj9vfftxfrXmFvVUtKS7q3G1HigvoqnMUyrRYEBrzuZdHVZBxry4hcwifzTNp+uNeJVcKFg= 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 164510303836884.26069330954294; Thu, 17 Feb 2022 05:03:58 -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-26-iz3079RlMDui9JFFSuPHtQ-1; Thu, 17 Feb 2022 08:03:56 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 57C1C185302B; Thu, 17 Feb 2022 13:03:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 375516E20F; Thu, 17 Feb 2022 13:03:51 +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 056B218329B9; Thu, 17 Feb 2022 13:03:51 +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 21HD1CY8031220 for ; Thu, 17 Feb 2022 08:01:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 05A532B3DD; Thu, 17 Feb 2022 13:01:12 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.194.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47CDC2B3A7; Thu, 17 Feb 2022 13:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645103038; 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=9NSrV46QdnuQhvay0CW7uLtgttgNB52xbjQF4Z88S88=; b=Xy3I6ibdoQ2mQcIkx6Gu8rYm9fo72IfH4dUJ1cs2vVkcmmEvy7j+sIbxd+6+nSyz/MGOch mil+vYRraS1duT5mmd4nPUGor2njw/HEh1SqS0vc/7PfvtRRFI6QKk5RTjphUW4cwksZHc yAcVdD0azKZNRQmo9B+thLm7XB3iV7M= X-MC-Unique: iz3079RlMDui9JFFSuPHtQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 06/11] admin: Use automatic mutex management Date: Thu, 17 Feb 2022 14:00:58 +0100 Message-Id: <20220217130103.18543-7-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.11 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: 1645103041600100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/admin/admin_server_dispatch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dis= patch.c index f533fcf539..893c7f1de2 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -165,9 +165,9 @@ adminDispatchConnectOpen(virNetServer *server G_GNUC_UN= USED, struct daemonAdmClientPrivate *priv =3D virNetServerClientGetPrivateData(client); int ret =3D -1; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 VIR_DEBUG("priv=3D%p dmn=3D%p", priv, priv->dmn); - virMutexLock(&priv->lock); =20 flags =3D args->flags; virCheckFlagsGoto(0, cleanup); @@ -176,7 +176,6 @@ adminDispatchConnectOpen(virNetServer *server G_GNUC_UN= USED, cleanup: if (ret < 0) virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return ret; } =20 --=20 2.31.1 From nobody Mon May 13 23:57:21 2024 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 From nobody Mon May 13 23:57:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1645103103; cv=none; d=zohomail.com; s=zohoarc; b=cnJg1Ro4XGyZdIsLPTzWDkRb3J5Ulr586bmXxboS/aLkwPKCO/+21fIzCJX4iEOvEsgUIEgQjh8tdO/t5aN9N7fCJ3z2GPbhSTBMoA/EJQUSkyI7Qr0uNpq9yhKf3u96ElkG4nt077KCTKdyugkiJfZRUyiMQ1M1f9C9w2RjkiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645103103; 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=pJ0c/UAJ6iExuoo2QrgM5WW4DEBjwczSp/J4+G17AlE=; b=Wk3Uxs8OaHDHv/Er0xKrbQeJWW10ZholxzciPDviYSyXjqD1xnoyODHeOfSV7uqJ4s1Sq/ITGtB8w76THigPdUXE/uQPXwDnjVgnVHl3Ww0EDsr7gdcYAM7xNhI6RT4NndxAcwNJrq7wXu440W3uy7IOmK88Jw0CEt6xY/cptbE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1645103103068436.4803900411217; Thu, 17 Feb 2022 05:05:03 -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-65-UPWoHDBJNn-Oz-KTr-vGAw-1; Thu, 17 Feb 2022 08:04:02 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C4DA61006AA3; Thu, 17 Feb 2022 13:03:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6B7CF6FB87; Thu, 17 Feb 2022 13:03:56 +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 3E6221832A39; Thu, 17 Feb 2022 13:03:56 +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 21HD1Ec2031242 for ; Thu, 17 Feb 2022 08:01:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3B9032B3DD; Thu, 17 Feb 2022 13:01:14 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.194.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C4FE2B3A7; Thu, 17 Feb 2022 13:01:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645103102; 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=pJ0c/UAJ6iExuoo2QrgM5WW4DEBjwczSp/J4+G17AlE=; b=gBFxyULtFW5Jxgkog1WpFsjDijdM5uEuM7yqUUfB9Kv+NdT+Ue+QepRVZeUHy+A3t0oraR ytAYmxSquvQxHEERKO7e6nwoPCnqQ5QFDZeEQfDhbEYMrpFFf1kCAsa3l/w8qWwR1LLewm p0Tpx85XSL+W8l0kD93iPB0k2FlY23w= X-MC-Unique: UPWoHDBJNn-Oz-KTr-vGAw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 08/11] esx_vi: Use automatic mutex management Date: Thu, 17 Feb 2022 14:01:00 +0100 Message-Id: <20220217130103.18543-9-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.15 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: 1645103107477100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/esx/esx_vi.c | 109 ++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 62 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 36e9dc1d2c..b56d84fc43 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -380,17 +380,15 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url= , char **content, range =3D g_strdup_printf("%llu-", offset); } =20 - virMutexLock(&curl->lock); + VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) { + curl_easy_setopt(curl->handle, CURLOPT_URL, url); + curl_easy_setopt(curl->handle, CURLOPT_RANGE, range); + curl_easy_setopt(curl->handle, CURLOPT_WRITEDATA, &buffer); + curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 0); + curl_easy_setopt(curl->handle, CURLOPT_HTTPGET, 1); =20 - curl_easy_setopt(curl->handle, CURLOPT_URL, url); - curl_easy_setopt(curl->handle, CURLOPT_RANGE, range); - curl_easy_setopt(curl->handle, CURLOPT_WRITEDATA, &buffer); - curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 0); - curl_easy_setopt(curl->handle, CURLOPT_HTTPGET, 1); - - responseCode =3D esxVI_CURL_Perform(curl, url); - - virMutexUnlock(&curl->lock); + responseCode =3D esxVI_CURL_Perform(curl, url); + } =20 if (responseCode < 0) { return -1; @@ -422,17 +420,15 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, = const char *content) return -1; } =20 - virMutexLock(&curl->lock); + VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) { + curl_easy_setopt(curl->handle, CURLOPT_URL, url); + curl_easy_setopt(curl->handle, CURLOPT_RANGE, NULL); + curl_easy_setopt(curl->handle, CURLOPT_READDATA, &content); + curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1); + curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, strlen(content)= ); =20 - curl_easy_setopt(curl->handle, CURLOPT_URL, url); - curl_easy_setopt(curl->handle, CURLOPT_RANGE, NULL); - curl_easy_setopt(curl->handle, CURLOPT_READDATA, &content); - curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1); - curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, strlen(content)); - - responseCode =3D esxVI_CURL_Perform(curl, url); - - virMutexUnlock(&curl->lock); + responseCode =3D esxVI_CURL_Perform(curl, url); + } =20 if (responseCode < 0) { return -1; @@ -574,14 +570,12 @@ esxVI_SharedCURL_Add(esxVI_SharedCURL *shared, esxVI_= CURL *curl) } } =20 - virMutexLock(&curl->lock); + VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) { + curl_easy_setopt(curl->handle, CURLOPT_SHARE, shared->handle); =20 - curl_easy_setopt(curl->handle, CURLOPT_SHARE, shared->handle); - - curl->shared =3D shared; - ++shared->count; - - virMutexUnlock(&curl->lock); + curl->shared =3D shared; + ++shared->count; + } =20 return 0; } @@ -606,14 +600,12 @@ esxVI_SharedCURL_Remove(esxVI_SharedCURL *shared, esx= VI_CURL *curl) return -1; } =20 - virMutexLock(&curl->lock); - - curl_easy_setopt(curl->handle, CURLOPT_SHARE, NULL); - - curl->shared =3D NULL; - --shared->count; + VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) { + curl_easy_setopt(curl->handle, CURLOPT_SHARE, NULL); =20 - virMutexUnlock(&curl->lock); + curl->shared =3D NULL; + --shared->count; + } =20 return 0; } @@ -667,14 +659,12 @@ esxVI_MultiCURL_Add(esxVI_MultiCURL *multi, esxVI_CUR= L *curl) =20 } =20 - virMutexLock(&curl->lock); - - curl_multi_add_handle(multi->handle, curl->handle); - - curl->multi =3D multi; - ++multi->count; + VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) { + curl_multi_add_handle(multi->handle, curl->handle); =20 - virMutexUnlock(&curl->lock); + curl->multi =3D multi; + ++multi->count; + } =20 return 0; } @@ -701,14 +691,12 @@ esxVI_MultiCURL_Remove(esxVI_MultiCURL *multi, esxVI_= CURL *curl) return -1; } =20 - virMutexLock(&curl->lock); - - curl_multi_remove_handle(multi->handle, curl->handle); - - curl->multi =3D NULL; - --multi->count; + VIR_WITH_MUTEX_LOCK_GUARD(&curl->lock) { + curl_multi_remove_handle(multi->handle, curl->handle); =20 - virMutexUnlock(&curl->lock); + curl->multi =3D NULL; + --multi->count; + } =20 return 0; } @@ -1232,18 +1220,16 @@ esxVI_Context_Execute(esxVI_Context *ctx, const cha= r *methodName, if (esxVI_Response_Alloc(response) < 0) return -1; =20 - virMutexLock(&ctx->curl->lock); - - curl_easy_setopt(ctx->curl->handle, CURLOPT_URL, ctx->url); - curl_easy_setopt(ctx->curl->handle, CURLOPT_RANGE, NULL); - curl_easy_setopt(ctx->curl->handle, CURLOPT_WRITEDATA, &buffer); - curl_easy_setopt(ctx->curl->handle, CURLOPT_UPLOAD, 0); - curl_easy_setopt(ctx->curl->handle, CURLOPT_POSTFIELDS, request); - curl_easy_setopt(ctx->curl->handle, CURLOPT_POSTFIELDSIZE, strlen(requ= est)); - - (*response)->responseCode =3D esxVI_CURL_Perform(ctx->curl, ctx->url); + VIR_WITH_MUTEX_LOCK_GUARD(&ctx->curl->lock) { + curl_easy_setopt(ctx->curl->handle, CURLOPT_URL, ctx->url); + curl_easy_setopt(ctx->curl->handle, CURLOPT_RANGE, NULL); + curl_easy_setopt(ctx->curl->handle, CURLOPT_WRITEDATA, &buffer); + curl_easy_setopt(ctx->curl->handle, CURLOPT_UPLOAD, 0); + curl_easy_setopt(ctx->curl->handle, CURLOPT_POSTFIELDS, request); + curl_easy_setopt(ctx->curl->handle, CURLOPT_POSTFIELDSIZE, strlen(= request)); =20 - virMutexUnlock(&ctx->curl->lock); + (*response)->responseCode =3D esxVI_CURL_Perform(ctx->curl, ctx->u= rl); + } =20 if ((*response)->responseCode < 0) goto cleanup; @@ -1872,13 +1858,14 @@ esxVI_EnsureSession(esxVI_Context *ctx) esxVI_DynamicProperty *dynamicProperty =3D NULL; esxVI_UserSession *currentSession =3D NULL; g_autofree char *escapedPassword =3D NULL; + VIR_LOCK_GUARD lock =3D { NULL }; =20 if (!ctx->sessionLock) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call, no m= utex")); return -1; } =20 - virMutexLock(ctx->sessionLock); + lock =3D virLockGuardLock(ctx->sessionLock); =20 if (!ctx->session) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call, no s= ession")); @@ -1933,8 +1920,6 @@ esxVI_EnsureSession(esxVI_Context *ctx) result =3D 0; =20 cleanup: - virMutexUnlock(ctx->sessionLock); - esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&sessionManager); esxVI_UserSession_Free(¤tSession); --=20 2.31.1 From nobody Mon May 13 23:57:21 2024 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=1645103048; cv=none; d=zohomail.com; s=zohoarc; b=STnq5JdsFvDBx3IfAefeCBNNjRDrVT1QnR6uzn49dTRdYyVck4qOv6FlYCGh4oJZsYwJATziZ1FD+TPDzDIrW10kbqktPOKp/a6gTppsT9b5uNFXdeXwfs6s3SHlsGFw4ABNXR0SW/uYEg1lkjeyUIbPhviCPDzM4vFzdkw+ZPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645103048; 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=CsLka36hPUVi1OMUhNnDmAfHMNWY2HkUCDcudOcGI5E=; b=Yu6mGS0pl5E0qGUlzdD/SdvsJzEhnluVZQx65pDiwWj7SoCp0Upx/sobeXHbkHMV+TbIwFmZbbH90t1l9CEJl0ch7ZZ7xYBqN9a/XHBcYNiujBIr8/PBh9zzu8sI6v5KUufV4xYS4/SMpTxA6noiEvip4zQMpiy5eUfEGxY7zVI= 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 1645103048879779.6575617191816; Thu, 17 Feb 2022 05:04:08 -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-492-cULBX2pWMQ-dfq54Y7sj7Q-1; Thu, 17 Feb 2022 08:04:05 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A47A2814249; Thu, 17 Feb 2022 13:03:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 84389108F83A; Thu, 17 Feb 2022 13:03:59 +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 2D5E51832AD6; Thu, 17 Feb 2022 13:03:59 +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 21HD1F98031256 for ; Thu, 17 Feb 2022 08:01:15 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4B6082B3DD; Thu, 17 Feb 2022 13:01:15 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.194.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90D2E2B3A7; Thu, 17 Feb 2022 13:01:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645103047; 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=CsLka36hPUVi1OMUhNnDmAfHMNWY2HkUCDcudOcGI5E=; b=dQbjTaj3+y0CwviZzRhOcm91lZJZ9ZgzgPPzgYNkWO8wOovA01apBiK4w8TncBNhsHcoSl JEJAVK4xboFe5oUZgeL2Ui8r5ewXel3BOav8rs1/uvoFVgck6EWLb22Wa2OjLhNo6OMzpE JHzyStpDBeqk7Jxfv/0CdJF0yRt1ugM= X-MC-Unique: cULBX2pWMQ-dfq54Y7sj7Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/11] storage: Statically initialize mutex Date: Thu, 17 Feb 2022 14:01:01 +0100 Message-Id: <20220217130103.18543-10-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.84 on 10.5.11.22 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: 1645103053981100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/virstorageobj.h | 2 -- src/storage/storage_driver.c | 11 ++++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h index 523bdec244..ad6005f153 100644 --- a/src/conf/virstorageobj.h +++ b/src/conf/virstorageobj.h @@ -31,8 +31,6 @@ typedef struct _virStoragePoolObjList virStoragePoolObjLi= st; =20 typedef struct _virStorageDriverState virStorageDriverState; struct _virStorageDriverState { - virMutex lock; - /* pid file FD, ensures two copies of the driver can't use the same ro= ot */ int lockFD; =20 diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 97e0d9b3a0..05675a5539 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -57,6 +57,8 @@ VIR_LOG_INIT("storage.storage_driver"); =20 static virStorageDriverState *driver; =20 +static virMutex mutex =3D VIR_MUTEX_INITIALIZER; + static int storageStateCleanup(void); =20 typedef struct _virStorageVolStreamInfo virStorageVolStreamInfo; @@ -67,11 +69,11 @@ struct _virStorageVolStreamInfo { =20 static void storageDriverLock(void) { - virMutexLock(&driver->lock); + virMutexLock(&mutex); } static void storageDriverUnlock(void) { - virMutexUnlock(&driver->lock); + virMutexUnlock(&mutex); } =20 =20 @@ -270,10 +272,6 @@ storageStateInitialize(bool privileged, driver =3D g_new0(virStorageDriverState, 1); =20 driver->lockFD =3D -1; - if (virMutexInit(&driver->lock) < 0) { - VIR_FREE(driver); - return VIR_DRV_STATE_INIT_ERROR; - } storageDriverLock(); =20 if (!(driver->pools =3D virStoragePoolObjListNew())) @@ -392,7 +390,6 @@ storageStateCleanup(void) VIR_FREE(driver->autostartDir); VIR_FREE(driver->stateDir); storageDriverUnlock(); - virMutexDestroy(&driver->lock); VIR_FREE(driver); =20 return 0; --=20 2.31.1 From nobody Mon May 13 23:57:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1645103043; cv=none; d=zohomail.com; s=zohoarc; b=S+mYtyjtOS6CJi+2Gydur1c1Bm6kW+zpiI9F0XsGMVm3zfkrqoElllNmZ3XyPVzwHokLgUtlStagu06Qd83lMFt64EupAucuZx3Hep6RAMDktjqkcuOP+8l/S72tZ4X9YgsMfpng9Aldm0eZ8BeYovpni880BkhPSESxzy4zIpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645103043; 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=jp76mhVesSPv2/L55N7/nBPxHtiGlKAWqOsOVEQhZG4=; b=TgJafz8eFDXOOMilpDaXspXHfWoN5mNVr+bk98EiVPTlqvfAL6IfTarjfdLVAzn57O9ZGThTwOrISim/dmGRVPCsZGpFTo+r7+v6qIhc5GD7c23hwL6Z+OrkishU8f31BRS6h/cywrW0K2UiiglCpARv0W3vuKyFjQyBVnYWrCg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1645103043507376.82978993667325; Thu, 17 Feb 2022 05:04:03 -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-299-VMDEMAnFNOmAjmcBB8rVNA-1; Thu, 17 Feb 2022 08:03:57 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 85338801ADB; Thu, 17 Feb 2022 13:03:52 +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 64ABF6E216; Thu, 17 Feb 2022 13:03:52 +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 364B346FA4; Thu, 17 Feb 2022 13:03:52 +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 21HD1GO4031263 for ; Thu, 17 Feb 2022 08:01:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id 604BC2B3A7; Thu, 17 Feb 2022 13:01:16 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.194.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id A37242B4B4; Thu, 17 Feb 2022 13:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645103041; 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=jp76mhVesSPv2/L55N7/nBPxHtiGlKAWqOsOVEQhZG4=; b=dVjJ/WaOlGnYK0aYJtuE0D6Cv49ohFH9Y61W2SvXn/sI1zXi/UQeHPMHxIurrb4ayPHPNG /oTZjNaN0rWF8MPo3UP3TdLrJf5ICqCTSyJ6mYj5MV9VsalTFnzfZVTdmSri+qOdbOMZNv hFtraXIeLIdRq+qTM/SLxurQDjz6HdI= X-MC-Unique: VMDEMAnFNOmAjmcBB8rVNA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 10/11] storage: Move and split up storateStateCleanup Date: Thu, 17 Feb 2022 14:01:02 +0100 Message-Id: <20220217130103.18543-11-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.11 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: 1645103052029100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/storage/storage_driver.c | 71 +++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 05675a5539..3bd5d07efb 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -59,8 +59,6 @@ static virStorageDriverState *driver; =20 static virMutex mutex =3D VIR_MUTEX_INITIALIZER; =20 -static int storageStateCleanup(void); - typedef struct _virStorageVolStreamInfo virStorageVolStreamInfo; struct _virStorageVolStreamInfo { char *pool_name; @@ -248,6 +246,43 @@ storageDriverAutostart(void) NULL); } =20 +static int +storageStateCleanupLocked(void) +{ + if (!driver) + return -1; + + virObjectUnref(driver->caps); + virObjectUnref(driver->storageEventState); + + /* free inactive pools */ + virObjectUnref(driver->pools); + + if (driver->lockFD !=3D -1) + virPidFileRelease(driver->stateDir, "driver", + driver->lockFD); + + VIR_FREE(driver->configDir); + VIR_FREE(driver->autostartDir); + VIR_FREE(driver->stateDir); + VIR_FREE(driver); + + return 0; +} + +/** + * storageStateCleanup + * + * Shutdown the storage driver, it will stop all active storage pools + */ +static int +storageStateCleanup(void) +{ + VIR_LOCK_GUARD lock =3D virLockGuardLock(&mutex); + + return storageStateCleanupLocked(); +} + /** * virStorageStartup: * @@ -363,38 +398,6 @@ storageStateReload(void) } =20 =20 -/** - * storageStateCleanup - * - * Shutdown the storage driver, it will stop all active storage pools - */ -static int -storageStateCleanup(void) -{ - if (!driver) - return -1; - - storageDriverLock(); - - virObjectUnref(driver->caps); - virObjectUnref(driver->storageEventState); - - /* free inactive pools */ - virObjectUnref(driver->pools); - - if (driver->lockFD !=3D -1) - virPidFileRelease(driver->stateDir, "driver", - driver->lockFD); - - VIR_FREE(driver->configDir); - VIR_FREE(driver->autostartDir); - VIR_FREE(driver->stateDir); - storageDriverUnlock(); - VIR_FREE(driver); - - return 0; -} - static virDrvOpenStatus storageConnectOpen(virConnectPtr conn, virConnectAuthPtr auth G_GNUC_UNUSED, --=20 2.31.1 From nobody Mon May 13 23:57:21 2024 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=isrzVW+X+7F8W2+WzGoVtursJfEfAQXphBb1MTeuqPGAnineQ2X/R/4Ve6apT6jJIfV2xI5s4JXbGeOKxNUqwxCtPtAa29S+XBnCMh+yfQmELRMjIt9OQ4pFZXyRGcOuEAppZDeaVejO4CflCB/r7wBKQNmUONLFreShtNxBTzc= 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=6WhL6g5i11bSlbf/avNUrqGO7V7tfxOeav28m/JnX3g=; b=WIYPcfrk/Vlw4hpFPD8YxKo+yH12HYS4a+ian+IWd6AibJM7SCsiRS9VpPSa0vj7nKly1krvm15VI6ofBVtA3EjqhapTBQdz4dV1o5BqlrQl2s3NcBP/5Yp9XQopcUhwfO0nwsVg0uMYotlZD840J8i57wbnWUQ2HyJv4JOFe6E= 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 1645103044259799.4458252979467; 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-248-mWRaoFtsNEm7nVf_2oqIwA-1; Thu, 17 Feb 2022 08:04:00 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 57A4E814250; Thu, 17 Feb 2022 13:03:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EEC8F6E218; Thu, 17 Feb 2022 13:03:54 +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 BE2C318329C1; Thu, 17 Feb 2022 13:03:54 +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 21HD1HMu031276 for ; Thu, 17 Feb 2022 08:01:17 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7BBF72B3DD; Thu, 17 Feb 2022 13:01:17 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.194.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB3E32B3A7; Thu, 17 Feb 2022 13:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645103043; 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=6WhL6g5i11bSlbf/avNUrqGO7V7tfxOeav28m/JnX3g=; b=B6suFw0UZTQG0mlwZ1/tSXnoC+7ijYVoh+YJwQ2KdqFHv8kNrC3OwaTqm7CUCmyI74yGrP j67vqrKHMeI/dapnjeVax8kCcLDQE+Gx4a+TI7AiUDNROrzGRKST7XlcVveOSOxAdG/jM5 Vi8YY3JDr2HxP0PP3Jl7NQHaslu0Fz8= X-MC-Unique: mWRaoFtsNEm7nVf_2oqIwA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 11/11] storage: Use automatic mutex management Date: Thu, 17 Feb 2022 14:01:03 +0100 Message-Id: <20220217130103.18543-12-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.11 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: 1645103045652100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/storage/storage_driver.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 3bd5d07efb..74c03b4cbf 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -65,16 +65,6 @@ struct _virStorageVolStreamInfo { char *vol_path; }; =20 -static void storageDriverLock(void) -{ - virMutexLock(&mutex); -} -static void storageDriverUnlock(void) -{ - virMutexUnlock(&mutex); -} - - static void storagePoolRefreshFailCleanup(virStorageBackend *backend, virStoragePoolObj *obj, @@ -297,6 +287,7 @@ storageStateInitialize(bool privileged, g_autofree char *configdir =3D NULL; g_autofree char *rundir =3D NULL; bool autostart =3D true; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&mutex); =20 if (root !=3D NULL) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -307,7 +298,6 @@ storageStateInitialize(bool privileged, driver =3D g_new0(virStorageDriverState, 1); =20 driver->lockFD =3D -1; - storageDriverLock(); =20 if (!(driver->pools =3D virStoragePoolObjListNew())) goto error; @@ -363,13 +353,10 @@ storageStateInitialize(bool privileged, if (!(driver->caps =3D virStorageBackendGetCapabilities())) goto error; =20 - storageDriverUnlock(); - return VIR_DRV_STATE_INIT_COMPLETE; =20 error: - storageDriverUnlock(); - storageStateCleanup(); + storageStateCleanupLocked(); return VIR_DRV_STATE_INIT_ERROR; } =20 @@ -382,17 +369,17 @@ storageStateInitialize(bool privileged, static int storageStateReload(void) { + VIR_LOCK_GUARD lock =3D virLockGuardLock(&mutex); + if (!driver) return -1; =20 - storageDriverLock(); virStoragePoolObjLoadAllState(driver->pools, driver->stateDir); virStoragePoolObjLoadAllConfigs(driver->pools, driver->configDir, driver->autostartDir); storageDriverAutostart(); - storageDriverUnlock(); =20 return 0; } --=20 2.31.1