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 C50CF43D5A;
Tue, 26 Mar 2024 18:36:32 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 7DE37410DD;
Tue, 26 Mar 2024 18:36:12 +0100 (CET)
Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com
[209.85.210.178])
by mails.dpdk.org (Postfix) with ESMTP id 6208940ED1
for <dev@dpdk.org>; Tue, 26 Mar 2024 18:36:07 +0100 (CET)
Received: by mail-pf1-f178.google.com with SMTP id
d2e1a72fcca58-6e6b54a28d0so3882893b3a.2
for <dev@dpdk.org>; Tue, 26 Mar 2024 10:36:07 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1711474566;
x=1712079366; darn=dpdk.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=uom440vD/tWZKWUEN3H8vvBYe66Gn+A06IpTPZTvcUc=;
b=OSr34YlQGtCYOZaX+KvUvCddgLCI5k3FaB8rE5niXGOZMM7nMhfdViPjXH3mr1Afst
xt5K33IQ1qBaZJX/gJ7NbNhfIDKMoa0Flv7i1ufE+cXMdQyxn0uQSQUkO1yVqtbubEt4
Oh0ZezQo3XaBuSXmYr+CDkB0uUej1/ugC4kWh8bNMO3WlststMfQAnkC7oLdq8HvZnub
AqZeAL7q9fevlPXUXkxa6AHZv7GZrjdMZmSezu/bsJniRkd9Lm7gA6FjpiDL8Loiddym
QemX4loqqkuUZ18IzAVMQxIcBr5hUP7tvTz7UaGS+dH6+raUTMtO+fD7gxvdFZT/IjIT
P5Qw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1711474566; x=1712079366;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=uom440vD/tWZKWUEN3H8vvBYe66Gn+A06IpTPZTvcUc=;
b=bcXSWZPxy9brYlyF1HbQc8YH6Vsn2Zs7vK4Tbw5SJR+z050Q5UheTMPBJ4AlgtLnVH
urQo5F1nZydirtbS+GOR0sAHHLlVhwOXpGa9vMK0WMoS0GxVztCJNo7WIaW6xfB3grWc
Rja0e0ULCDt4U4WW5htm2RWQCS26UJKq5b/r3C618/2z6iddyiFJCBE5kxHZ5xiAkTzL
mmTFvz0bwfJOj6R/HmEijudqXaSmncFsg/Esj1cYnLHI+k70I1PaQqhspOyZOioF60DQ
+xF2eKgU//HG794PkfTBqqCPdNzr5eL9g0XCEaBfjLTxjrNl4z7icd12VuxH7IctQMTX
93IQ==
X-Gm-Message-State: AOJu0YzU8rfEB5FJM/Yg7CH1UowIv9440aAnImmLR+uq72S8wkaRXKgk
cnYlqmSIfgScOG35JJpFtm/M5ONYK9MJBHFw3ydGFUmpjn1dCS0BqhmrQ6QBTMrUDEC/UZfTdQU
U
X-Google-Smtp-Source: AGHT+IHJsi4G529mIGWHdjEUPyvxf1x4uS3lBWoAtW9seoHhUFBTVBX9vZfgkco84i/zybzNsAXXRQ==
X-Received: by 2002:a05:6a20:2a18:b0:1a3:65af:9baa with SMTP id
e24-20020a056a202a1800b001a365af9baamr264678pzh.62.1711474566578;
Tue, 26 Mar 2024 10:36:06 -0700 (PDT)
Received: from hermes.local (204-195-123-203.wavecable.com. [204.195.123.203])
by smtp.gmail.com with ESMTPSA id
u6-20020aa78386000000b006e58da8bb6asm6205546pfm.132.2024.03.26.10.36.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 26 Mar 2024 10:36:06 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Chenbo Xia <chenbox@nvidia.com>, Nipun Gupta <nipun.gupta@amd.com>,
Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>,
Tyler Retzlaff <roretzla@linux.microsoft.com>,
Pallavi Kadam <pallavi.kadam@intel.com>,
David Marchand <david.marchand@redhat.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Nick Connolly <nick.connolly@mayadata.io>, Khoa To <khot@microsoft.com>,
Ranjit Menon <ranjit.menon@intel.com>
Subject: [PATCH v14 04/15] windows: common wrapper for vasprintf and asprintf
Date: Tue, 26 Mar 2024 10:34:24 -0700
Message-ID: <20240326173552.97249-5-stephen@networkplumber.org>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20240326173552.97249-1-stephen@networkplumber.org>
References: <20200814173441.23086-1-stephen@networkplumber.org>
<20240326173552.97249-1-stephen@networkplumber.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
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 windows version of asprintf() that was only usable
in eal. With a more generic one that supports both vasprintf()
and asprintf(). This also eliminates duplicate code.
Fixes: 8f4de2dba9b9 ("bus/pci: fill bus specific information")
Fixes: 9ec521006db0 ("eal/windows: hide asprintf shim")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/bus/pci/pci_common.c | 32 -------------------
lib/eal/common/eal_private.h | 10 ------
lib/eal/windows/eal.c | 28 ----------------
lib/eal/windows/include/rte_os_shim.h | 46 +++++++++++++++++++++++++++
4 files changed, 46 insertions(+), 70 deletions(-)
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 889a48d2af..80691c75a3 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -45,38 +45,6 @@ const char *rte_pci_get_sysfs_path(void)
return path;
}
-#ifdef RTE_EXEC_ENV_WINDOWS
-#define asprintf pci_asprintf
-
-static int
-__rte_format_printf(2, 3)
-pci_asprintf(char **buffer, const char *format, ...)
-{
- int size, ret;
- va_list arg;
-
- va_start(arg, format);
- size = vsnprintf(NULL, 0, format, arg);
- va_end(arg);
- if (size < 0)
- return -1;
- size++;
-
- *buffer = malloc(size);
- if (*buffer == NULL)
- return -1;
-
- va_start(arg, format);
- ret = vsnprintf(*buffer, size, format, arg);
- va_end(arg);
- if (ret != size - 1) {
- free(*buffer);
- return -1;
- }
- return ret;
-}
-#endif /* RTE_EXEC_ENV_WINDOWS */
-
static struct rte_devargs *
pci_devargs_lookup(const struct rte_pci_addr *pci_addr)
{
diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h
index 71523cfdb8..da8d77a134 100644
--- a/lib/eal/common/eal_private.h
+++ b/lib/eal/common/eal_private.h
@@ -737,16 +737,6 @@ void __rte_thread_init(unsigned int lcore_id, rte_cpuset_t *cpuset);
*/
void __rte_thread_uninit(void);
-/**
- * asprintf(3) replacement for Windows.
- */
-#ifdef RTE_EXEC_ENV_WINDOWS
-__rte_format_printf(2, 3)
-int eal_asprintf(char **buffer, const char *format, ...);
-
-#define asprintf(buffer, format, ...) \
- eal_asprintf(buffer, format, ##__VA_ARGS__)
-#endif
#define EAL_LOG(level, ...) \
RTE_LOG_LINE(level, EAL, "" __VA_ARGS__)
diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c
index 52f0e7462d..8ca00c0f95 100644
--- a/lib/eal/windows/eal.c
+++ b/lib/eal/windows/eal.c
@@ -503,34 +503,6 @@ rte_eal_init(int argc, char **argv)
return fctret;
}
-/* Don't use MinGW asprintf() to have identical code with all toolchains. */
-int
-eal_asprintf(char **buffer, const char *format, ...)
-{
- int size, ret;
- va_list arg;
-
- va_start(arg, format);
- size = vsnprintf(NULL, 0, format, arg);
- va_end(arg);
- if (size < 0)
- return -1;
- size++;
-
- *buffer = malloc(size);
- if (*buffer == NULL)
- return -1;
-
- va_start(arg, format);
- ret = vsnprintf(*buffer, size, format, arg);
- va_end(arg);
- if (ret != size - 1) {
- free(*buffer);
- return -1;
- }
- return ret;
-}
-
int
rte_vfio_container_dma_map(__rte_unused int container_fd,
__rte_unused uint64_t vaddr,
diff --git a/lib/eal/windows/include/rte_os_shim.h b/lib/eal/windows/include/rte_os_shim.h
index e9741a9df2..b941476fe0 100644
--- a/lib/eal/windows/include/rte_os_shim.h
+++ b/lib/eal/windows/include/rte_os_shim.h
@@ -3,6 +3,7 @@
#ifndef _RTE_OS_SHIM_
#define _RTE_OS_SHIM_
+#include <stdio.h>
#include <time.h>
#include <rte_os.h>
@@ -120,4 +121,49 @@ rte_localtime_r(const time_t *timer, struct tm *buf)
}
#define localtime_r(timer, buf) rte_localtime_r(timer, buf)
+/* print to allocated string */
+static inline int
+rte_vasprintf(char **strp, const char *fmt, va_list ap)
+{
+ char *str;
+ int len, ret;
+
+ *strp = NULL;
+
+ /* determine size of buffer needed */
+ len = _vscprintf(fmt, ap);
+ if (len < 0)
+ return -1;
+
+ len += 1; /* for nul termination */
+ str = malloc(len);
+ if (str == NULL)
+ return -1;
+
+ ret = vsnprintf(str, len, fmt, ap);
+ if (ret < 0) {
+ free(str);
+ return -1;
+ } else {
+ *strp = str;
+ return ret;
+ }
+}
+#define vasprintf(strp, fmt, ap) rte_vasprintf(strp, fmt, ap)
+
+static inline int
+rte_asprintf(char **strp, const char *fmt, ...)
+{
+ int ret;
+
+ va_list ap;
+
+ va_start(ap, fmt);
+ ret = rte_vasprintf(strp, fmt, ap);
+ va_end(ap);
+
+ return ret;
+}
+
+#define asprintf(strp, fmt, ...) rte_asprintf(strp, fmt, __VA_ARGS__)
#endif /* _RTE_OS_SHIM_ */
--
2.43.0