From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9190343D5B; Thu, 28 Mar 2024 00:30:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B6E7B427DA; Thu, 28 Mar 2024 00:30:20 +0100 (CET) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mails.dpdk.org (Postfix) with ESMTP id 6AB04410DD for ; Thu, 28 Mar 2024 00:30:15 +0100 (CET) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6eac64f2205so377932b3a.2 for ; Wed, 27 Mar 2024 16:30:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1711582214; x=1712187014; 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=Ujp+cIa113EpqJ3VrSeEX0YvuuF9LLXucC0i8pzL9Vs=; b=b5IFi/+TWldXk4D6mu27gOrfXu1+OjX0jZksKycIzC0tkl8ExldwcvfCWsDKeT1M75 uLLc86HDAf3ibpAjhWjYsoQeb5pM++170tgePrQw6rcjjjYBxXVHC3YGGALG6b7SXF1G U/hVSiU/PfNIKmhyoxeDef/bsByNDvhbKSTSWcVKMxUI1j6wUPiGjKRor4hdLPRYr3kC S7j6M+oZ6NnifRrfwRZpgmQPK08gGmSzcA37UPRwAOuT++kjMkIUDUW+CYcaVTSTIo3E G/UG1dnEtBd1sN2bc37Ei8gAUO7Q8bMIp+YNTIJdlMaSMZe27sVsYn0ncDBi+j7jP96t u0eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711582214; x=1712187014; 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=Ujp+cIa113EpqJ3VrSeEX0YvuuF9LLXucC0i8pzL9Vs=; b=hO/EBBK1f/+sPr0WD8zf14XH3IAHIiW25D2gsqd8qap6pVADvFpbd3uRAZXRQmAFCC xG205TEwd350Zle71gtApOBgsZYmS/JCTa8xvjhZcC0JNfFcqJVhNf2HqiaQ5QLKroNq X0ISv3ze7sQrqXAeQB0av3LeNNio8OSWHMal/6a5aIN+fbH46uFbJU5ez0EGMsQ0F/Nq vvHW30X7wStps09ctbjGiXKvhrPIyMDvttZoC+VCCtFb+G3Zumqyxu9VPJmFWSH5ACL7 2m2/QbkuBRHcWyK0I1FXQwsQWC4oTviFGXHwyQdbCKUXjHx/VLlkSIO+b32/+f30kPSq DJsw== X-Gm-Message-State: AOJu0YwPNWXG3l9hbAD6O6W5i1GYy1/WMjazIRguK3K7ojR61SRa2r0s FNeSzmgOwY9gdl4aGW4PHg7OzUmTDvpI66Wke7GTUiU43tex0zTYKsWtY4AO4Y6nxY/3wvobllr a X-Google-Smtp-Source: AGHT+IHYvbwuKI2u5CuyajQJGdq94Li0Xo4zYyehl2+sIKzd54dmLeXbt23PdFdwuU9dWkoNGgoqKw== X-Received: by 2002:a05:6a21:3409:b0:1a5:6b2f:7b91 with SMTP id yn9-20020a056a21340900b001a56b2f7b91mr689739pzb.21.1711582214395; Wed, 27 Mar 2024 16:30:14 -0700 (PDT) Received: from hermes.local (204-195-123-203.wavecable.com. [204.195.123.203]) by smtp.gmail.com with ESMTPSA id n15-20020a170902e54f00b001e0fdc6e4ebsm80772plf.175.2024.03.27.16.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 16:30:13 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chenbo Xia , Nipun Gupta , Dmitry Kozlyuk , Tyler Retzlaff , Pallavi Kadam , David Marchand , Bruce Richardson , Ranjit Menon , Nick Connolly , Khoa To Subject: [PATCH v17 04/15] windows: common wrapper for vasprintf and asprintf Date: Wed, 27 Mar 2024 16:28:27 -0700 Message-ID: <20240327233001.83505-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240327233001.83505-1-stephen@networkplumber.org> References: <20200814173441.23086-1-stephen@networkplumber.org> <20240327233001.83505-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- 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 | 48 +++++++++++++++++++++++++++ 4 files changed, 48 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..65153fdb38 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 #include #include @@ -120,4 +121,51 @@ rte_localtime_r(const time_t *timer, struct tm *buf) } #define localtime_r(timer, buf) rte_localtime_r(timer, buf) +/* print to allocated string */ +__rte_format_printf(2, 0) +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) + +__rte_format_printf(2, 3) +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