From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 301BFA0598; Fri, 10 Apr 2020 18:44:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 360F21D608; Fri, 10 Apr 2020 18:43:57 +0200 (CEST) Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by dpdk.org (Postfix) with ESMTP id E860A1D5C4 for ; Fri, 10 Apr 2020 18:43:54 +0200 (CEST) Received: by mail-lf1-f49.google.com with SMTP id l11so1757661lfc.5 for ; Fri, 10 Apr 2020 09:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FM3gEU8MnpUPb5NbZInoh9N+C2gm7mARsTrMd87uB+k=; b=nQnSNWlRuWXnfzDut1GwmU5nZCxXS1yHxBl2bXQLWNancZ19DkLwoJv1mfgX0Mvhh1 AMaCbEBN6X0kydFPqn220ftYimOBecq6H2eKVEHgg3fpWoYAxzZK49nL4zxPkoWSLxdg r5/gAz5sY3b7vPuRV9nTVsvbFs3Le/VRtgYKdJAVVhxXpkyG4MJaAdFUtgOLW9285cq6 vbzms0v1NOUcWGn7llmfYhrX1VNDoN+ksxIg3EZI5cP01xT9+YsatKGpV9ZMIp2qdVuN BcIY1KVT5vYHKDYyS6+Ie4jPLoeHADe60RuyYdCkeVvdWDdFxv7oXmjEHrPbaOnwqLa3 Fa1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FM3gEU8MnpUPb5NbZInoh9N+C2gm7mARsTrMd87uB+k=; b=diPXxHXRCHXpASmFvOx6YYpv7G8MyS6rfSR+ODxpgB6Yq2YL3cd0THxEbiyZDvTgwe 4iSYep3dTwcCe9p5kzTlk8/7ySOPxA1MryUN80OwBemsg0AZmUdOMYZHZZmfEoy3Z8Js G9SAVQp3w8NpVraENoW63TcO4kTziP2/MDd0+FUGbimxbpG8+iQEe2zcfph713VUUjbu M0tFJEJD89K+CEYGsteqJ/DwXEubw1/SoMgt5/NqEuU6w5jYAfJEwti3H6ZucMML4g+l 7IaZWPBnlfrG8xLjTDv1Q8SiQzE5pKz1ATePmxg0uEuBUhMUA95ebAmblRy9WFsuT17+ Aiew== X-Gm-Message-State: AGi0PuY1vnGOliPSMlhnIKT7R9xXUvXgMctYTow5bayX2ynN/J5yzw4C 1pnnJWxU1raTnICnvNO5QVjwNNj/6PpHCw== X-Google-Smtp-Source: APiQypJTRn5CQcNqvno4Vsk1jtNKONRDQdYY1A4YTLXRfb2o3SzuvJXXysPHdRgQ8Zp5Wsgmm/zznA== X-Received: by 2002:ac2:47f0:: with SMTP id b16mr3162129lfp.81.1586537033969; Fri, 10 Apr 2020 09:43:53 -0700 (PDT) Received: from localhost.localdomain (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.googlemail.com with ESMTPSA id d21sm1343075ljc.49.2020.04.10.09.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2020 09:43:53 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: "Dmitry Malloy (MESHCHANINOV)" , Narcisa Ana Maria Vasile , Fady Bader , Tal Shnaiderman , Dmitry Kozlyuk , Harini Ramakrishnan , Omar Cardona , Pallavi Kadam , Ranjit Menon , Anand Rawat , Thomas Monjalon Date: Fri, 10 Apr 2020 19:43:34 +0300 Message-Id: <20200410164342.1194634-3-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200410164342.1194634-1-dmitry.kozliuk@gmail.com> References: <20200330041026.784624-1-dmitry.kozliuk@gmail.com> <20200410164342.1194634-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 02/10] eal/windows: do not expose private EAL facilities X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The goal of rte_os.h is to mitigate OS differences for EAL users. In Windows EAL, rte_os.h did excessive things: 1. It included platform SDK headers (windows.h, etc). Those files are huge, require specific inclusion order, and are generally unused by the code including rte_os.h. Declarations from platform SDK may break otherwise platform-independent code, e.g. min, max, ERROR. 2. It included pthread.h, which is clearly not always required. 3. It defined functions private to Windows EAL. Reorganize Windows EAL includes in the following way: 1. Create rte_windows.h to properly import Windows-specific facilities. Primary users are bus drivers, tests, and external applications. 2. Remove platform SDK includes from rte_os.h to prevent breaking otherwise portable code by including rte_os.h on Windows. Copy necessary definitions to avoid including those headers. 3. Remove pthread.h include from rte_os.h. 4. Move declarations private to Windows EAL into eal_windows.h. Fixes: 428eb983f5f7 ("eal: add OS specific header file") Signed-off-by: Dmitry Kozlyuk --- lib/librte_eal/windows/eal.c | 2 + lib/librte_eal/windows/eal_lcore.c | 2 + lib/librte_eal/windows/eal_thread.c | 1 + lib/librte_eal/windows/eal_windows.h | 29 +++++++++++++ lib/librte_eal/windows/include/meson.build | 1 + lib/librte_eal/windows/include/pthread.h | 2 + lib/librte_eal/windows/include/rte_os.h | 44 ++++++-------------- lib/librte_eal/windows/include/rte_windows.h | 41 ++++++++++++++++++ 8 files changed, 91 insertions(+), 31 deletions(-) create mode 100644 lib/librte_eal/windows/eal_windows.h create mode 100644 lib/librte_eal/windows/include/rte_windows.h diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c index e4b50df3b..2cf7a04ef 100644 --- a/lib/librte_eal/windows/eal.c +++ b/lib/librte_eal/windows/eal.c @@ -18,6 +18,8 @@ #include #include +#include "eal_windows.h" + /* Allow the application to print its usage message too if set */ static rte_usage_hook_t rte_application_usage_hook; diff --git a/lib/librte_eal/windows/eal_lcore.c b/lib/librte_eal/windows/eal_lcore.c index b3a6c63af..82ee45413 100644 --- a/lib/librte_eal/windows/eal_lcore.c +++ b/lib/librte_eal/windows/eal_lcore.c @@ -2,12 +2,14 @@ * Copyright(c) 2019 Intel Corporation */ +#include #include #include #include "eal_private.h" #include "eal_thread.h" +#include "eal_windows.h" /* global data structure that contains the CPU map */ static struct _wcpu_map { diff --git a/lib/librte_eal/windows/eal_thread.c b/lib/librte_eal/windows/eal_thread.c index 9e4bbaa08..e149199a6 100644 --- a/lib/librte_eal/windows/eal_thread.c +++ b/lib/librte_eal/windows/eal_thread.c @@ -14,6 +14,7 @@ #include #include "eal_private.h" +#include "eal_windows.h" RTE_DEFINE_PER_LCORE(unsigned int, _lcore_id) = LCORE_ID_ANY; RTE_DEFINE_PER_LCORE(unsigned int, _socket_id) = (unsigned int)SOCKET_ID_ANY; diff --git a/lib/librte_eal/windows/eal_windows.h b/lib/librte_eal/windows/eal_windows.h new file mode 100644 index 000000000..fadd676b2 --- /dev/null +++ b/lib/librte_eal/windows/eal_windows.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2020 Dmitry Kozlyuk + */ + +#ifndef _EAL_WINDOWS_H_ +#define _EAL_WINDOWS_H_ + +/** + * @file Facilities private to Windows EAL + */ + +#include + +/** + * Create a map of processors and cores on the system. + */ +void eal_create_cpu_map(void); + +/** + * Create a thread. + * + * @param thread + * The location to store the thread id if successful. + * @return + * 0 for success, -1 if the thread is not created. + */ +int eal_thread_create(pthread_t *thread); + +#endif /* _EAL_WINDOWS_H_ */ diff --git a/lib/librte_eal/windows/include/meson.build b/lib/librte_eal/windows/include/meson.build index 7d18dd52f..5fb1962ac 100644 --- a/lib/librte_eal/windows/include/meson.build +++ b/lib/librte_eal/windows/include/meson.build @@ -5,4 +5,5 @@ includes += include_directories('.') headers += files( 'rte_os.h', + 'rte_windows.h', ) diff --git a/lib/librte_eal/windows/include/pthread.h b/lib/librte_eal/windows/include/pthread.h index b9dd18e56..cfd53f0b8 100644 --- a/lib/librte_eal/windows/include/pthread.h +++ b/lib/librte_eal/windows/include/pthread.h @@ -5,6 +5,8 @@ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ +#include + /** * This file is required to support the common code in eal_common_proc.c, * eal_common_thread.c and common\include\rte_per_lcore.h as Microsoft libc diff --git a/lib/librte_eal/windows/include/rte_os.h b/lib/librte_eal/windows/include/rte_os.h index e1e0378e6..510e39e03 100644 --- a/lib/librte_eal/windows/include/rte_os.h +++ b/lib/librte_eal/windows/include/rte_os.h @@ -8,20 +8,18 @@ /** * This is header should contain any function/macro definition * which are not supported natively or named differently in the - * Windows OS. Functions will be added in future releases. + * Windows OS. It must not include Windows-specific headers. */ +#include +#include +#include + #ifdef __cplusplus extern "C" { #endif -#include -#include -#include -#include - -/* limits.h replacement */ -#include +/* limits.h replacement, value as in */ #ifndef PATH_MAX #define PATH_MAX _MAX_PATH #endif @@ -31,8 +29,6 @@ extern "C" { /* strdup is deprecated in Microsoft libc and _strdup is preferred */ #define strdup(str) _strdup(str) -typedef SSIZE_T ssize_t; - #define strtok_r(str, delim, saveptr) strtok_s(str, delim, saveptr) #define index(a, b) strchr(a, b) @@ -40,22 +36,14 @@ typedef SSIZE_T ssize_t; #define strncasecmp(s1, s2, count) _strnicmp(s1, s2, count) -/** - * Create a thread. - * This function is private to EAL. - * - * @param thread - * The location to store the thread id if successful. - * @return - * 0 for success, -1 if the thread is not created. - */ -int eal_thread_create(pthread_t *thread); +/* cpu_set macros implementation */ +#define RTE_CPU_AND(dst, src1, src2) CPU_AND(dst, src1, src2) +#define RTE_CPU_OR(dst, src1, src2) CPU_OR(dst, src1, src2) +#define RTE_CPU_FILL(set) CPU_FILL(set) +#define RTE_CPU_NOT(dst, src) CPU_NOT(dst, src) -/** - * Create a map of processors and cores on the system. - * This function is private to EAL. - */ -void eal_create_cpu_map(void); +/* as in */ +typedef long long ssize_t; #ifndef RTE_TOOLCHAIN_GCC static inline int @@ -86,12 +74,6 @@ asprintf(char **buffer, const char *format, ...) } #endif /* RTE_TOOLCHAIN_GCC */ -/* cpu_set macros implementation */ -#define RTE_CPU_AND(dst, src1, src2) CPU_AND(dst, src1, src2) -#define RTE_CPU_OR(dst, src1, src2) CPU_OR(dst, src1, src2) -#define RTE_CPU_FILL(set) CPU_FILL(set) -#define RTE_CPU_NOT(dst, src) CPU_NOT(dst, src) - #ifdef __cplusplus } #endif diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/librte_eal/windows/include/rte_windows.h new file mode 100644 index 000000000..ed6e4c148 --- /dev/null +++ b/lib/librte_eal/windows/include/rte_windows.h @@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2020 Dmitry Kozlyuk + */ + +#ifndef _RTE_WINDOWS_H_ +#define _RTE_WINDOWS_H_ + +/** + * @file Windows-specific facilities + * + * This file should be included by DPDK libraries and applications + * that need access to Windows API. It includes platform SDK headers + * in compatible order with proper options and defines error-handling macros. + */ + +/* Disable excessive libraries. */ +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif + +/* Must come first. */ +#include + +#include +#include + +/* Have GUIDs defined. */ +#ifndef INITGUID +#define INITGUID +#endif +#include + +/** + * Log GetLastError() with context, usually a Win32 API function and arguments. + */ +#define RTE_LOG_WIN32_ERR(...) \ + RTE_LOG(DEBUG, EAL, RTE_FMT("GetLastError()=%lu: " \ + RTE_FMT_HEAD(__VA_ARGS__,) "\n", GetLastError(), \ + RTE_FMT_TAIL(__VA_ARGS__,))) + +#endif /* _RTE_WINDOWS_H_ */ -- 2.25.1