From nobody Sun May 12 13:32:26 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=1646414986; cv=none; d=zohomail.com; s=zohoarc; b=cEebbQxiaSAnYtv9qUOEvpBvPvPem/zjKI7rq4Otno6bQ7ICjucrdrzICy25HfrwiP3LZTOPxiKu34ZbQMhF9gUZyUnBgJW39kd3xwMZbhtsznN0ZpSdGuo+voMvkgpZ6DbRgOVH6m+ZAkctw+cR5Wy1cyFvBC8AKM+RqQr1n9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646414986; 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=gpUsYylA6Qlfy7f6l07zoaPa9/cIANQn6Wus6XLHKwE=; b=Xj71BAoFo4MWCimPBkZMXomH7dWYQXGmz2cMFTvBdw9n95YxN8OdC2q6S+myxPfyhYKJ+zKbyDzpr2fk1E8DkJPojV3KO3Bm4rg7NTWB9zS7ATXdANSOJ6brClxSObh2NtgZE1xBZGhp4w0aKz1FXkKhvO9MqVlXr1GkThq13Oc= 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 1646414986792929.1990926200766; Fri, 4 Mar 2022 09:29:46 -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-327-25nIVoR1POWQxS1-IP7RKA-1; Fri, 04 Mar 2022 12:29:44 -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 243978070FF; Fri, 4 Mar 2022 17:29:39 +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 028E3E728; Fri, 4 Mar 2022 17:29:39 +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 1FDBC4EA37; Fri, 4 Mar 2022 17:29:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 224HSveM024543 for ; Fri, 4 Mar 2022 12:28:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id 73D0B7DE57; Fri, 4 Mar 2022 17:28:57 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBB4486B4A; Fri, 4 Mar 2022 17:28:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646414985; 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=gpUsYylA6Qlfy7f6l07zoaPa9/cIANQn6Wus6XLHKwE=; b=gy5CnYLiIkdOj8F6IaqP/uP4QMu6Mi8M2dX3KZXlGFugwa2/jbmYirfej/o00jpqMlpgBm uG+oBo07PsdanSS6Mqk+QgsrJiZRN4Ujuy3rXxOcfyWGMOR5unmtH0utwCEpOGwUe91Ir4 hYHbUSzpHYCxKJevCXxyII03riBKu0o= X-MC-Unique: 25nIVoR1POWQxS1-IP7RKA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 01/10] test: Use automatic mutex management Date: Fri, 4 Mar 2022 18:28:31 +0100 Message-Id: <20220304172840.66057-2-twiederh@redhat.com> In-Reply-To: <20220304172840.66057-1-twiederh@redhat.com> References: <20220304172840.66057-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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: 1646414988099100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- 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 4eca5c4a65..34e4652375 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 Sun May 12 13:32:26 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=1646415040; cv=none; d=zohomail.com; s=zohoarc; b=edrqLlWo7E/hiBUeeWqf6yfhywpiPX71Zkm8seJr+D6ClD2MHZWQagwbtnWk/n6jJGvZnUWSRrh/KKdzlViqLDwDOsJMa2KnzCrx+zDUBolJucFigqPBnXTA4zd9W2bIChKYtjNSmnYYNhjcbc+clOLBQYYCdSS1Bbb+2Zpw3L4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646415040; 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=S7U3OotaIBRFLTt3VrLhn/kYES7j2vBGhVGu7WP9U9I=; b=UqC2rUodM1/Ge6fkhFGKB1RMSw+LBkZQ909AYP2hgZqAQnD24w/4/+Unzr70Tad+ryBJ+s7NQUM7RKe5jrxZeaYGlHLrBCRl6R4w5T+x7iAdL8CTucTgmwHNv1ZFLJ+3Q8S2IL9e5+sC6m9py76J4Q9Iwx3oT8tN0arISPI2emE= 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 1646415040940292.0903035241432; Fri, 4 Mar 2022 09:30:40 -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-102-ssE1is64Pf-YOvYU_9zXFw-1; Fri, 04 Mar 2022 12:30:36 -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 55D281856A74; Fri, 4 Mar 2022 17:30:31 +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 36B1E837B9; Fri, 4 Mar 2022 17:30:31 +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 F12D344A5A; Fri, 4 Mar 2022 17:30:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 224HT69e024553 for ; Fri, 4 Mar 2022 12:29:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 19C8E7DE57; Fri, 4 Mar 2022 17:29:06 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6134386B48; Fri, 4 Mar 2022 17:28:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646415039; 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=S7U3OotaIBRFLTt3VrLhn/kYES7j2vBGhVGu7WP9U9I=; b=Hoo8WD45W9WT89i0b8jiGbz2vSjQc06s5syJ4KaCgHfc0+w6pReMZc4POfXnOzj5lxfbvi E19VSaQzr2pcQeucSbcuu5jPsBRT0dZ7a52wAU1zlzE47u2/bdU3Kg3rfqv8XnVjAEomSi XLoRlnCHieQuv5jCgsMZrwORtb6YmYQ= X-MC-Unique: ssE1is64Pf-YOvYU_9zXFw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 02/10] openvz: Use automatic mutex management Date: Fri, 4 Mar 2022 18:28:32 +0100 Message-Id: <20220304172840.66057-3-twiederh@redhat.com> In-Reply-To: <20220304172840.66057-1-twiederh@redhat.com> References: <20220304172840.66057-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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: 1646415042525100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- 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 aa1db09540..d8e4dd7f8b 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 Sun May 12 13:32:26 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=1646414991; cv=none; d=zohomail.com; s=zohoarc; b=lsMIrThFff0tAEiTP9KqjZ8it4cxKkvobf3JvzsyVBDJj7u00h4bFlkTyYPp+xvjvQcm47BLiJB6gn8S9/Krm/FeeSiwa+GWBBf/O0MLgZO90vvJfwLNxOxI385MgamMCooJc6OvhZjpiCv0Whgy/cGOIeUYICaMlILyXjj8DSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646414991; 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=10jWOqwQEuj1w5dxVUUIqfaqBxnKn5GMRlirNo2cpTw=; b=K1jPw0HEKFKyJHZb9BC5DFSdwVBYs8/hmGFtBEFnLOA4z/jHtfGyGAtCVu5dZ2AFHLJzaMl3qIoyxnYcfRswH/HoAnjFBaVABrFmN0IUb8KkRsBAA97baAF1pO1s3HeEWYLaXSpFaILFzzFyWWD+C/IVCTVrChT4oWdbEuLDgcA= 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 1646414991146545.9245063111366; Fri, 4 Mar 2022 09:29: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-278-Jrq1PpH7NOOw94ymDlSyBQ-1; Fri, 04 Mar 2022 12:29:48 -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 C82E9521C; Fri, 4 Mar 2022 17:29:42 +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 A6D03865A2; Fri, 4 Mar 2022 17:29:42 +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 792F51809CB5; Fri, 4 Mar 2022 17:29:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 224HT7mg024558 for ; Fri, 4 Mar 2022 12:29:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5B4B586B48; Fri, 4 Mar 2022 17:29:07 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F4478479A; Fri, 4 Mar 2022 17:29:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646414989; 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=10jWOqwQEuj1w5dxVUUIqfaqBxnKn5GMRlirNo2cpTw=; b=Lr2n1iXtruRbNEsbsz3mi9ftYsVr/b/n/DtNVotNnxR3qr2SqCW06f5HN9CfgYDwt9QJ5V iXHtAdP3c4SGiWARPOoxMsTpah+dcK+TmZ0qDgV8FmpRVkscwiiw4cEtzI7L0A2GTnCDNb ocKT6YN3WrjDKsLnom3oNRafW4cFoMY= X-MC-Unique: Jrq1PpH7NOOw94ymDlSyBQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 03/10] remote_daemon_dispatch: Use automatic mutex management Date: Fri, 4 Mar 2022 18:28:33 +0100 Message-Id: <20220304172840.66057-4-twiederh@redhat.com> In-Reply-To: <20220304172840.66057-1-twiederh@redhat.com> References: <20220304172840.66057-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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: 1646414992128100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- 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 510856024c..1a73976831 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 @@ -6027,8 +5985,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; @@ -6077,7 +6034,6 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetSe= rver *server G_GNUC_UNUSED, rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6093,13 +6049,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; @@ -6121,13 +6075,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 @@ -6146,8 +6098,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; @@ -6196,7 +6147,6 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virN= etServer *server G_GNUC_UNU rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6211,13 +6161,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; @@ -6239,13 +6188,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 @@ -6264,8 +6211,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; @@ -6314,7 +6260,6 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNe= tServer *server G_GNUC_UNUS rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6329,13 +6274,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; @@ -6357,13 +6300,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 @@ -6382,8 +6323,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; @@ -6432,7 +6372,6 @@ remoteDispatchConnectSecretEventRegisterAny(virNetSer= ver *server G_GNUC_UNUSED, rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6447,13 +6386,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; @@ -6475,13 +6412,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 @@ -6501,8 +6436,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; @@ -6546,7 +6480,6 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetS= erver *server G_GNUC_UNUSED rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6562,13 +6495,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; @@ -6591,13 +6522,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 Sun May 12 13:32:26 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=1646414996; cv=none; d=zohomail.com; s=zohoarc; b=XY5/UpReiv/xPu7qry13cAMNvfbV6swstOdj8+rshKTadaI5Cg3sEo442hXJZ0sbbs/cJS5vbVTrBQ/FQQj3EW0ctSXbosu6mzQIQyZsUkwohnwlMOgD37eJ32faVIdwyRMWbFTxhHghHNYESxIH9h8gXNj2JAZCrMxesN3V9f4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646414996; 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=KFajlfK/+92IjsEN2zh+YsicfCzwVu5OFaGPY3KTqXE7B2VInt/2v3rYU5t7AGS3YtysFiV/+oqa+EAzli4IOrlCjRSPMnuNX17c7jQAFu88r6gRqBLftpMRERKs/3rxgEP97S3+Ur5pB+9/K8HdzppbHlxNcwXkp09cE9ycYCI= 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 1646414996767496.09366486781767; Fri, 4 Mar 2022 09:29:56 -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-505-hXS_qlxZPW-M3F-7iziP8A-1; Fri, 04 Mar 2022 12:29:54 -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 6B7A65235; Fri, 4 Mar 2022 17:29:46 +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 4D137841C3; Fri, 4 Mar 2022 17:29:46 +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 EA0AA18087F0; Fri, 4 Mar 2022 17:29:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 224HTPgi024594 for ; Fri, 4 Mar 2022 12:29:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id D14397DE4C; Fri, 4 Mar 2022 17:29:25 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 222EF86B48; Fri, 4 Mar 2022 17:29:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646414995; 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=CXkCyZTzajE4OYQ9YkYolKcdyzt6DbzFopHdboJN46j91SB2H/pOX0i/drkbv2KEiDHCG6 YvVev45JRRwbjPLuxy8n0/+MToRnf2E0vVXmm3jVXWASSa4V797HdXROVlf+dULo7k94D3 9M3Iit8+nEPRn+X+KDY+Pu4cH1cCwas= X-MC-Unique: hXS_qlxZPW-M3F-7iziP8A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 04/10] netdev: Use automatic mutex management Date: Fri, 4 Mar 2022 18:28:34 +0100 Message-Id: <20220304172840.66057-5-twiederh@redhat.com> In-Reply-To: <20220304172840.66057-1-twiederh@redhat.com> References: <20220304172840.66057-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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: 1646414998125100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- 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 Sun May 12 13:32:26 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=1646415043; cv=none; d=zohomail.com; s=zohoarc; b=eYEZMRUPBPaT85IOkLynueQPla3tut/KetmoO0ttdbZws2mlvMFNQwi/SrNT8piCJmFIjczjqMXkdSlMGYBkgHgptHcsPdhErfo8Q/cwWNr0Qw5fUO0T1UjpAV9tQ85Vj/XMrqwq0lIyZECMARV0D+YZ9dY9PaeKZWINO7l1B2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646415043; 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=gMY5aUo4xrS1Ee0PuT3s94gbRvt+duCe406k0Ieq9yXIKfxYzBVqakqEFoFvwq3no5PNWu66MmyhYQDiSP3CyX8i2Pz2DD3XLW8R0IVealkMuYzRgcZgIoXB/lO5tr/EN4v4zLDMVi3VX40g4hQJ3HgYorzy+Mia/50FaFB3X48= 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 1646415043399638.9458504005181; Fri, 4 Mar 2022 09:30:43 -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-219-o9VvmdnuMT6frIdti_s84A-1; Fri, 04 Mar 2022 12:30:39 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CFC58427C4; Fri, 4 Mar 2022 17:30:33 +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 AE5CA86C4F; Fri, 4 Mar 2022 17:30:33 +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 7E26D1809CB5; Fri, 4 Mar 2022 17:30:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 224HTQ5D024599 for ; Fri, 4 Mar 2022 12:29:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id E6F227DE4C; Fri, 4 Mar 2022 17:29:26 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32DC58479A; Fri, 4 Mar 2022 17:29:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646415042; 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=fWxmfaI81Mv+EAM4ZxGKOltjR6+LSJ7UYWSZ5op41mR/nij36hCV8F9CUF/KYeJfKGJjdD tgutRHYu2K95OuUhBQGdDQpaUUIcgqb17TMeEZzhCVf1F3G5/ZJZbie1iE2Us7PYZnLqSA LJuKqGwuTJzMefqwn/svUOs2ms3Lh1c= X-MC-Unique: o9VvmdnuMT6frIdti_s84A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 05/10] nodesuspend: Use automatic mutex management Date: Fri, 4 Mar 2022 18:28:35 +0100 Message-Id: <20220304172840.66057-6-twiederh@redhat.com> In-Reply-To: <20220304172840.66057-1-twiederh@redhat.com> References: <20220304172840.66057-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.12 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: 1646415044534100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- 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 Sun May 12 13:32:26 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=1646414991; cv=none; d=zohomail.com; s=zohoarc; b=dnW9hF6L2C9NIbDQGj3wleCty69X5q09ZHDYtyDrjnsFDPW5L2hW9Z6yR4VBdsAERvKX5O5bpwT/wUVfXPLL7IqWSmG9M66qXkrkalwHNFWwOJRbImWHs0zty5ZBIFAc9zm9A0cOz2qCmk55kpW9JPzEZYiMpirkcVSeKp4/jAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646414991; 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=iHC1ut6h2JWSejBuHXZ13uHV2v6ivZo4Vw7joITwLFUrN8o6I5CCWXf5r9/trjxWMvZbzCukXE0ZjuwoMRF+Gn+oWO3oU9oKDFtbMk81lYdZlPlLJ/0JUNsLwmGlo0Q78HraYOyncG+zRlwWnPvu6iqOgHdNKLFGZDU/HXBIQGo= 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 1646414991912868.0972461985315; Fri, 4 Mar 2022 09:29: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-561-wib7upbPPtifo-ImnAyfAA-1; Fri, 04 Mar 2022 12:29:49 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B44BB807353; Fri, 4 Mar 2022 17:29:43 +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 97C0A7C04B; Fri, 4 Mar 2022 17:29:43 +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 4F4E64ED66; Fri, 4 Mar 2022 17:29:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 224HTSJc024609 for ; Fri, 4 Mar 2022 12:29:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 09A7F84796; Fri, 4 Mar 2022 17:29:28 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B9247DE4C; Fri, 4 Mar 2022 17:29:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646414991; 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=UD+7hYxNHNOqO4Ec/ApHaYp9NqO910iFRvL+KK2h/j5RRNnBWvlgBQjRBxYGKZRZhBST83 +y476mus7OtDWtT9VaWNulxZ7sobybe6rd7kMgDt/18h3xxoT+XJPx13GNP5Rj/u208eJn 6OMqIHGPnl53pQDJHStLBBpsTDN/pd8= X-MC-Unique: wib7upbPPtifo-ImnAyfAA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 06/10] admin: Use automatic mutex management Date: Fri, 4 Mar 2022 18:28:36 +0100 Message-Id: <20220304172840.66057-7-twiederh@redhat.com> In-Reply-To: <20220304172840.66057-1-twiederh@redhat.com> References: <20220304172840.66057-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.14 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: 1646414994086100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- 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 Sun May 12 13:32:26 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=1646415046; cv=none; d=zohomail.com; s=zohoarc; b=FKLlWzSj9dc80TN5NFXdWlRu6lDWr8FG6JXInsNx/7R9HIoAmLP6aGonEDQj0BbfOoZfOOvi6iLl/7a9+hO4KybrE581jtNsWXmHTcAjvQZTtOMGTsugIkJbVi7gntrFRZxxnSTGzuxGej/bbhAbbS+A9I7U/8JRg2SXQ/ZF91U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646415046; 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=Ji5p7Y4n6jpDJ5uYeP1taAiisxzEeReNomNnyvSrcVaFyUSkM8k1GfujMMIApd6M4vmaOEeUF/T90DPAyiDiirlTtODmVsK8GWnbDqFogjsuAe6+v8ZdbXJrV+wHsRFuYKi0K0mfaVn++tiRXMwnN4Wof9u0VkIy7/GSc5fdh3E= 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 1646415046594671.3081497465325; Fri, 4 Mar 2022 09:30:46 -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-214-cnEV8xxbPMK3_TiohRXXyg-1; Fri, 04 Mar 2022 12:30:42 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DFBE684A604; Fri, 4 Mar 2022 17:30:37 +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 BD79086C55; Fri, 4 Mar 2022 17:30:37 +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 8E20A44A5A; Fri, 4 Mar 2022 17:30:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 224HTTg2024614 for ; Fri, 4 Mar 2022 12:29:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3C1D77DE57; Fri, 4 Mar 2022 17:29:29 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C68D8479A; Fri, 4 Mar 2022 17:29:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646415046; 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=JnI71KvrQG1c+6V6deD9ssKIix9el8npS+MVwlvFF3239lWySLiM8qDWAMzT63dhdXujAs hGkidTD45R9o0sWWPlu9tojDsXr0Fv+fPtVPez/1emfJp46PFg2y424McNJBCXdsiW1CVU LvjK/EqWR5Li0WDnYHu2JutS/3AFQT0= X-MC-Unique: cnEV8xxbPMK3_TiohRXXyg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 07/10] esx_stream: Use automatic mutex management Date: Fri, 4 Mar 2022 18:28:37 +0100 Message-Id: <20220304172840.66057-8-twiederh@redhat.com> In-Reply-To: <20220304172840.66057-1-twiederh@redhat.com> References: <20220304172840.66057-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.12 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: 1646415048579100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- 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 Sun May 12 13:32:26 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=1646414996; cv=none; d=zohomail.com; s=zohoarc; b=dBBh+dis5poabhRft4p2RdJx3pEMzj0xLVFzPDVEp2KFY1+SFwEyrT4OD2OhMf6qN6D/AC/Vg4mqXRtBQkBd6ZbDqP9pxf2d+dyf5I3XOgN3uIf3ou7d4vd9Itl3PTo7hyrJjI5It6kovhSvjgT1POB14UzGhFsis/FUK2YHoYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646414996; 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=dsvJFMMyTDN9hvyTVvXjDkw/cjiZgunOyFn8tySgj+ioPrkujHLRr0i20bcTa0nMV7QgUatoTFLmR0CflZrs5oE7mC5BQR1ark5dgLWrTT0bUFg5AM0zbBy3c0ToufDPCjxmwyHqOQsfgcqa4PjAV0iWVf6ogdGQVkalbBHYlPM= 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 1646414996436532.3074250920927; Fri, 4 Mar 2022 09:29:56 -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-620-C_VMF3aBNIu_ycFHw7S9bQ-1; Fri, 04 Mar 2022 12:29:52 -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 45CEA1854E2F; Fri, 4 Mar 2022 17:29:46 +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 F314486586; Fri, 4 Mar 2022 17:29: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 C7AD046F98; Fri, 4 Mar 2022 17:29:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 224HTUkV024630 for ; Fri, 4 Mar 2022 12:29:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id 907D284796; Fri, 4 Mar 2022 17:29:30 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4E5F7DE4C; Fri, 4 Mar 2022 17:29:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646414995; 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=CTAYEjsO/DXGBcOuEWG/04W3XvcnGtuk0nHpjy6uz+w2n3CsmKRuSYH1N3rVv4YI5sXlF2 aaPHkPtGd1o12oY+agHNL4Hbic35ZjXolK8TB3eWe5kF+nyx0rbcB+mRhK/ALIKezhNGVk r98t/XKxaY0pYRWbudbOPktola/7NUc= X-MC-Unique: C_VMF3aBNIu_ycFHw7S9bQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 08/10] esx_vi: Use automatic mutex management Date: Fri, 4 Mar 2022 18:28:38 +0100 Message-Id: <20220304172840.66057-9-twiederh@redhat.com> In-Reply-To: <20220304172840.66057-1-twiederh@redhat.com> References: <20220304172840.66057-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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: 1646414998145100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- 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 Sun May 12 13:32:26 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=1646414997; cv=none; d=zohomail.com; s=zohoarc; b=O6XOIixXTsZE+PSDDorS5FYp76HSXScNIi9KjNfqtPHuYj6LqjD5sVYuUv5y4PBR69JddYKQPFlt/klzVfDWARkZg3PZw1KvJ3BvvMAl7fPFXxIdslUUvlkNW4jsb47rEVPhBVXAQ+Rn3fO4yuzWFoCIzfZ3WIBLuGk1JYMgX9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646414997; 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=iIjf/wWhJmeRDa5L4aA2KKKX8tVd63aApTaApP5Fqeg=; b=M4tRBcwY99hG5K0Z05kHJPijiZlW99oqZWCP+bcnClFFuhjAf8qHRkoy/ElqjMNMVGP5VWf4iiBPxxDE3Ma3JgAOLPhIUrDtw1ubG5D3UA7eNUSfwN0bRnF28DjHypURU51ADEbznZsd7BanHxw+1uiuFRYNZKIpGMhFWhE4rR0= 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 1646414997697243.3335150795159; Fri, 4 Mar 2022 09:29:57 -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-220-VKAhYhhWOq2-MapyyPYaPg-1; Fri, 04 Mar 2022 12:29:55 -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 897EE814707; Fri, 4 Mar 2022 17:29:49 +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 E29C186586; Fri, 4 Mar 2022 17:29: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 B6E2544A59; Fri, 4 Mar 2022 17:29:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 224HTVNt024648 for ; Fri, 4 Mar 2022 12:29:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id B427A8479F; Fri, 4 Mar 2022 17:29:31 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 067857DE4C; Fri, 4 Mar 2022 17:29:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646414996; 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=iIjf/wWhJmeRDa5L4aA2KKKX8tVd63aApTaApP5Fqeg=; b=GX5gQlBEYH/glYkaUgBsHhMk7vHYSQSRpwsgBxXj/j/cQWwecleRx0X/dcUDQznO6g7T5l 9GVdiBWrtiXke6H9uQOofo9FiIyrCLsiR8kW5D0E+bnTLBZa+Ahnrcn5EMusqLhVSmh3UX 5gqxIIwiNTK66Q3pjaqUtaBCnZjGwLw= X-MC-Unique: VKAhYhhWOq2-MapyyPYaPg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 09/10] storage: Removing mutex locking in initialization and cleanup Date: Fri, 4 Mar 2022 18:28:39 +0100 Message-Id: <20220304172840.66057-10-twiederh@redhat.com> In-Reply-To: <20220304172840.66057-1-twiederh@redhat.com> References: <20220304172840.66057-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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: 1646414998162100003 Content-Type: text/plain; charset="utf-8" These functions are only ever called in a single threaded environment and the mutex would not have prevented concurrent access anyway. Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/storage/storage_driver.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 97e0d9b3a0..ee710f6b76 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -274,7 +274,6 @@ storageStateInitialize(bool privileged, VIR_FREE(driver); return VIR_DRV_STATE_INIT_ERROR; } - storageDriverLock(); =20 if (!(driver->pools =3D virStoragePoolObjListNew())) goto error; @@ -330,12 +329,9 @@ storageStateInitialize(bool privileged, if (!(driver->caps =3D virStorageBackendGetCapabilities())) goto error; =20 - storageDriverUnlock(); - return VIR_DRV_STATE_INIT_COMPLETE; =20 error: - storageDriverUnlock(); storageStateCleanup(); return VIR_DRV_STATE_INIT_ERROR; } @@ -376,8 +372,6 @@ storageStateCleanup(void) if (!driver) return -1; =20 - storageDriverLock(); - virObjectUnref(driver->caps); virObjectUnref(driver->storageEventState); =20 @@ -391,7 +385,6 @@ storageStateCleanup(void) VIR_FREE(driver->configDir); VIR_FREE(driver->autostartDir); VIR_FREE(driver->stateDir); - storageDriverUnlock(); virMutexDestroy(&driver->lock); VIR_FREE(driver); =20 --=20 2.31.1 From nobody Sun May 12 13:32:26 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=1646415001; cv=none; d=zohomail.com; s=zohoarc; b=hckNU+0Yc70Qeb47rj8CCV2Cq1sAg2xRd8GeXxKd8yQTf0/Igdqh2QuzKt6E55Bn6WD+gyuS/+o+/2eFMBD7+pSiD2vkdG+e+vmnDAHk+9Kl/K/zd2S8+y6UvUU/F5bJ1MYaHBHu6tuPYcTz24Db265az6xFfbPDz4lqN5LuApM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646415001; 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=qEycrvGaeZYEaO+++7Np9vs92KoimTd1h12Q4adIlfA=; b=Svp9n1sqHCTNOkyXSzj1zPlUEQgn496PUfWcGVomH/skGE6qp3OvLgeBfQ1CWl2d867Olp4bfcI1dZhkLOCEtBC+UPBgR+HAW2+VYfboH/15H0H4TKQ51ZDqB2DBd5CV819AGh2YRir8F0392pDkLrntKxUCkT9DjdupxiZ9DjU= 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 1646415001671710.8059653789832; Fri, 4 Mar 2022 09:30:01 -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-241-sIEYKHQdOraGo0GKLEsrAQ-1; Fri, 04 Mar 2022 12:29:57 -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 9F2A85218; Fri, 4 Mar 2022 17:29:51 +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 80A1B8659C; Fri, 4 Mar 2022 17:29: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 5411644A5F; Fri, 4 Mar 2022 17:29:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 224HTW27024656 for ; Fri, 4 Mar 2022 12:29:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id D671386B48; Fri, 4 Mar 2022 17:29:32 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 165D97DE4C; Fri, 4 Mar 2022 17:29:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646415000; 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=qEycrvGaeZYEaO+++7Np9vs92KoimTd1h12Q4adIlfA=; b=G+4aUkoWvTj2AuJWtgwNjsXlB5t//lWfIGSxRi8t25WxfXUR+A5sD2L1WydZBV664X2EtY xWF41IiMxe4M/Eiuo3YyrL0Mnk7zX6Zky9McZaRWNScPnu9jVkhbLYzfzoKu2RC0FJK3p5 F/hQHyj2+F+NCYRVA9OK4xIi2OyQwak= X-MC-Unique: sIEYKHQdOraGo0GKLEsrAQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 10/10] storage: Use automatic mutex management Date: Fri, 4 Mar 2022 18:28:40 +0100 Message-Id: <20220304172840.66057-11-twiederh@redhat.com> In-Reply-To: <20220304172840.66057-1-twiederh@redhat.com> References: <20220304172840.66057-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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: 1646415002181100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/storage/storage_driver.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index ee710f6b76..e3e1604311 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(&driver->lock); -} -static void storageDriverUnlock(void) -{ - virMutexUnlock(&driver->lock); -} - - static void storagePoolRefreshFailCleanup(virStorageBackend *backend, virStoragePoolObj *obj, @@ -348,14 +338,13 @@ storageStateReload(void) if (!driver) return -1; =20 - storageDriverLock(); - virStoragePoolObjLoadAllState(driver->pools, - driver->stateDir); - virStoragePoolObjLoadAllConfigs(driver->pools, - driver->configDir, - driver->autostartDir); - storageDriverAutostart(); - storageDriverUnlock(); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + virStoragePoolObjLoadAllState(driver->pools, driver->stateDir); + virStoragePoolObjLoadAllConfigs(driver->pools, + driver->configDir, + driver->autostartDir); + storageDriverAutostart(); + } =20 return 0; } --=20 2.31.1