From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 90D5E43183;
Tue, 17 Oct 2023 01:11:16 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id AFD30427E9;
Tue, 17 Oct 2023 01:09:31 +0200 (CEST)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id 29AD440E72
for <dev@dpdk.org>; Tue, 17 Oct 2023 01:09:09 +0200 (CEST)
Received: by linux.microsoft.com (Postfix, from userid 1086)
id 9941020B74CE; Mon, 16 Oct 2023 16:09:07 -0700 (PDT)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9941020B74CE
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1697497747;
bh=rY4lmR2gWxJMN7393MDpNdH7LXvEpEyXdr+d+xurNR4=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=Io4fd2K5uIB7pAm1w3uMkNLRxlhl1gjbBQwnsDu3hXe/osm2DAB7aASNhK7Rd0xkb
aXLuGZUgPp1hdHrN52w/L3z1cDhcKw5sCQUNUOQ3OOK1UbXBybqjyAfYfEEoFoO6qN
GsmBoRRB1l6LfhMaRTfh7urGXx+Vi/Ycm+VQUnF8=
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: Akhil Goyal <gakhil@marvell.com>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,
Bruce Richardson <bruce.richardson@intel.com>,
Chenbo Xia <chenbo.xia@intel.com>, Ciara Power <ciara.power@intel.com>,
David Christensen <drc@linux.vnet.ibm.com>,
David Hunt <david.hunt@intel.com>,
Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>,
Dmitry Malloy <dmitrym@microsoft.com>,
Elena Agostini <eagostini@nvidia.com>,
Erik Gabriel Carrillo <erik.g.carrillo@intel.com>,
Fan Zhang <fanzhang.oss@gmail.com>, Ferruh Yigit <ferruh.yigit@amd.com>,
Harman Kalra <hkalra@marvell.com>,
Harry van Haaren <harry.van.haaren@intel.com>,
Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,
Jerin Jacob <jerinj@marvell.com>,
Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,
Matan Azrad <matan@nvidia.com>,
Maxime Coquelin <maxime.coquelin@redhat.com>,
Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>,
Nicolas Chautru <nicolas.chautru@intel.com>,
Olivier Matz <olivier.matz@6wind.com>, Ori Kam <orika@nvidia.com>,
Pallavi Kadam <pallavi.kadam@intel.com>,
Pavan Nikhilesh <pbhagavatula@marvell.com>,
Reshma Pattan <reshma.pattan@intel.com>,
Sameh Gobriel <sameh.gobriel@intel.com>,
Shijith Thotton <sthotton@marvell.com>,
Sivaprasad Tummala <sivaprasad.tummala@amd.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Suanming Mou <suanmingm@nvidia.com>, Sunil Kumar Kori <skori@marvell.com>,
Thomas Monjalon <thomas@monjalon.net>,
Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
Vladimir Medvedkin <vladimir.medvedkin@intel.com>,
Yipeng Wang <yipeng1.wang@intel.com>,
Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH 14/21] telemetry: use rte optional stdatomic API
Date: Mon, 16 Oct 2023 16:08:58 -0700
Message-Id: <1697497745-20664-15-git-send-email-roretzla@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1697497745-20664-1-git-send-email-roretzla@linux.microsoft.com>
References: <1697497745-20664-1-git-send-email-roretzla@linux.microsoft.com>
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Replace the use of gcc builtin __atomic_xxx intrinsics with
corresponding rte_atomic_xxx optional stdatomic API
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
lib/telemetry/telemetry.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index aeb078c..9298284 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -45,7 +45,7 @@ struct socket {
int sock;
char path[sizeof(((struct sockaddr_un *)0)->sun_path)];
handler fn;
- uint16_t *num_clients;
+ RTE_ATOMIC(uint16_t) *num_clients;
};
static struct socket v2_socket; /* socket for v2 telemetry */
static struct socket v1_socket; /* socket for v1 telemetry */
@@ -64,7 +64,7 @@ struct socket {
/* Used when accessing or modifying list of command callbacks */
static rte_spinlock_t callback_sl = RTE_SPINLOCK_INITIALIZER;
#ifndef RTE_EXEC_ENV_WINDOWS
-static uint16_t v2_clients;
+static RTE_ATOMIC(uint16_t) v2_clients;
#endif /* !RTE_EXEC_ENV_WINDOWS */
int
@@ -404,7 +404,7 @@ struct socket {
bytes = read(s, buffer, sizeof(buffer) - 1);
}
close(s);
- __atomic_fetch_sub(&v2_clients, 1, __ATOMIC_RELAXED);
+ rte_atomic_fetch_sub_explicit(&v2_clients, 1, rte_memory_order_relaxed);
return NULL;
}
@@ -421,14 +421,14 @@ struct socket {
return NULL;
}
if (s->num_clients != NULL) {
- uint16_t conns = __atomic_load_n(s->num_clients,
- __ATOMIC_RELAXED);
+ uint16_t conns = rte_atomic_load_explicit(s->num_clients,
+ rte_memory_order_relaxed);
if (conns >= MAX_CONNECTIONS) {
close(s_accepted);
continue;
}
- __atomic_fetch_add(s->num_clients, 1,
- __ATOMIC_RELAXED);
+ rte_atomic_fetch_add_explicit(s->num_clients, 1,
+ rte_memory_order_relaxed);
}
rc = pthread_create(&th, NULL, s->fn,
(void *)(uintptr_t)s_accepted);
@@ -437,8 +437,8 @@ struct socket {
strerror(rc));
close(s_accepted);
if (s->num_clients != NULL)
- __atomic_fetch_sub(s->num_clients, 1,
- __ATOMIC_RELAXED);
+ rte_atomic_fetch_sub_explicit(s->num_clients, 1,
+ rte_memory_order_relaxed);
continue;
}
pthread_detach(th);
--
1.8.3.1