From patchwork Thu May 28 23:14:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kadam, Pallavi" X-Patchwork-Id: 70688 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6ADAEA0350; Fri, 29 May 2020 01:15:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 176751DC05; Fri, 29 May 2020 01:15:40 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id DB8A01DB49 for ; Fri, 29 May 2020 01:15:34 +0200 (CEST) IronPort-SDR: pPbm9ckw+cSr3vYIOD8m0uaJ66EvjZcZU/dMIItAQ+JgNBI0HiKe6D28qCMG2pCq2lICObSluX U7A52bWiyIUA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2020 16:15:32 -0700 IronPort-SDR: cg0Yw5bQJGGVSYpLsIOXX0d6WErpo/E+FA2axtA6/B2ZgPesuKPmxKV5wKYMhAgz0xAFR5U3wg gjmDrmZ9Gsww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,446,1583222400"; d="scan'208";a="271022392" Received: from win-dpdk-pallavi.jf.intel.com (HELO localhost.localdomain) ([10.166.188.75]) by orsmga006.jf.intel.com with ESMTP; 28 May 2020 16:15:32 -0700 From: Pallavi Kadam To: dev@dpdk.org, thomas@monjalon.net Cc: ranjit.menon@intel.com, dmitry.kozliuk@gmail.com, Narcisa.Vasile@microsoft.com, tbashar@mellanox.com, Harini.Ramakrishnan@microsoft.com, pallavi.kadam@intel.com Date: Thu, 28 May 2020 16:14:54 -0700 Message-Id: <20200528231455.13636-2-pallavi.kadam@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20200528231455.13636-1-pallavi.kadam@intel.com> References: <20200514203945.1484-1-pallavi.kadam@intel.com> <20200528231455.13636-1-pallavi.kadam@intel.com> Subject: [dpdk-dev] [PATCH v3 1/2] eal: fix warnings on Windows 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" Fixed bunch of warnings when compiling using clang on Windows such as the use of an unsafe string function (strerror), [-Wunused-variable], [-Wunused-function] in eal_common_options.c [-Wunused-const-variable] in getopt.c and [-Wunused-parameter] in eal_common_thread.c. Also fixed warnings generated using Mingw: [-Werror=old-style-definition], [-Werror=cast-function-type] and [-Werror=attributes] Signed-off-by: Ranjit Menon Signed-off-by: Pallavi Kadam Tested-by: Pallavi Kadam --- lib/librte_eal/common/eal_common_options.c | 8 +++++++- lib/librte_eal/windows/eal.c | 2 +- lib/librte_eal/windows/eal_lcore.c | 2 +- lib/librte_eal/windows/eal_thread.c | 3 ++- lib/librte_eal/windows/getopt.c | 4 ++-- lib/librte_eal/windows/include/pthread.h | 6 ++++-- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index 8f2cbd1c6..0546beb3a 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -18,7 +18,9 @@ #endif #include #include +#ifndef RTE_EXEC_ENV_WINDOWS #include +#endif #include #include @@ -115,8 +117,10 @@ struct shared_driver { static struct shared_driver_list solib_list = TAILQ_HEAD_INITIALIZER(solib_list); +#ifndef RTE_EXEC_ENV_WINDOWS /* Default path of external loadable drivers */ static const char *default_solib_dir = RTE_EAL_PMD_PATH; +#endif /* * Stringified version of solib path used by dpdk-pmdinfo.py @@ -329,6 +333,7 @@ eal_plugin_add(const char *path) return 0; } +#ifndef RTE_EXEC_ENV_WINDOWS static int eal_plugindir_init(const char *path) { @@ -362,6 +367,7 @@ eal_plugindir_init(const char *path) /* XXX this ignores failures from readdir() itself */ return (dent == NULL) ? 0 : -1; } +#endif int eal_plugins_init(void) @@ -394,8 +400,8 @@ eal_plugins_init(void) } } - return 0; #endif + return 0; } /* diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c index d084606a6..a34e519ea 100644 --- a/lib/librte_eal/windows/eal.c +++ b/lib/librte_eal/windows/eal.c @@ -139,7 +139,7 @@ eal_log_level_parse(int argc, char **argv) } /* Parse the argument given in the command line of the application */ -__attribute__((optnone)) static int +static int eal_parse_args(int argc, char **argv) { int opt, ret; diff --git a/lib/librte_eal/windows/eal_lcore.c b/lib/librte_eal/windows/eal_lcore.c index 82ee45413..b36f0a83b 100644 --- a/lib/librte_eal/windows/eal_lcore.c +++ b/lib/librte_eal/windows/eal_lcore.c @@ -27,7 +27,7 @@ static struct _wcpu_map { * Create a map of all processors and associated cores on the system */ void -eal_create_cpu_map() +eal_create_cpu_map(void) { wcpu_map.total_procs = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS); diff --git a/lib/librte_eal/windows/eal_thread.c b/lib/librte_eal/windows/eal_thread.c index e149199a6..008df6a43 100644 --- a/lib/librte_eal/windows/eal_thread.c +++ b/lib/librte_eal/windows/eal_thread.c @@ -146,7 +146,8 @@ eal_thread_create(pthread_t *thread) { HANDLE th; - th = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)eal_thread_loop, + th = CreateThread(NULL, 0, + (LPTHREAD_START_ROUTINE)(ULONG_PTR)eal_thread_loop, NULL, 0, (LPDWORD)thread); if (!th) return -1; diff --git a/lib/librte_eal/windows/getopt.c b/lib/librte_eal/windows/getopt.c index 170c9b5e0..a08f7c109 100644 --- a/lib/librte_eal/windows/getopt.c +++ b/lib/librte_eal/windows/getopt.c @@ -25,8 +25,8 @@ int opterr = 1; /* if error message should be printed */ int optind = 1; /* index into parent argv vector */ int optopt = '?'; /* character checked for validity */ -static void pass(void) {} -#define warnx(a, ...) pass() +static void pass(const char *a) {(void) a; } +#define warnx(a, ...) pass(a) #define PRINT_ERROR ((opterr) && (*options != ':')) diff --git a/lib/librte_eal/windows/include/pthread.h b/lib/librte_eal/windows/include/pthread.h index 0bbed5c3b..e2274cf4e 100644 --- a/lib/librte_eal/windows/include/pthread.h +++ b/lib/librte_eal/windows/include/pthread.h @@ -45,7 +45,7 @@ typedef SYNCHRONIZATION_BARRIER pthread_barrier_t; #define pthread_getaffinity_np(thread, size, cpuset) \ eal_get_thread_affinity_mask(thread, (unsigned long *) cpuset) #define pthread_create(threadid, threadattr, threadfunc, args) \ - eal_create_thread(threadid, threadfunc, args) + eal_create_thread(threadid, threadattr, threadfunc, args) static inline int eal_set_thread_affinity_mask(pthread_t threadid, unsigned long *cpuset) @@ -70,8 +70,10 @@ eal_get_thread_affinity_mask(pthread_t threadid, unsigned long *cpuset) } static inline int -eal_create_thread(void *threadid, void *threadfunc, void *args) +eal_create_thread(void *threadid, const void *threadattr, void *threadfunc, + void *args) { + RTE_SET_USED(threadattr); HANDLE hThread; hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)threadfunc, args, 0, (LPDWORD)threadid);