From nobody Mon Feb 9 09:08:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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 207.211.31.81 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 (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1580538968800734.4074306537667; Fri, 31 Jan 2020 22:36:08 -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-287-iTu8iUvcNuK8x5RqD_8NzA-1; Sat, 01 Feb 2020 01:36:05 -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 BB19F8010CB; Sat, 1 Feb 2020 06:35:57 +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 8F40C60BE1; Sat, 1 Feb 2020 06:35:57 +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 3ACBD18089D5; Sat, 1 Feb 2020 06:35:57 +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 0116XxFh012491 for ; Sat, 1 Feb 2020 01:33:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2718D84791; Sat, 1 Feb 2020 06:33:59 +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 9B3CA77932 for ; Sat, 1 Feb 2020 06:33:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580538967; 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=qe0/px7YagKGmK84Eh+jRN1hIlEHe1pK1jreRGSqOWA=; b=GPdyZK3soURVgg+x/S3fJzvPBk17isE3Y1eK293WXZvKGA7S0x2PVag/vmc9sIwEQOKCia 1fHCkX4kHBPNO9Yk65203q3WTI6Fxwf7zh0HR47PzZDKzJbspfZc4Fue+Qn1uUnEZS2SSW oQARG9xxqO/VbT//5Dy8Iqqz/1z8dSY= From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 5/7] src: Replace virAtomicIntInc() with g_atomic_int_add() Date: Sat, 1 Feb 2020 07:33:47 +0100 Message-Id: <7892773bae7749bd8a63681bc3f7e7e3ed905aab.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.12 X-MC-Unique: iTu8iUvcNuK8x5RqD_8NzA-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/libxl/libxl_driver.c | 2 +- src/lxc/lxc_process.c | 4 ++-- src/nwfilter/nwfilter_dhcpsnoop.c | 10 +++++----- src/qemu/qemu_process.c | 4 ++-- src/test/test_driver.c | 2 +- src/util/viratomic.h | 11 ----------- src/util/virobject.c | 4 ++-- src/util/virprocess.c | 2 +- 9 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index d63eca0bd6..8885af451f 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1471,7 +1471,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) goto destroy_dom; =20 - if (virAtomicIntInc(&driver->nactive) =3D=3D 0 && driver->inhibitCallb= ack) + if (g_atomic_int_add(&driver->nactive, 1) =3D=3D 0 && driver->inhibitC= allback) driver->inhibitCallback(true, driver->inhibitOpaque); =20 /* finally we can call the 'started' hook script if any */ diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index da9a640db5..41cbb67e3a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -446,7 +446,7 @@ libxlReconnectDomain(virDomainObjPtr vm, virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNKNOWN); =20 - if (virAtomicIntInc(&driver->nactive) =3D=3D 0 && driver->inhibitCallb= ack) + if (g_atomic_int_add(&driver->nactive, 1) =3D=3D 0 && driver->inhibitC= allback) driver->inhibitCallback(true, driver->inhibitOpaque); =20 /* Enable domain death events */ diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 2e860e2fae..2bb2216dc0 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1468,7 +1468,7 @@ int virLXCProcessStart(virConnectPtr conn, if (virCommandHandshakeNotify(cmd) < 0) goto cleanup; =20 - if (virAtomicIntInc(&driver->nactive) =3D=3D 0 && driver->inhibitCallb= ack) + if (g_atomic_int_add(&driver->nactive, 1) =3D=3D 0 && driver->inhibitC= allback) driver->inhibitCallback(true, driver->inhibitOpaque); =20 if (lxcContainerWaitForContinue(handshakefds[0]) < 0) { @@ -1670,7 +1670,7 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm, virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNKNOWN); =20 - if (virAtomicIntInc(&driver->nactive) =3D=3D 0 && driver->inhibitC= allback) + if (g_atomic_int_add(&driver->nactive, 1) =3D=3D 0 && driver->inhi= bitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); =20 if (!(priv->monitor =3D virLXCProcessConnectMonitor(driver, vm))) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcp= snoop.c index b82779609d..f73913ec9e 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -541,7 +541,7 @@ virNWFilterSnoopReqLeaseTimerRun(virNWFilterSnoopReqPtr= req) static void virNWFilterSnoopReqGet(virNWFilterSnoopReqPtr req) { - virAtomicIntInc(&req->refctr); + g_atomic_int_add(&req->refctr, 1); } =20 /* @@ -756,7 +756,7 @@ virNWFilterSnoopReqLeaseAdd(virNWFilterSnoopReqPtr req, /* put the lease on the req's list */ virNWFilterSnoopIPLeaseTimerAdd(pl); =20 - virAtomicIntInc(&virNWFilterSnoopState.nLeases); + g_atomic_int_add(&virNWFilterSnoopState.nLeases, 1); =20 exit: if (update_leasefile) @@ -1172,7 +1172,7 @@ virNWFilterSnoopDHCPDecodeJobSubmit(virThreadPoolPtr = pool, ret =3D virThreadPoolSendJob(pool, 0, job); =20 if (ret =3D=3D 0) - virAtomicIntInc(qCtr); + g_atomic_int_add(qCtr, 1); else VIR_FREE(job); =20 @@ -1649,7 +1649,7 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr tech= driver, =20 threadPuts =3D true; =20 - virAtomicIntInc(&virNWFilterSnoopState.nThreads); + g_atomic_int_add(&virNWFilterSnoopState.nThreads, 1); =20 req->threadkey =3D virNWFilterSnoopActivate(req); if (!req->threadkey) { @@ -1777,7 +1777,7 @@ virNWFilterSnoopLeaseFileSave(virNWFilterSnoopIPLease= Ptr ipl) goto err_exit; =20 /* keep dead leases at < ~95% of file size */ - if (virAtomicIntInc(&virNWFilterSnoopState.wLeases) >=3D + if (g_atomic_int_add(&virNWFilterSnoopState.wLeases, 1) >=3D g_atomic_int_get(&virNWFilterSnoopState.nLeases) * 20) virNWFilterSnoopLeaseFileLoad(); /* load & refresh lease file */ =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 57a60c568a..20c4e3bb5d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5571,7 +5571,7 @@ qemuProcessInit(virQEMUDriverPtr driver, qemuDomainSetFakeReboot(driver, vm, false); virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_STAR= TING_UP); =20 - if (virAtomicIntInc(&driver->nactive) =3D=3D 0 && driver->inhibitC= allback) + if (g_atomic_int_add(&driver->nactive, 1) =3D=3D 0 && driver->inhi= bitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); =20 /* Run an early hook to set-up missing devices */ @@ -8146,7 +8146,7 @@ qemuProcessReconnect(void *opaque) goto error; } =20 - if (virAtomicIntInc(&driver->nactive) =3D=3D 0 && driver->inhibitCallb= ack) + if (g_atomic_int_add(&driver->nactive, 1) =3D=3D 0 && driver->inhibitC= allback) driver->inhibitCallback(true, driver->inhibitOpaque); =20 cleanup: diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4e159157d7..ba157c0686 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -695,7 +695,7 @@ testDomainStartState(testDriverPtr privconn, int ret =3D -1; =20 virDomainObjSetState(dom, VIR_DOMAIN_RUNNING, reason); - dom->def->id =3D virAtomicIntInc(&privconn->nextDomID); + dom->def->id =3D g_atomic_int_add(&privconn->nextDomID, 1); =20 if (virDomainObjSetDefTransient(privconn->xmlopt, dom, NULL) < 0) { diff --git a/src/util/viratomic.h b/src/util/viratomic.h index 2811447a29..152cfcd903 100644 --- a/src/util/viratomic.h +++ b/src/util/viratomic.h @@ -26,17 +26,6 @@ =20 #include "internal.h" =20 -/** - * virAtomicIntInc: - * Increments the value of atomic by 1. - * - * Think of this operation as an atomic version of - * { tmp =3D *atomic; *atomic +=3D 1; return tmp; } - * - * This call acts as a full compiler and hardware memory barrier. - */ -#define virAtomicIntInc(i) g_atomic_int_add(i, 1) - /** * virAtomicIntDecAndTest: * Decrements the value of atomic by 1. diff --git a/src/util/virobject.c b/src/util/virobject.c index 8cece6e735..9185d3e92e 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -182,7 +182,7 @@ virClassNew(virClassPtr parent, goto error; =20 klass->parent =3D parent; - klass->magic =3D virAtomicIntInc(&magicCounter); + klass->magic =3D g_atomic_int_add(&magicCounter, 1); if (klass->magic > 0xCAFEFFFF) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("too many object classes defined")); @@ -382,7 +382,7 @@ virObjectRef(void *anyobj) =20 if (VIR_OBJECT_NOTVALID(obj)) return NULL; - virAtomicIntInc(&obj->u.s.refs); + g_atomic_int_add(&obj->u.s.refs, 1); PROBE(OBJECT_REF, "obj=3D%p", obj); return anyobj; } diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 60419538e2..689db4f19d 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1048,7 +1048,7 @@ int virProcessGetStartTime(pid_t pid, unsigned long long *timestamp) { static int warned; - if (virAtomicIntInc(&warned) =3D=3D 0) { + if (g_atomic_int_add(&warned, 1) =3D=3D 0) { VIR_WARN("Process start time of pid %lld not available on this pla= tform", (long long) pid); } --=20 2.24.1