From nobody Sun Feb 8 22:57:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (205.139.110.61 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1580539024546950.8424993665152; Fri, 31 Jan 2020 22:37:04 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-199-YweqnYBVPUKaI9mkSWcW4A-1; Sat, 01 Feb 2020 01:36:18 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 23BC9100551A; Sat, 1 Feb 2020 06:36:13 +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 E07905C1BB; Sat, 1 Feb 2020 06:36:12 +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 7C2F018089D7; Sat, 1 Feb 2020 06:36:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0116Y0gj012506 for ; Sat, 1 Feb 2020 01:34:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0440B84791; Sat, 1 Feb 2020 06:34:00 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-34.brq.redhat.com [10.40.204.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A70D77932 for ; Sat, 1 Feb 2020 06:33:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580539023; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=D8eZ56a4tn/qkkAzTGbnb9M9X6VcrqsurXHh6RD7QDQ=; b=GTIK9Ir//nEaxBqQBcj3K0SqH1laIDwNe7DFLOa6acSNxzKUSiETiIfY10Cqgwg9HBGQT1 y45QGIjxvhKt75jGAsKoGdfQKas814citWJu2o3Fsv0s5lLiG/rRA5wsZqfgMaNZwYr71m b2vIycnOFLzqjWt8WsNj0GZbYNx0LdE= From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 6/7] src: Drop virAtomicIntDecAndTest() with g_atomic_int_dec_and_test() Date: Sat, 1 Feb 2020 07:33:48 +0100 Message-Id: <2c276e00de80091b57842a300056256d51bb64bf.1580538782.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com 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.16 X-MC-Unique: YweqnYBVPUKaI9mkSWcW4A-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_process.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 8 ++++---- src/qemu/qemu_process.c | 2 +- src/util/viratomic.h | 11 ----------- src/util/virobject.c | 2 +- 6 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 8885af451f..d53363dc02 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -878,7 +878,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, =20 priv->ignoreDeathEvent =3D false; =20 - if (virAtomicIntDecAndTest(&driver->nactive) && driver->inhibitCallbac= k) + if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCa= llback) driver->inhibitCallback(false, driver->inhibitOpaque); =20 if ((vm->def->ngraphics =3D=3D 1) && diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 2bb2216dc0..d8ddea6d24 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -208,7 +208,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, vm->pid =3D -1; vm->def->id =3D -1; =20 - if (virAtomicIntDecAndTest(&driver->nactive) && driver->inhibitCallbac= k) + if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCa= llback) driver->inhibitCallback(false, driver->inhibitOpaque); =20 virLXCDomainReAttachHostDevices(driver, vm->def); diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcp= snoop.c index f73913ec9e..c4341ee3e2 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -692,7 +692,7 @@ virNWFilterSnoopReqPut(virNWFilterSnoopReqPtr req) =20 virNWFilterSnoopLock(); =20 - if (virAtomicIntDecAndTest(&req->refctr)) { + if (!!g_atomic_int_dec_and_test(&req->refctr)) { /* * delete the request: * - if we don't find req on the global list anymore @@ -868,7 +868,7 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReqPtr req, skip_instantiate: VIR_FREE(ipl); =20 - ignore_value(virAtomicIntDecAndTest(&virNWFilterSnoopState.nLeases)); + ignore_value(!!g_atomic_int_dec_and_test(&virNWFilterSnoopState.nLease= s)); =20 lease_not_found: VIR_FREE(ipstr); @@ -1142,7 +1142,7 @@ static void virNWFilterDHCPDecodeWorker(void *jobdata= , void *opaque) _("Instantiation of rules failed on " "interface '%s'"), req->binding->portdevname); } - ignore_value(virAtomicIntDecAndTest(job->qCtr)); + ignore_value(!!g_atomic_int_dec_and_test(job->qCtr)); VIR_FREE(job); } =20 @@ -1543,7 +1543,7 @@ virNWFilterDHCPSnoopThread(void *req0) pcap_close(pcapConf[i].handle); } =20 - ignore_value(virAtomicIntDecAndTest(&virNWFilterSnoopState.nThreads)); + ignore_value(!!g_atomic_int_dec_and_test(&virNWFilterSnoopState.nThrea= ds)); =20 return; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 20c4e3bb5d..ed14ce5ea2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7313,7 +7313,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, =20 qemuProcessBuildDestroyMemoryPaths(driver, vm, NULL, false); =20 - if (virAtomicIntDecAndTest(&driver->nactive) && driver->inhibitCallbac= k) + if (!!g_atomic_int_dec_and_test(&driver->nactive) && driver->inhibitCa= llback) driver->inhibitCallback(false, driver->inhibitOpaque); =20 /* Wake up anything waiting on domain condition */ diff --git a/src/util/viratomic.h b/src/util/viratomic.h index 152cfcd903..1ddc7019f9 100644 --- a/src/util/viratomic.h +++ b/src/util/viratomic.h @@ -26,17 +26,6 @@ =20 #include "internal.h" =20 -/** - * virAtomicIntDecAndTest: - * Decrements the value of atomic by 1. - * - * Think of this operation as an atomic version of - * { *atomic -=3D 1; return *atomic =3D=3D 0; } - * - * This call acts as a full compiler and hardware memory barrier. - */ -#define virAtomicIntDecAndTest(i) (!!g_atomic_int_dec_and_test(i)) - /** * virAtomicIntCompareExchange: * Compares atomic to oldval and, if equal, sets it to newval. If diff --git a/src/util/virobject.c b/src/util/virobject.c index 9185d3e92e..7749d89243 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -344,7 +344,7 @@ virObjectUnref(void *anyobj) if (VIR_OBJECT_NOTVALID(obj)) return false; =20 - bool lastRef =3D virAtomicIntDecAndTest(&obj->u.s.refs); + bool lastRef =3D !!g_atomic_int_dec_and_test(&obj->u.s.refs); PROBE(OBJECT_UNREF, "obj=3D%p", obj); if (lastRef) { PROBE(OBJECT_DISPOSE, "obj=3D%p", obj); --=20 2.24.1