Windows patchset with additional EAL functionalities
PATCH v6 10/10 eal: add minimum viable code to support parsing
In reply to Pallavi KadamAdding specific logic for eal.c to support parsing on Windows.
--- lib/librte_eal/windows/eal/eal.c | 133 ++++++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 3 deletions(-)
lib/librte_eal/windows/eal/eal.c +130 -3
@@ -16,6 +16,9 @@#include <eal_options.h> #include <eal_private.h> +/* Allow the application to print its usage message too if set */ +static rte_usage_hook_t rte_application_usage_hook; +/* define fd variable here, because file needs to be kept open for the * duration of the program, as we hold a write lock on it in the primary proc */
@@ -74,6 +77,124 @@ eal_proc_type_detect(void)return ptype; } +/* display usage */ +static void +eal_usage (const char *prgname) +{ +printf ("\nUsage: %s " , prgname); +eal_common_usage (); +/* Allow the application to print its usage message too +*if hook is set +*/ +if (rte_application_usage_hook) { +printf ("===== Application Usage =====\n\n" ); +rte_application_usage_hook (prgname); + } +} + +/* Parse the arguments for --log-level only */ +static void +eal_log_level_parse (int argc,char **argv) +{ +int opt; +char **argvopt; +int option_index; + + argvopt = argv; + +eal_reset_internal_config (&internal_config); + +while ((opt =getopt_long (argc, argvopt, eal_short_options, + eal_long_options, &option_index)) !=EOF ) { + +int ret; + +/* getopt is not happy, stop right now */ +if (opt =='?' ) +break ; + + ret = (opt ==OPT_LOG_LEVEL_NUM ) ? +eal_parse_common_option (opt, optarg, + &internal_config) :0 ; + +/* common parser is not happy */ +if (ret <0 ) +break ; + } + + optind =0 ;/* reset getopt lib */ +} + +/* Parse the argument given in the command line of the application */ +__attribute__((optnone))static int +eal_parse_args (int argc,char **argv) +{ +int opt, ret; +char **argvopt; +int option_index; +char *prgname = argv[0 ]; + + argvopt = argv; + +while ((opt =getopt_long (argc, argvopt, eal_short_options, + eal_long_options, &option_index)) !=EOF ) { + +int ret; + +/* getopt is not happy, stop right now */ +if (opt =='?' ) { +eal_usage (prgname); +return -1 ; + } + + ret =eal_parse_common_option (opt, optarg, &internal_config); +/* common parser is not happy */ +if (ret <0 ) { +eal_usage (prgname); +return -1 ; + } +/* common parser handled this option */ +if (ret ==0 ) +continue ; + +switch (opt) { +case 'h' : +eal_usage (prgname); +exit (EXIT_SUCCESS ); +default : +if (opt <OPT_LONG_MIN_NUM &&isprint (opt)) { +RTE_LOG (ERR ,EAL ,"Option %c is not supported " +"on Windows\n" , opt); + }else if (opt >=OPT_LONG_MIN_NUM && + opt <OPT_LONG_MAX_NUM ) { +RTE_LOG (ERR ,EAL ,"Option %s is not supported " +"on Windows\n" , + eal_long_options[option_index].name); + }else { +RTE_LOG (ERR ,EAL ,"Option %d is not supported " +"on Windows\n" , opt); + } +eal_usage (prgname); +return -1 ; + } + } + +if (eal_adjust_config (&internal_config) !=0 ) +return -1 ; + +/* sanity checks */ +if (eal_check_common_options (&internal_config) !=0 ) { +eal_usage (prgname); +return -1 ; + } + +if (optind >=0 ) + argv[optind -1 ] = prgname; + ret = optind -1 ; + optind =0 ;/* reset getopt lib */ +return ret; +} +static int sync_func(void *arg __rte_unused) {
@@ -89,9 +210,11 @@ rte_eal_init_alert(const char *msg)/* Launch threads, called at application init(). */ int -rte_eal_init(int argc __rte_unused, char **argv __rte_unused) +rte_eal_init (int argc,char **argv) { -int i; +int i, fctret; + +eal_log_level_parse (argc, argv);/* create a map of all processors in the system */ eal_create_cpu_map ();
@@ -102,6 +225,10 @@ rte_eal_init(int argc __rte_unused, char **argv __rte_unused)return -1 ; } + fctret =eal_parse_args (argc, argv); +if (fctret <0 ) +exit (1 ); +eal_thread_init_master (rte_config.master_lcore);RTE_LCORE_FOREACH_SLAVE (i) {
@@ -130,5 +257,5 @@ rte_eal_init(int argc __rte_unused, char **argv __rte_unused)*/ rte_eal_mp_remote_launch (sync_func,NULL ,SKIP_MASTER );rte_eal_mp_wait_lcore (); -return 0 ; +return fctret; }
Signature · 1 line
2.18.0.windows.1
v7 cover Windows patchset with additional EAL functionalities
In reply to Pallavi KadamThis patchset includes additional functionalities for Windows EAL to support command-line parsing feature and some EAL common code on Windows.
This patchset can be applied to windpdk-next-dev branch in the draft repo.
v7 changes:
Removed Windows "eal_filesystem.h" for now and will be added later if required. Currently, Windows EAL uses common version of eal_filesystem.h.
v6 changes:
Removed sysfs function as it was not required on Windows. Removed syslog and dlfcn support for Windows.
v5 changes:
Fixed indentation in patch 6.
v4 changes:
Modified license/exceptions.txt file.
The following files in this patch-set require license exceptions as listed:
dirent.h MIT license
getopt.h BSD-2-Clause license
getopt.c ISC and BSD-2-Clause license
Removed syslog file in Windows and added ifndef Windows around syslog classification parameters in the common code.
v3 Changes:
Modified generic rte_vect to add Windows support. Moved RTE_CPU* definitions to OS specific file. Added SPDX tag on top of third party files.
v2 Changes:
syslog.h: Replaced the BSD license boilerplate to SPDX tag.
Pallavi Kadam (9):
license: add license exception for windows
eal: dirent.h implementation for windows
eal: add additional function overrides in windows header files
eal: getopt implementation for windows
eal: add function to detect process type
eal: include SSE4 support for windows
eal: remove syslog and dlfcn support for windows
build: add additional common files support
eal: add minimum viable code to support parsing
lib/librte_eal/common/eal_common_options.c | 12 + .../common/include/arch/x86/rte_vect.h | 4 +- lib/librte_eal/windows/eal/eal.c | 194 ++++- lib/librte_eal/windows/eal/eal_debug.c | 1 + lib/librte_eal/windows/eal/eal_lcore.c | 3 + lib/librte_eal/windows/eal/eal_thread.c | 11 + lib/librte_eal/windows/eal/getopt.c | 465 ++++++++++++ lib/librte_eal/windows/eal/include/dirent.h | 664 ++++++++++++++++++ lib/librte_eal/windows/eal/include/getopt.h | 127 ++++ lib/librte_eal/windows/eal/include/pthread.h | 66 ++ lib/librte_eal/windows/eal/include/rte_os.h | 40 ++ lib/librte_eal/windows/eal/include/sched.h | 46 ++ .../windows/eal/include/sys/queue.h | 8 + lib/librte_eal/windows/eal/meson.build | 9 +- license/exceptions.txt | 12 +- 15 files changed, 1651 insertions(+), 11 deletions(-) create mode 100644 lib/librte_eal/windows/eal/getopt.c create mode 100644 lib/librte_eal/windows/eal/include/dirent.h create mode 100644 lib/librte_eal/windows/eal/include/getopt.h
Signature · 1 line
2.18.0.windows.1
PATCH v7 1/9 license: add license exception for windows
The Governing Board and Tech Board have provided exceptions for MIT and BSD-2-Clause license files for DPDK support on Windows.
--- license/exceptions.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
license/exceptions.txt +7 -5
@@ -9,9 +9,11 @@ Note that following licenses are not exceptions:- - Dual BSD-3-Clause OR LGPL-2.1 - GPL-2.0 (*Only for kernel code*) ------------------------------------------------------------------ +--------------------------------------------------------------------------------------------------- SPDX Identifier TB Approval Date GB Approval Date File name ------------------------------------------------------------------ -1. - ------------------------------------------------------------------ +--------------------------------------------------------------------------------------------------- +1.MIT 11/12/2019 11/12/2019 lib/librte_eal/windows/eal/include/dirent.h +2.BSD-2-Clause 01/08/2020 01/08/2020 lib/librte_eal/windows/eal/include/getopt.h +3.ISC AND + BSD-2-Clause 01/08/2020 01/08/2020 lib/librte_eal/windows/eal/getopt.c +---------------------------------------------------------------------------------------------------
Signature · 1 line
2.18.0.windows.1
PATCH v7 2/9 eal: dirent.h implementation for windows
In reply to Pallavi KadamAdding dirent.h on Windows to support common code. eal_common_options.c includes this file.
The original contribution is under MIT license.
https://github.com/tronkko/dirent
--- lib/librte_eal/windows/eal/include/dirent.h | 664 ++++++++++++++++++++ 1 file changed, 664 insertions(+) create mode 100644 lib/librte_eal/windows/eal/include/dirent.h
lib/librte_eal/windows/eal/include/dirent.h new file +664 -0
@@ -0,0 +1,664 @@ +/* SPDX-License-Identifier: MIT +* Dirent interface for Microsoft Visual Studio +* Version 1.21 +* Copyright (C) 2006-2012 Toni Ronkko +* https://github.com/tronkko/dirent +*/ + +#ifndef DIRENT_H +#define DIRENT_H + +/* +* Include windows.h without Windows Sockets 1.1 to prevent conflicts with +* Windows Sockets 2.0. +*/ +#ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif + +#include <windows.h> + +#include <stdio.h> +#include <stdarg.h> +#include <wchar.h> +#include <string.h> +#include <stdlib.h> +#include <malloc.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <errno.h> + +/* Maximum length of file name */ +#if !defined(PATH_MAX ) +# define PATH_MAX MAX_PATH +#endif + +/* File type flags for d_type */ +#define DT_UNKNOWN 0 +#define DT_REG S_IFREG +#define DT_DIR S_IFDIR +#define DT_CHR S_IFCHR + +/* +* File type macros. Note that block devices, sockets and links cannot be +* distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are +* only defined for compatibility. These macros should always return false +* on Windows. +*/ +#if !defined(S_ISDIR ) +# define S_ISDIR (mode) (((mode) & S_IFMT) == S_IFDIR) +#endif +#if !defined(S_ISREG ) +# define S_ISREG (mode) (((mode) & S_IFMT) == S_IFREG) +#endif + +/* Wide-character version */ +struct _wdirent { +/* Always zero */ +long d_ino; + +/* Structure size */ +unsigned short d_reclen; + +/* Length of name without \0 */ +size_t d_namlen; + +/* File type */ +int d_type; + +/* File name */ +wchar_t d_name[PATH_MAX ]; +}; +typedef struct _wdirent _wdirent ; + +struct _WDIR { +/* Current directory entry */ +struct _wdirent ent; + +/* Private file data */ +WIN32_FIND_DATAW data; + +/* True if data is valid */ +int cached; + +/* Win32 search handle */ +HANDLE handle; + +/* Initial directory name */ +wchar_t *patt; +}; +typedef struct _WDIR _WDIR ; + +static _WDIR *_wopendir (const wchar_t *dirname); +static int _wclosedir (_WDIR *dirp); + +/* For compatibility with Symbian */ +#define wdirent _wdirent +#define WDIR _WDIR +#define wopendir _wopendir +#define wclosedir _wclosedir + +/* Multi-byte character versions */ +struct dirent { +/* Always zero */ +long d_ino; + +/* Structure size */ +unsigned short d_reclen; + +/* Length of name without \0 */ +size_t d_namlen; + +/* File type */ +int d_type; + +/* File name */ +char d_name[PATH_MAX ]; +}; +typedef struct dirent dirent ; + +struct DIR { +struct dirent ent; +struct _WDIR *wdirp; +}; +typedef struct DIR DIR ; + +static DIR *opendir (const char *dirname); +static struct dirent *readdir (DIR *dirp); +static int closedir (DIR *dirp); + +/* Internal utility functions */ +static WIN32_FIND_DATAW *dirent_first (_WDIR *dirp); +static WIN32_FIND_DATAW *dirent_next (_WDIR *dirp); + +static int dirent_mbstowcs_s ( +size_t *pReturnValue, +wchar_t *wcstr, +size_t sizeInWords, +const char *mbstr, +size_t count); + +static int dirent_wcstombs_s ( +size_t *pReturnValue, +char *mbstr, +size_t sizeInBytes, +const wchar_t *wcstr, +size_t count); + +static void dirent_set_errno (int error); + +/* +* Open directory stream DIRNAME for read and return a pointer to the +* internal working area that is used to retrieve individual directory +* entries. +*/ +static _WDIR * +_wopendir (const wchar_t *dirname) +{ +_WDIR *dirp =NULL ; +int error; + +/* Must have directory name */ +if (dirname ==NULL || dirname[0 ] =='\0' ) { +dirent_set_errno (ENOENT ); +return NULL ; + } + +/* Allocate new _WDIR structure */ + dirp = (_WDIR *)malloc (sizeof (struct _WDIR )); +if (dirp !=NULL ) { +DWORD n; + +/* Reset _WDIR structure */ + dirp->handle =INVALID_HANDLE_VALUE ; + dirp->patt =NULL ; + dirp->cached =0 ; + +/* Compute the length of full path plus zero terminator +* +* Note that on WinRT there's no way to convert relative paths +* into absolute paths, so just assume its an absolute path. +*/ +#if defined(WINAPI_FAMILY ) && (WINAPI_FAMILY ==WINAPI_FAMILY_PHONE_APP ) + n =wcslen (dirname); +#else + n =GetFullPathNameW (dirname,0 ,NULL ,NULL ); +#endif + +/* Allocate room for absolute directory name and search +* pattern +*/ + dirp->patt = (wchar_t *)malloc (sizeof (wchar_t) * n +16 ); +if (dirp->patt) { +/* Convert relative directory name to an +* absolute one. This allows rewinddir() to +* function correctly even when current working +* directory is changed between opendir() +* and rewinddir(). +* +* Note that on WinRT there's no way to convert +* relative paths into absolute paths, so just +* assume its an absolute path. +*/ +#if defined(WINAPI_FAMILY ) && \ + (WINAPI_FAMILY ==WINAPI_FAMILY_PHONE_APP ) +wcsncpy_s (dirp->patt, n +1 , dirname, n); +#else + n =GetFullPathNameW (dirname, n, dirp->patt,NULL ); +#endif +if (n >0 ) { +wchar_t *p; + +/* Append search pattern \* to the directory +* name +*/ + p = dirp->patt + n; +if (dirp->patt < p) { +switch (p[-1 ]) { +case '\\' : +case '/' : +case ':' : +/* Directory ends in path separator, +* e.g.c:\temp\ +*/ +/*NOP*/ ; +break ; + +default : +/* Directory name doesn't end in path +* separator +*/ + *p++ ='\\' ; + } + } + *p++ ='*' ; + *p ='\0' ; + +/* Open directory stream and retrieve the first +* entry +*/ +if (dirent_first (dirp)) { +/* Directory stream opened successfully */ + error =0 ; + }else { +/* Cannot retrieve first entry */ + error =1 ; +dirent_set_errno (ENOENT ); + } + + }else { +/* Cannot retrieve full path name */ +dirent_set_errno (ENOENT ); + error =1 ; + } + + }else { +/* Cannot allocate memory for search pattern */ + error =1 ; + } + + }else { +/* Cannot allocate _WDIR structure */ + error =1 ; + } + +/* Clean up in case of error */ +if (error && dirp) { +_wclosedir (dirp); + dirp =NULL ; + } + +return dirp; +} + +/* +* Close directory stream opened by opendir() function. +* This invalidates the DIR structure as well as any directory +* entry read previously by _wreaddir(). +*/ +static int +_wclosedir (_WDIR *dirp) +{ +int ok; +if (dirp) { + +/* Release search handle */ +if (dirp->handle !=INVALID_HANDLE_VALUE ) { +FindClose (dirp->handle); + dirp->handle =INVALID_HANDLE_VALUE ; + } + +/* Release search pattern */ +if (dirp->patt) { +free (dirp->patt); + dirp->patt =NULL ; + } + +/* Release directory structure */ +free (dirp); + ok =/*success*/ 0 ; + + }else { +/* Invalid directory stream */ +dirent_set_errno (EBADF ); + ok =/*failure*/ -1 ; + } +return ok; +} + +/* Get first directory entry (internal) */ +static WIN32_FIND_DATAW * +dirent_first (_WDIR *dirp) +{ +WIN32_FIND_DATAW *datap; + +/* Open directory and retrieve the first entry */ + dirp->handle =FindFirstFileExW ( + dirp->patt, FindExInfoStandard, &dirp->data, + FindExSearchNameMatch,NULL ,0 ); +if (dirp->handle !=INVALID_HANDLE_VALUE ) { + +/* a directory entry is now waiting in memory */ + datap = &dirp->data; + dirp->cached =1 ; + + }else { + +/* Failed to re-open directory: no directory entry in memory */ + dirp->cached =0 ; + datap =NULL ; + + } +return datap; +} + +/* Get next directory entry (internal) */ +static WIN32_FIND_DATAW * +dirent_next (_WDIR *dirp) +{ +WIN32_FIND_DATAW *p; + +/* Get next directory entry */ +if (dirp->cached !=0 ) { + +/* A valid directory entry already in memory */ + p = &dirp->data; + dirp->cached =0 ; + + }else if (dirp->handle !=INVALID_HANDLE_VALUE ) { + +/* Get the next directory entry from stream */ +if (FindNextFileW (dirp->handle, &dirp->data) != FALSE) { +/* Got a file */ + p = &dirp->data; + }else { +/* The very last entry has been processed +*or an error occurred +*/ +FindClose (dirp->handle); + dirp->handle =INVALID_HANDLE_VALUE ; + p =NULL ; + } + + }else { + +/* End of directory stream reached */ + p =NULL ; + + } + +return p; +} + +/* +* Open directory stream using plain old C-string. +*/ +static DIR * +opendir (const char *dirname) +{ +struct DIR *dirp; +int error; + +/* Must have directory name */ +if (dirname ==NULL || dirname[0 ] =='\0' ) { +dirent_set_errno (ENOENT ); +return NULL ; + } + +/* Allocate memory for DIR structure */ + dirp = (DIR *)malloc (sizeof (struct DIR )); +if (dirp) { +wchar_t wname[PATH_MAX ]; +size_t n; + +/* Convert directory name to wide-character string */ + error =dirent_mbstowcs_s (&n, wname,PATH_MAX , + dirname,PATH_MAX ); +if (!error) { + +/* Open directory stream using wide-character name */ + dirp->wdirp =_wopendir (wname); +if (dirp->wdirp) { +/* Directory stream opened */ + error =0 ; + }else { +/* Failed to open directory stream */ + error =1 ; + } + + }else { +/* +* Cannot convert file name to wide-character string. +* This occurs if the string contains invalid multi-byte +* sequences or the output buffer is too small to +* contain the resulting string. +*/ + error =1 ; + } + + }else { +/* Cannot allocate DIR structure */ + error =1 ; + } + +/* Clean up in case of error */ +if (error && dirp) { +free (dirp); + dirp =NULL ; + } + +return dirp; +} + +/* +* Read next directory entry. +* +* When working with text consoles, please note that file names +* returned by readdir() are represented in the default ANSI code +* page while any output toconsole is typically formatted on another +* code page. Thus, non-ASCII characters in file names will not usually +* display correctly on console. The problem can be fixed in two ways: +* (1) change the character set of console to 1252 using chcp utility +* and use Lucida Console font, or (2) use _cprintf function when +* writing to console. The _cprinf() will re-encode ANSI strings to the +* console code page so many non-ASCII characters will display correcly. +*/ +static struct dirent * +readdir (DIR *dirp) +{ +WIN32_FIND_DATAW *datap; +struct dirent *entp; + +/* Read next directory entry */ + datap =dirent_next (dirp->wdirp); +if (datap) { +size_t n; +int error; + +/* Attempt to convert file name to multi-byte string */ + error =dirent_wcstombs_s (&n, dirp->ent.d_name, +PATH_MAX , datap->cFileName,PATH_MAX ); + +/* +* If the file name cannot be represented by a multi-byte +* string, then attempt to use old 8+3 file name. +* This allows traditional Unix-code to access some file +* names despite of unicode characters, although file names +* may seem unfamiliar to the user. +* +* Be ware that the code below cannot come up with a short +* file name unless the file system provides one. At least +* VirtualBox shared folders fail to do this. +*/ +if (error && datap->cAlternateFileName[0 ] !='\0' ) { + error =dirent_wcstombs_s ( + &n, dirp->ent.d_name,PATH_MAX , + datap->cAlternateFileName,PATH_MAX ); + } + +if (!error) { +DWORD attr; + +/* Initialize directory entry for return */ + entp = &dirp->ent; + +/* Length of file name excluding zero terminator */ + entp->d_namlen = n -1 ; + +/* File attributes */ + attr = datap->dwFileAttributes; +if ((attr &FILE_ATTRIBUTE_DEVICE ) !=0 ) + entp->d_type =DT_CHR ; +else if ((attr &FILE_ATTRIBUTE_DIRECTORY ) !=0 ) + entp->d_type =DT_DIR ; +else + entp->d_type =DT_REG ; + +/* Reset dummy fields */ + entp->d_ino =0 ; + entp->d_reclen =sizeof (struct dirent ); + + }else { +/* +* Cannot convert file name to multi-byte string so +* construct an errornous directory entry and return +* that. Note that we cannot return NULL as that would +* stop the processing of directory entries completely. +*/ + entp = &dirp->ent; + entp->d_name[0 ] ='?' ; + entp->d_name[1 ] ='\0' ; + entp->d_namlen =1 ; + entp->d_type =DT_UNKNOWN ; + entp->d_ino =0 ; + entp->d_reclen =0 ; + } + + }else { +/* No more directory entries */ + entp =NULL ; + } + +return entp; +} + +/* +* Close directory stream. +*/ +static int +closedir (DIR *dirp) +{ +int ok; +if (dirp) { + +/* Close wide-character directory stream */ + ok =_wclosedir (dirp->wdirp); + dirp->wdirp =NULL ; + +/* Release multi-byte character version */ +free (dirp); + + }else { + +/* Invalid directory stream */ +dirent_set_errno (EBADF ); + ok =/*failure*/ -1 ; + + } +return ok; +} + +/* Convert multi-byte string to wide character string */ +static int +dirent_mbstowcs_s ( +size_t *pReturnValue, +wchar_t *wcstr, +size_t sizeInWords, +const char *mbstr, +size_t count) +{ +int error; + +#if defined(_MSC_VER) && _MSC_VER >=1400 +/* Microsoft Visual Studio 2005 or later */ + error =mbstowcs_s (pReturnValue, wcstr, + sizeInWords, mbstr, count); +#else + +/* Older Visual Studio or non-Microsoft compiler */ +size_t n; + +/* Convert to wide-character string (or count characters) */ + n =mbstowcs (wcstr, mbstr, sizeInWords); +if (!wcstr || n < count) { + +/* Zero-terminate output buffer */ +if (wcstr && sizeInWords) { +if (n >= sizeInWords) + n = sizeInWords -1 ; + wcstr[n] =0 ; + } + +/* Length of resuting multi-byte string WITH zero +*terminator +*/ +if (pReturnValue) + *pReturnValue = n +1 ; + +/* Success */ + error =0 ; + + }else { + +/* Could not convert string */ + error =1 ; + + } +#endif + +return error; +} + +/* Convert wide-character string to multi-byte string */ +static int +dirent_wcstombs_s ( +size_t *pReturnValue, +char *mbstr, +size_t sizeInBytes,/* max size of mbstr */ +const wchar_t *wcstr, +size_t count) +{ +int error; + +#if defined(_MSC_VER) && _MSC_VER >=1400 +/* Microsoft Visual Studio 2005 or later */ + error =wcstombs_s (pReturnValue, mbstr, sizeInBytes, wcstr, count); +#else +/* Older Visual Studio or non-Microsoft compiler */ +size_t n; + +/* Convert to multi-byte string +* (or count the number of bytes needed) +*/ + n =wcstombs (mbstr, wcstr, sizeInBytes); +if (!mbstr || n < count) { +/* Zero-terminate output buffer */ +if (mbstr && sizeInBytes) { +if (n >= sizeInBytes) + n = sizeInBytes -1 ; + mbstr[n] ='\0' ; + } +/* Length of resulting multi-bytes string WITH +*zero-terminator +*/ +if (pReturnValue) + *pReturnValue = n +1 ; +/* Success */ + error =0 ; + }else { +/* Cannot convert string */ + error =1 ; + } +#endif + +return error; +} + +/* Set errno variable */ +static void +dirent_set_errno (int error) +{ +#if defined(_MSC_VER) && _MSC_VER >=1400 +/* Microsoft Visual Studio 2005 and later */ +_set_errno (error); +#else + +/* Non-Microsoft compiler or older Microsoft compiler */ + errno = error; +#endif +} + +#ifdef __cplusplus +} +#endif +#endif /*DIRENT_H*/
Signature · 1 line
2.18.0.windows.1
PATCH v7 3/9 eal: add additional function overrides in windows header files
In reply to Pallavi KadamAdding additional function definitions for pthread, cpuset implementation, asprintf implementation, in order to support common code.
--- lib/librte_eal/windows/eal/include/pthread.h | 66 +++++++++++++++++++ lib/librte_eal/windows/eal/include/rte_os.h | 40 +++++++++++ lib/librte_eal/windows/eal/include/sched.h | 46 +++++++++++++ .../windows/eal/include/sys/queue.h | 8 +++ 4 files changed, 160 insertions(+)
lib/librte_eal/windows/eal/include/pthread.h +66 -0
@@ -14,12 +14,78 @@extern "C" {#endif +#include <Windows.h> + +#define PTHREAD_BARRIER_SERIAL_THREAD TRUE +/* defining pthread_t type on Windows since there is no in Microsoft libc*/ typedef uintptr_t pthread_t ;/* defining pthread_attr_t type on Windows since there is no in Microsoft libc*/ typedef void *pthread_attr_t ; +typedef SYNCHRONIZATION_BARRIER pthread_barrier_t ; + +#define pthread_barrier_init (barrier, attr, count) \ + InitializeSynchronizationBarrier(barrier, count, -1) +#define pthread_barrier_wait (barrier) EnterSynchronizationBarrier(barrier, \ + SYNCHRONIZATION_BARRIER_FLAGS_BLOCK_ONLY) +#define pthread_barrier_destroy (barrier) \ + DeleteSynchronizationBarrier(barrier) +#define pthread_cancel (thread) TerminateThread((HANDLE) thread, 0) + +/* pthread function overrides */ +#define pthread_self () \ + ((pthread_t)GetCurrentThreadId()) +#define pthread_setaffinity_np (thread, size, cpuset) \ + eal_set_thread_affinity_mask(thread, (unsigned long *) cpuset) +#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) + +static inline int +eal_set_thread_affinity_mask (pthread_t threadID,unsigned long *cpuset) +{ +SetThreadAffinityMask ((HANDLE ) threadID, *cpuset); +return 0 ; +} + +static inline int +eal_get_thread_affinity_mask (pthread_t threadID,unsigned long *cpuset) +{ +/* Workaround for the lack of a GetThreadAffinityMask() +*API in Windows +*/ +/* obtain previous mask by setting dummy mask */ +DWORD dwPrevAffinityMask = +SetThreadAffinityMask ((HANDLE ) threadID,0x1 ); +/* set it back! */ +SetThreadAffinityMask ((HANDLE ) threadID, dwPrevAffinityMask); + *cpuset = dwPrevAffinityMask; +return 0 ; +} + +static inline int +eal_create_thread (void *threadID,void *threadfunc,void *args) +{ +HANDLE hThread; + hThread =CreateThread (NULL ,0 , (LPTHREAD_START_ROUTINE )threadfunc, + args,0 , (LPDWORD )threadID); +if (hThread) { +SetPriorityClass (GetCurrentProcess (),REALTIME_PRIORITY_CLASS ); +SetThreadPriority (hThread,THREAD_PRIORITY_TIME_CRITICAL ); + } +return ((hThread !=NULL ) ?0 :E_FAIL ); +} + +static inline int +pthread_join (pthread_t thread __attribute__((__unused__)), +void **value_ptr __attribute__((__unused__))) +{ +return 0 ; +} + #ifdef __cplusplus }#endif
lib/librte_eal/windows/eal/include/rte_os.h +40 -0
@@ -18,6 +18,13 @@ extern "C" {#include <Windows.h> #include <BaseTsd.h> #include <pthread.h> +#include <stdio.h> + +/* limits.h replacement */ +#include <stdlib.h> +#ifndef PATH_MAX +#define PATH_MAX _MAX_PATH +#endif #define strerror_r (a, b, c) strerror_s(b, c, a)
@@ -28,6 +35,11 @@ typedef SSIZE_T ssize_t;#define strtok_r (str, delim, saveptr) strtok_s(str, delim, saveptr) +#define index (a, b) strchr(a, b) +#define rindex (a, b) strrchr(a, b) + +#define strncasecmp (s1, s2, count) _strnicmp(s1, s2, count) +/** * Create a thread. * This function is private to EAL.
@@ -45,6 +57,34 @@ int eal_thread_create(pthread_t *thread);*/ void eal_create_cpu_map (void ); +static inline int +asprintf (char **buffer,const char *format, ...) +{ +int size, ret; +va_list arg; + +va_start (arg, format); + size =vsnprintf (NULL ,0 , format, arg) +1 ; +va_end (arg); + + *buffer =malloc (size); + +va_start (arg, format); + ret =vsnprintf (*buffer, size, format, arg); +va_end (arg); +if (ret != size -1 ) { +free (*buffer); +return -1 ; + } +return ret; +} + +/* 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
lib/librte_eal/windows/eal/include/sched.h +46 -0
52 lines not on this page · raw message
lib/librte_eal/windows/eal/include/sys/queue.h +8 -0
@@ -59,6 +59,14 @@ extern "C" { #endif +/* + * List definitions. + */ +#define LIST_HEAD(name, type) \ +struct name { \ + struct type *lh_first; /* first element */ \ +} + #define QMD_TRACE_ELEM(elem) #define QMD_TRACE_HEAD(head) #define TRACEBUF
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [PATCH v7 3/9] eal: add additional function overrides in windows header files
Quoted 1 line
+#include <
Windows.h>
Nit: better use lowercase to support cross-compilation from OS with case-sensitive FS. It's not directly relevant for this patch.
Quoted 4 lines
lib/librte_eal/windows/eal/include/pthread.h +4
-0+static inline int +eal_get_thread_affinity_mask (pthread_t threadID,unsigned long *cpuset) +{ +/* Workaround for the lack of a GetThreadAffinityMask()
lib/librte_eal/windows/eal/include/pthread.h line 67
Quoted 10 lines
lib/librte_eal/windows/eal/include/pthread.h +10
-0+*API in Windows +*/ +/* obtain previous mask by setting dummy mask */ +DWORD dwPrevAffinityMask = +SetThreadAffinityMask ((HANDLE ) threadID,0x1 ); +/* set it back! */ +SetThreadAffinityMask ((HANDLE ) threadID, dwPrevAffinityMask); + *cpuset = dwPrevAffinityMask; +return 0 ; +}
Shouldn't EAL implementation follow DPDK code style? If so, "threadID" and "dwPrevAffinityMask" violate naming convention, also there's a bogus TAB.
lib/librte_eal/windows/eal/include/pthread.h line 80
Quoted 12 lines
lib/librte_eal/windows/eal/include/pthread.h +12
-0+static inline int +eal_create_thread (void *threadID,void *threadfunc,void *args) +{ +HANDLE hThread; + hThread =CreateThread (NULL ,0 , (LPTHREAD_START_ROUTINE )threadfunc, + args,0 , (LPDWORD )threadID); +if (hThread) { +SetPriorityClass (GetCurrentProcess (),REALTIME_PRIORITY_CLASS ); +SetThreadPriority (hThread,THREAD_PRIORITY_TIME_CRITICAL ); + } +return ((hThread !=NULL ) ?0 :E_FAIL ); +}
Duplicates eal_thread_create() from "eal_thread.c", probably eal_thread_create() should call pthread_create() as in Linux EAL.
lib/librte_eal/windows/eal/include/pthread.h line 87
Quoted 6 lines
lib/librte_eal/windows/eal/include/pthread.h +6
-0+static inline int +pthread_join (pthread_t thread __attribute__((__unused__)), +void **value_ptr __attribute__((__unused__))) +{ +return 0 ; +}
If not implemented, should return EINVAL (ENOSUP is not listed as a valid error code for this function). Even better, implement trivially with WaitForSingleObject().
lib/librte_eal/windows/eal/include/rte_os.h int eal_thread_create(pthread_t *thread); · line 70
Quoted 11 lines
lib/librte_eal/windows/eal/include/rte_os.h +11
-0+static inline int +asprintf (char **buffer,const char *format, ...) +{ +int size, ret; +va_list arg; + +va_start (arg, format); + size =vsnprintf (NULL ,0 , format, arg) +1 ; +va_end (arg); + + *buffer =malloc (size);
Missing a check for NULL from malloc().
Quoted 5 lines
lib/librte_eal/windows/eal/include/rte_os.h +5
-0+ +va_start (arg, format); + ret =vsnprintf (*buffer, size, format, arg); +va_end (arg); +if (ret != size -1 ) {
lib/librte_eal/windows/eal/include/rte_os.h int eal_thread_create(pthread_t *thread);
Quoted 10 lines
lib/librte_eal/windows/eal/include/rte_os.h +9
-0+free (*buffer); +return -1 ; + } +return ret; +} +static inline int +count_cpu (rte_cpuset_t *s) +{ +unsigned int _i;
Why the underscore? It's not a macro, identifiers are function-local.
lib/librte_eal/windows/eal/include/sys/queue.h line 72
Quoted 11 lines
lib/librte_eal/windows/eal/include/sys/queue.h +8
-0+/* +* List definitions. +*/ +#define LIST_HEAD (name, type) \ +struct name { \ + struct type *lh_first;/* first element */ \ +} +#define QMD_TRACE_ELEM (elem)#define QMD_TRACE_HEAD (head)#define TRACEBUF
Probably ouf of scope for this patchset, but DPDK should probably include the entire FreeBSD <sys/queue.h> so that we won't need to add it piece-by-piece like so. It's BSD-3-Clause anyway.
Signature · 1 line
Dmitry Kozlyuk
PATCH v7 4/9 eal: getopt implementation for windows
In reply to Pallavi KadamAdding getopt files to support parsing option on
Windows.
The original contribution is under BSD-2 license.
https://raw.githubusercontent.com/greenplum-db/libusual/master/usual/getopt.c
https://raw.githubusercontent.com/greenplum-db/libusual/master/usual/getopt.h
--- lib/librte_eal/windows/eal/getopt.c | 465 ++++++++++++++++++++ lib/librte_eal/windows/eal/include/getopt.h | 127 ++++++ lib/librte_eal/windows/eal/meson.build | 1 + 3 files changed, 593 insertions(+) create mode 100644 lib/librte_eal/windows/eal/getopt.c create mode 100644 lib/librte_eal/windows/eal/include/getopt.h
lib/librte_eal/windows/eal/getopt.c new file +465 -0
@@ -0,0 +1,465 @@ +/* SPDX-License-Identifier: ISC AND BSD-2-Clause +* Copyright (c) 2002 Todd C. Miller <[email protected]> +* +* Sponsored in part by the Defense Advanced Research Projects +* Agency (DARPA) and Air Force Research Laboratory, Air Force +* Materiel Command, USAF, under agreement number F39502-99-1-0512. +*/ +/* +* Copyright (c) 2000 The NetBSD Foundation, Inc. +* All rights reserved. +* +* This code is derived from software contributed to The NetBSD Foundation +* by Dieter Baron and Thomas Klausner. +*/ + +#include <getopt.h> +#ifdef NEED_USUAL_GETOPT + +#include <string.h> + +const char *optarg;/* argument associated with option */ +int opterr =1 ;/* if error message should be printed */ +int optind =1 ;/* index into parent argv vector */ +int optopt ='?' ;/* character checked for validity */ + +#define PRINT_ERROR ((opterr) && (*options != ':')) + +#define FLAG_PERMUTE 0x01/* permute non-options to the end of argv */ +#define FLAG_ALLARGS 0x02/* treat non-options as args to option "-1" */ +#define FLAG_LONGONLY 0x04/* operate as getopt_long_only */ + +/* return values */ +#define BADCH ((int)'?') +#define BADARG ((*options == ':') ? (int)':' : (int)'?') +#define INORDER 1 + +#define EMSG "" + +static const char *place =EMSG ;/* option letter processing */ + +/* XXX: set optreset to 1 rather than these two */ +static int nonopt_start =-1 ;/* first non option argument (for permute) */ +static int nonopt_end =-1 ;/* first option after non options (for permute) */ + +/* Error messages */ +static const char recargchar[] ="option requires an argument -- %c" ; +static const char recargstring[] ="option requires an argument -- %s" ; +static const char ambig[] ="ambiguous option -- %.*s" ; +static const char noarg[] ="option doesn't take an argument -- %.*s" ; +static const char illoptchar[] ="unknown option -- %c" ; +static const char illoptstring[] ="unknown option -- %s" ; + +/* +* Compute the greatest common divisor of a and b. +*/ +static int +gcd (int a,int b) +{ +int c; + + c = a % b; +while (c !=0 ) { + a = b; + b = c; + c = a % b; + } + +return (b); +} + +/* +* Exchange the block from nonopt_start to nonopt_end with the block +* from nonopt_end to opt_end (keeping the same order of arguments +* in each block). +*/ +static void +permute_args (int panonopt_start,int panonopt_end,int opt_end, +char **nargv) +{ +int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos; +char *swap; + +/* +* compute lengths of blocks and number and size of cycles +*/ + nnonopts = panonopt_end - panonopt_start; + nopts = opt_end - panonopt_end; + ncycle =gcd (nnonopts, nopts); + cyclelen = (opt_end - panonopt_start) / ncycle; + +for (i =0 ; i < ncycle; i++) { + cstart = panonopt_end+i; + pos = cstart; +for (j =0 ; j < cyclelen; j++) { +if (pos >= panonopt_end) + pos -= nnonopts; +else + pos += nopts; + swap = nargv[pos]; +/* LINTED const cast */ + ((char **) nargv)[pos] = nargv[cstart]; +/* LINTED const cast */ + ((char **)nargv)[cstart] = swap; + } + } +} + +/* +* parse_long_options -- +* Parse long options in argc/argv argument vector. +* Returns -1 if short_too is set and the option does not match long_options. +*/ +static int +parse_long_options (char **nargv,const char *options, +const struct option *long_options,int *idx,int short_too) +{ +const char *current_argv; +char *has_equal; +size_t current_argv_len; +int i, match; + + current_argv = place; + match =-1 ; + + optind++; + + has_equal =strchr (current_argv,'=' ); +if (has_equal !=NULL ) { +/* argument found (--option=arg) */ + current_argv_len = has_equal - current_argv; + has_equal++; + }else + current_argv_len =strlen (current_argv); + +for (i =0 ; long_options[i].name; i++) { +/* find matching long option */ +if (strncmp (current_argv, long_options[i].name, + current_argv_len)) +continue ; + +if (strlen (long_options[i].name) == current_argv_len) { +/* exact match */ + match = i; +break ; + } +/* +* If this is a known short option, don't allow +* a partial match of a single character. +*/ +if (short_too && current_argv_len ==1 ) +continue ; + +if (match ==-1 )/* partial match */ + match = i; +else { +/* ambiguous abbreviation */ +if (PRINT_ERROR ) +warnx (ambig, (int )current_argv_len, + current_argv); + optopt =0 ; +return BADCH ; + } + } +if (match !=-1 ) {/* option found */ +if (long_options[match].has_arg == no_argument + && has_equal) { +if (PRINT_ERROR ) +warnx (noarg, (int )current_argv_len, + current_argv); +/* +* XXX: GNU sets optopt to val regardless of flag +*/ +if (long_options[match].flag ==NULL ) + optopt = long_options[match].val; +else + optopt =0 ; +return BADARG ; + } +if (long_options[match].has_arg == required_argument || + long_options[match].has_arg == optional_argument) { +if (has_equal) + optarg = has_equal; +else if (long_options[match].has_arg == + required_argument) { +/* +* optional argument doesn't use next nargv +*/ + optarg = nargv[optind++]; + } + } +if ((long_options[match].has_arg == required_argument) + && (optarg ==NULL )) { +/* +* Missing argument; leading ':' indicates no error +* should be generated. +*/ +if (PRINT_ERROR ) +warnx (recargstring, + current_argv); +/* +* XXX: GNU sets optopt to val regardless of flag +*/ +if (long_options[match].flag ==NULL ) + optopt = long_options[match].val; +else + optopt =0 ; + --optind; +return BADARG ; + } + }else {/* unknown option */ +if (short_too) { + --optind; +return (-1 ); + } +if (PRINT_ERROR ) +warnx (illoptstring, current_argv); + optopt =0 ; +return BADCH ; + } +if (idx) + *idx = match; +if (long_options[match].flag) { + *long_options[match].flag = long_options[match].val; +return 0 ; + }else +return (long_options[match].val); +} + +/* +* getopt_internal -- +* Parse argc/argv argument vector. Called by user level routines. +*/ +static int +getopt_internal (int nargc,char **nargv,const char *options, +const struct option *long_options,int *idx,int flags) +{ +char *oli;/* option letter list index */ +int optchar, short_too; +static int posixly_correct =-1 ; +char *buf; +unsigned int buf_count; +int optreset =0 ; + +if (options ==NULL ) +return (-1 ); + +/* +* Disable GNU extensions if POSIXLY_CORRECT is set or options +* string begins with a '+'. +*/ +if (posixly_correct ==-1 ) + posixly_correct =_dupenv_s (&buf, (size_t *)&buf_count,"POSIXLY_CORRECT" ); +if (!posixly_correct || *options =='+' ) + flags &= ~FLAG_PERMUTE ; +else if (*options =='-' ) + flags |=FLAG_ALLARGS ; +if (*options =='+' || *options =='-' ) + options++; +if (!posixly_correct) +free (buf); +/* +* reset if requested +*/ +if (optind ==0 ) + optind = optreset =1 ; + + optarg =NULL ; +if (optreset) + nonopt_start = nonopt_end =-1 ; +start: +if (optreset || !*place) {/* update scanning pointer */ + optreset =0 ; +if (optind >= nargc) {/* end of argument vector */ + place =EMSG ; +if (nonopt_end !=-1 ) { +/* do permutation, if we have to */ +permute_args (nonopt_start, nonopt_end, + optind, nargv); + optind -= nonopt_end - nonopt_start; + }else if (nonopt_start !=-1 ) { +/* +* If we skipped non-options, set optind +* to the first of them. +*/ + optind = nonopt_start; + } + nonopt_start = nonopt_end =-1 ; +return (-1 ); + } + place = nargv[optind]; +if (*place !='-' || + (place[1 ] =='\0' &&strchr (options,'-' ) ==NULL )) { + place =EMSG ;/* found non-option */ +if (flags &FLAG_ALLARGS ) { +/* +* GNU extension: +* return non-option as argument to option 1 +*/ + optarg = nargv[optind++]; +return INORDER ; + } +if (!(flags &FLAG_PERMUTE )) { +/* +* If no permutation wanted, stop parsing +* at first non-option. +*/ +return (-1 ); + } +/* do permutation */ +if (nonopt_start ==-1 ) + nonopt_start = optind; +else if (nonopt_end !=-1 ) { +permute_args (nonopt_start, nonopt_end, + optind, nargv); + nonopt_start = optind - + (nonopt_end - nonopt_start); + nonopt_end =-1 ; + } + optind++; +/* process next argument */ + goto start; + } +if (nonopt_start !=-1 && nonopt_end ==-1 ) + nonopt_end = optind; + +/* +* If we have "-" do nothing, if "--" we are done. +*/ +if (place[1 ] !='\0' && *++place =='-' && place[1 ] =='\0' ) { + optind++; + place =EMSG ; +/* +* We found an option (--), so if we skipped +* non-options, we have to permute. +*/ +if (nonopt_end !=-1 ) { +permute_args (nonopt_start, nonopt_end, + optind, nargv); + optind -= nonopt_end - nonopt_start; + } + nonopt_start = nonopt_end =-1 ; +return (-1 ); + } + } + +/* +* Check long options if: +* 1) we were passed some +* 2) the arg is not just "-" +* 3) either the arg starts with -- we are getopt_long_only() +*/ +if (long_options !=NULL && place != nargv[optind] && + (*place =='-' || (flags &FLAG_LONGONLY ))) { + short_too =0 ; +if (*place =='-' ) + place++;/* --foo long option */ +else if (*place !=':' &&strchr (options, *place) !=NULL ) + short_too =1 ;/* could be short option too */ + + optchar =parse_long_options (nargv, options, long_options, + idx, short_too); +if (optchar !=-1 ) { + place =EMSG ; +return optchar; + } + } + + optchar = (int )*place++; + oli =strchr (options, optchar); +if (optchar == (int )':' || + (optchar == (int )'-' && *place !='\0' ) || + oli ==NULL ) { +/* +* If the user specified "-" and '-' isn't listed in +* options, return -1 (non-option) as per POSIX. +* Otherwise, it is an unknown option character (or ':'). +*/ +if (optchar == (int )'-' && *place =='\0' ) +return (-1 ); +if (!*place) + ++optind; +if (PRINT_ERROR ) +warnx (illoptchar, optchar); + optopt = optchar; +return BADCH ; + } +if (long_options !=NULL && optchar =='W' && oli[1 ] ==';' ) { +/* -W long-option */ +if (*place) + ; +else if (++optind >= nargc) {/* no arg */ + place =EMSG ; +if (PRINT_ERROR ) +warnx (recargchar, optchar); + optopt = optchar; +return BADARG ; + }/* white space */ + place = nargv[optind]; + optchar =parse_long_options (nargv, options, long_options, + idx,0 ); + place =EMSG ; +return optchar; + } +if (*++oli !=':' ) {/* doesn't take argument */ +if (!*place) + ++optind; + }else {/* takes (optional) argument */ + optarg =NULL ; +if (*place)/* no white space */ + optarg = place; +else if (oli[1 ] !=':' ) {/* arg not optional */ +if (++optind >= nargc) {/* no arg */ + place =EMSG ; +if (PRINT_ERROR ) +warnx (recargchar, optchar); + optopt = optchar; +return BADARG ; + } + optarg = nargv[optind]; + } + place =EMSG ; + ++optind; + } +/* dump back option letter */ +return optchar; +} + +/* +* getopt -- +* Parse argc/argv argument vector. +*/ +int +getopt (int nargc,char *nargv[],const char *options) +{ +return getopt_internal (nargc, nargv, options,NULL ,NULL , +FLAG_PERMUTE ); +} + +/* +* getopt_long -- +* Parse argc/argv argument vector. +*/ +int +getopt_long (int nargc,char *nargv[],const char *options, +const struct option *long_options,int *idx) +{ + +return (getopt_internal (nargc, nargv, options, long_options, idx, +FLAG_PERMUTE )); +} + +/* +* getopt_long_only -- +* Parse argc/argv argument vector. +*/ +int +getopt_long_only (int nargc,char *nargv[],const char *options, +const struct option *long_options,int *idx) +{ + +return (getopt_internal (nargc, nargv, options, long_options, idx, +FLAG_PERMUTE |FLAG_LONGONLY )); +} + +#endif /* NEED_USUAL_GETOPT */
lib/librte_eal/windows/eal/include/getopt.h new file +127 -0
127 lines not on this page · raw message
lib/librte_eal/windows/eal/meson.build +1 -0
@@ -17,4 +17,5 @@ env_sources = files('eal.c', 'eal_debug.c', 'eal_lcore.c', 'eal_thread.c', + 'getopt.c', )
Signature · 1 line
2.18.0.windows.1
PATCH v7 5/9 eal: add function to detect process type
In reply to Pallavi KadamAdding a function to detect process type, also included header files to contain suitable function declarations and to support extra warning flags.
--- lib/librte_eal/windows/eal/eal.c | 61 ++++++++++++++++++++++++- lib/librte_eal/windows/eal/eal_debug.c | 1 + lib/librte_eal/windows/eal/eal_lcore.c | 3 ++ lib/librte_eal/windows/eal/eal_thread.c | 11 +++++ 4 files changed, 75 insertions(+), 1 deletion(-)
lib/librte_eal/windows/eal/eal.c +60 -1
@@ -2,21 +2,48 @@* Copyright(c) 2019 Intel Corporation */ +#include <sys/stat.h> #include <io.h> #include <fcntl.h> #include <rte_debug.h> #include <rte_eal.h> +#include <eal_memcfg.h> #include <rte_errno.h> #include <rte_lcore.h> #include <eal_thread.h> +#include <eal_internal_cfg.h> +#include <eal_filesystem.h> +#include <eal_options.h> #include <eal_private.h> +/* define fd variable here, because file needs to be kept open for the +* duration of the program, as we hold a write lock on it in the primary proc +*/ +static int mem_cfg_fd =-1 ; + +/* early configuration structure, when memory config is not mmapped */ +static struct rte_mem_config early_mem_config; +/* Address of global and public configuration */ -static struct rte_config rte_config; +static struct rte_config rte_config = { + .mem_config = &early_mem_config, +};/* internal configuration (per-core) */ struct lcore_config lcore_config[RTE_MAX_LCORE ]; +/* internal configuration */ +struct internal_config internal_config; + +/* platform-specific runtime dir */ +static char runtime_dir[PATH_MAX ]; + +const char * +rte_eal_get_runtime_dir (void ) +{ +return runtime_dir; +} +/* Return a pointer to the configuration structure */ struct rte_config *rte_eal_get_configuration (void )
@@ -24,6 +51,38 @@ rte_eal_get_configuration(void)return &rte_config; } +/* Detect if we are a primary or a secondary process */ +enum rte_proc_type_t +eal_proc_type_detect (void ) +{ +enum rte_proc_type_t ptype =RTE_PROC_PRIMARY ; +const char *pathname =eal_runtime_config_path (); + +/* if we can open the file but not get a write-lock we are a secondary +* process. NOTE: if we get a file handle back, we keep that open +* and don't close it to prevent a race condition between multiple opens +*/ +errno_t err =_sopen_s (&mem_cfg_fd, pathname, + _O_RDWR, _SH_DENYNO, _S_IREAD | _S_IWRITE); +if (err ==0 ) { +OVERLAPPED sOverlapped = {0 }; + sOverlapped.Offset =sizeof (*rte_config.mem_config); + sOverlapped.OffsetHigh =0 ; + +HANDLE hWinFileHandle = (HANDLE )_get_osfhandle (mem_cfg_fd); + +if (!LockFileEx (hWinFileHandle, +LOCKFILE_EXCLUSIVE_LOCK |LOCKFILE_FAIL_IMMEDIATELY ,0 , +sizeof (*rte_config.mem_config),0 , &sOverlapped)) + ptype =RTE_PROC_SECONDARY ; + } + +RTE_LOG (INFO ,EAL ,"Auto-detected process type: %s\n" , + ptype ==RTE_PROC_PRIMARY ?"PRIMARY" :"SECONDARY" ); + +return ptype; +} +static int sync_func(void *arg __rte_unused) {
lib/librte_eal/windows/eal/eal_debug.c +1 -0
@@ -4,6 +4,7 @@#include <stdarg.h> #include <rte_log.h> +#include <rte_debug.h> /* call abort(), it will generate a coredump if enabled */ void
lib/librte_eal/windows/eal/eal_lcore.c +3 -0
@@ -6,6 +6,9 @@#include <rte_common.h> +#include "eal_private.h" +#include "eal_thread.h" +/* global data structure that contains the CPU map */ static struct _wcpu_map { unsigned int total_procs;
lib/librte_eal/windows/eal/eal_thread.c +11 -0
@@ -10,11 +10,14 @@#include <rte_lcore.h> #include <rte_per_lcore.h> #include <rte_common.h> +#include <rte_memory.h> #include <eal_thread.h> #include "eal_private.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; +RTE_DEFINE_PER_LCORE (rte_cpuset_t, _cpuset);/* * Send a message to a slave lcore identified by slave_id to call a
@@ -152,3 +155,11 @@ eal_thread_create(pthread_t *thread)return 0 ; } + +int +rte_thread_setname(__rte_unused pthread_t id, __rte_unused const char *name) +{ +/* TODO */ +/* This is a stub, not the expected result */ +return 0 ; +}
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [PATCH v7 5/9] eal: add function to detect process type
Quoted 4 lines
lib/librte_eal/windows/eal/eal.c +4
-0+/* Detect if we are a primary or a secondary process */ +enum rte_proc_type_t +eal_proc_type_detect (void ) +{
[...]
lib/librte_eal/windows/eal/eal.c rte_eal_get_configuration(void) · line 72
Quoted 5 lines
lib/librte_eal/windows/eal/eal.c +5
-0+OVERLAPPED sOverlapped = {0 }; + sOverlapped.Offset =sizeof (*rte_config.mem_config); + sOverlapped.OffsetHigh =0 ; + +HANDLE hWinFileHandle = (HANDLE )_get_osfhandle (mem_cfg_fd);
[...]
Identifiers don't follow naming conventions.
Signature · 1 line
Dmitry Kozlyuk
Re: [dpdk-dev] [PATCH v7 5/9] eal: add function to detect process type
Quoted 5 lines · Dmitry Kozlyuk
Quoted 4 lines
lib/librte_eal/windows/eal/eal.c +4
-0+/* Detect if we are a primary or a secondary process */ +enum rte_proc_type_t +eal_proc_type_detect (void ) +{[...]
Quoted 8 lines
lib/librte_eal/windows/eal/eal.c rte_eal_get_configuration(void) · line 72
Quoted 5 lines
lib/librte_eal/windows/eal/eal.c +5
-0+OVERLAPPED sOverlapped = {0 }; + sOverlapped.Offset =sizeof (*rte_config.mem_config); + sOverlapped.OffsetHigh =0 ; + +HANDLE hWinFileHandle = (HANDLE )_get_osfhandle (mem_cfg_fd);[...]
Identifiers don't follow naming conventions.
Thank you, will fix this in v8.
Quoted 1 line
PATCH v7 6/9 eal: include SSE4 support for windows
In reply to Pallavi KadamModified \common\include\arch\x86\rte_vect.h
to include SSE4 header for Windows.
--- lib/librte_eal/common/include/arch/x86/rte_vect.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/librte_eal/common/include/arch/x86/rte_vect.h +3 -1
@@ -15,7 +15,9 @@#include <rte_config.h> #include "generic/rte_vect.h" -#if (defined(__ICC) || (__GNUC__ ==4 && __GNUC_MINOR__ <4 )) +#if (defined(__ICC) || \ + (defined(_WIN64)) || \ + (__GNUC__ ==4 && __GNUC_MINOR__ <4 ))#include <smmintrin.h> /* SSE4 */
Signature · 1 line
2.18.0.windows.1
PATCH v7 7/9 eal: remove syslog and dlfcn support for windows
In reply to Pallavi KadamExcluding syslog/ dlfcn definitions and parameters from Windows by adding #ifndef RTE_EXEC_ENV_WINDOWS.
Note: This is a temporary change. In future, separate 'unix' directory will be created for unix specific functions.
--- lib/librte_eal/common/eal_common_options.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
lib/librte_eal/common/eal_common_options.c +12 -0
@@ -6,12 +6,16 @@#include <stdlib.h> #include <unistd.h> #include <string.h> +#ifndef RTE_EXEC_ENV_WINDOWS #include <syslog.h> +#endif #include <ctype.h> #include <limits.h> #include <errno.h> #include <getopt.h> +#ifndef RTE_EXEC_ENV_WINDOWS #include <dlfcn.h> +#endif #include <sys/types.h> #include <sys/stat.h> #include <dirent.h>
@@ -205,7 +209,9 @@ eal_reset_internal_config(struct internal_config *internal_cfg) } internal_cfg->base_virtaddr =0 ; +#ifdef LOG_DAEMON internal_cfg->syslog_facility =LOG_DAEMON ; +#endif /* if set to NONE, interrupt mode is determined automatically */ internal_cfg->vfio_intr_mode =RTE_INTR_MODE_NONE ;
@@ -278,6 +284,7 @@ eal_plugindir_init(const char *path)int eal_plugins_init (void ) { +#ifndef RTE_EXEC_ENV_WINDOWS struct shared_driver *solib =NULL ;struct stat sb;
@@ -306,6 +313,7 @@ eal_plugins_init(void) }return 0 ; +#endif }/*
@@ -927,6 +935,7 @@ eal_parse_lcores(const char *lcores)return ret; } +#ifndef RTE_EXEC_ENV_WINDOWS static int eal_parse_syslog (const char *facility,struct internal_config *conf) {
@@ -965,6 +974,7 @@ eal_parse_syslog(const char *facility, struct internal_config *conf) }return -1 ; } +#endif static int eal_parse_log_priority (const char *level)
@@ -1389,6 +1399,7 @@ eal_parse_common_option(int opt, const char *optarg, }break ; +#ifndef RTE_EXEC_ENV_WINDOWS case OPT_SYSLOG_NUM :if (eal_parse_syslog (optarg, conf) <0 ) { RTE_LOG(ERR, EAL, "invalid parameters for --"
@@ -1396,6 +1407,7 @@ eal_parse_common_option(int opt, const char *optarg, return -1; }break ; +#endif case OPT_LOG_LEVEL_NUM : {if (eal_parse_log_level (optarg) <0 ) {
Signature · 1 line
2.18.0.windows.1
PATCH v7 8/9 build: add additional common files support
In reply to Pallavi KadamAdded support for additional common files in meson build to expand Windows EAL and to support the lcore parsing feature on Windows.
--- lib/librte_eal/windows/eal/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
lib/librte_eal/windows/eal/meson.build +7 -1
@@ -8,10 +8,16 @@ env_headers = files( 'include/rte_os.h', ) common_sources = files( + '../../common/eal_common_bus.c', + '../../common/eal_common_class.c', + '../../common/eal_common_devargs.c', '../../common/eal_common_errno.c', '../../common/eal_common_launch.c', '../../common/eal_common_lcore.c', - '../../common/eal_common_log.c' + '../../common/eal_common_log.c', + '../../common/eal_common_options.c', + '../../common/eal_common_thread.c', + '../../common/rte_option.c', ) env_sources = files('eal.c', 'eal_debug.c',
Signature · 1 line
2.18.0.windows.1
PATCH v7 9/9 eal: add minimum viable code to support parsing
In reply to Pallavi KadamAdding specific logic for eal.c to support parsing on Windows.
--- lib/librte_eal/windows/eal/eal.c | 133 ++++++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 3 deletions(-)
lib/librte_eal/windows/eal/eal.c +130 -3
@@ -16,6 +16,9 @@#include <eal_options.h> #include <eal_private.h> +/* Allow the application to print its usage message too if set */ +static rte_usage_hook_t rte_application_usage_hook; +/* define fd variable here, because file needs to be kept open for the * duration of the program, as we hold a write lock on it in the primary proc */
@@ -83,6 +86,124 @@ eal_proc_type_detect(void)return ptype; } +/* display usage */ +static void +eal_usage (const char *prgname) +{ +printf ("\nUsage: %s " , prgname); +eal_common_usage (); +/* Allow the application to print its usage message too +*if hook is set +*/ +if (rte_application_usage_hook) { +printf ("===== Application Usage =====\n\n" ); +rte_application_usage_hook (prgname); + } +} + +/* Parse the arguments for --log-level only */ +static void +eal_log_level_parse (int argc,char **argv) +{ +int opt; +char **argvopt; +int option_index; + + argvopt = argv; + +eal_reset_internal_config (&internal_config); + +while ((opt =getopt_long (argc, argvopt, eal_short_options, + eal_long_options, &option_index)) !=EOF ) { + +int ret; + +/* getopt is not happy, stop right now */ +if (opt =='?' ) +break ; + + ret = (opt ==OPT_LOG_LEVEL_NUM ) ? +eal_parse_common_option (opt, optarg, + &internal_config) :0 ; + +/* common parser is not happy */ +if (ret <0 ) +break ; + } + + optind =0 ;/* reset getopt lib */ +} + +/* Parse the argument given in the command line of the application */ +__attribute__((optnone))static int +eal_parse_args (int argc,char **argv) +{ +int opt, ret; +char **argvopt; +int option_index; +char *prgname = argv[0 ]; + + argvopt = argv; + +while ((opt =getopt_long (argc, argvopt, eal_short_options, + eal_long_options, &option_index)) !=EOF ) { + +int ret; + +/* getopt is not happy, stop right now */ +if (opt =='?' ) { +eal_usage (prgname); +return -1 ; + } + + ret =eal_parse_common_option (opt, optarg, &internal_config); +/* common parser is not happy */ +if (ret <0 ) { +eal_usage (prgname); +return -1 ; + } +/* common parser handled this option */ +if (ret ==0 ) +continue ; + +switch (opt) { +case 'h' : +eal_usage (prgname); +exit (EXIT_SUCCESS ); +default : +if (opt <OPT_LONG_MIN_NUM &&isprint (opt)) { +RTE_LOG (ERR ,EAL ,"Option %c is not supported " +"on Windows\n" , opt); + }else if (opt >=OPT_LONG_MIN_NUM && + opt <OPT_LONG_MAX_NUM ) { +RTE_LOG (ERR ,EAL ,"Option %s is not supported " +"on Windows\n" , + eal_long_options[option_index].name); + }else { +RTE_LOG (ERR ,EAL ,"Option %d is not supported " +"on Windows\n" , opt); + } +eal_usage (prgname); +return -1 ; + } + } + +if (eal_adjust_config (&internal_config) !=0 ) +return -1 ; + +/* sanity checks */ +if (eal_check_common_options (&internal_config) !=0 ) { +eal_usage (prgname); +return -1 ; + } + +if (optind >=0 ) + argv[optind -1 ] = prgname; + ret = optind -1 ; + optind =0 ;/* reset getopt lib */ +return ret; +} +static int sync_func(void *arg __rte_unused) {
@@ -98,9 +219,11 @@ rte_eal_init_alert(const char *msg)/* Launch threads, called at application init(). */ int -rte_eal_init(int argc __rte_unused, char **argv __rte_unused) +rte_eal_init (int argc,char **argv) { -int i; +int i, fctret; + +eal_log_level_parse (argc, argv);/* create a map of all processors in the system */ eal_create_cpu_map ();
@@ -111,6 +234,10 @@ rte_eal_init(int argc __rte_unused, char **argv __rte_unused)return -1 ; } + fctret =eal_parse_args (argc, argv); +if (fctret <0 ) +exit (1 ); +eal_thread_init_master (rte_config.master_lcore);RTE_LCORE_FOREACH_SLAVE (i) {
@@ -139,5 +266,5 @@ rte_eal_init(int argc __rte_unused, char **argv __rte_unused)*/ rte_eal_mp_remote_launch (sync_func,NULL ,SKIP_MASTER );rte_eal_mp_wait_lcore (); -return 0 ; +return fctret; }
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [PATCH v7 9/9] eal: add minimum viable code to support parsing
Crashes at argument parsing, WinDbg log attached.
Signature · 1 line
Dmitry Kozlyuk
Microsoft (R) Windows Debugger Version 10.0.18362.1 AMD64 Copyright (c) Microsoft Corporation. All rights reserved.
CommandLine: build\native\clang\examples\dpdk-helloworld.exe -cf --log-level=eal:8
Symbol search path is: srv*
Executable search path is:
ModLoad: 00007ff676480000 00007ff67653d000 dpdk-helloworld.exe
ModLoad: 00007ffb4a720000 00007ffb4a910000 ntdll.dll
ModLoad: 00007ffb49470000 00007ffb49522000 C:\Windows\System32\KERNEL32.DLL
ModLoad: 00007ffb47800000 00007ffb47aa3000 C:\Windows\System32\KERNELBASE.dll
(143c.1ed8): Break instruction exception - code 80000003 (first chance)
ntdll!LdrpDoDebuggerBreak+0x30:
00007ffb`4a7f11dc cc int 3
0:000> g
Critical error detected c0000374
(143c.1ed8): Break instruction exception - code 80000003 (first chance)
ntdll!RtlReportCriticalFailure+0x56:
00007ffb`4a8191f2 cc int 3
0:000> kb
# RetAddr : Args to Child : Call Site
00 00007ffb4a821622 : 0000000000000000 00007ffb4a8827f0 0000000000000009 00000205`68c10000 : ntdll!RtlReportCriticalFailure+0x56
01 00007ffb4a82192a : 0000000000000009 0000020568c10000 0000020568c10000 00007ff6`7648a6b7 : ntdll!RtlpHeapHandleError+0x12
02 00007ffb4a82a8e9 : 0000020568c10000 ffffffffffffffff 0000000100000000 00000003`00000002 : ntdll!RtlpHpHeapHandleError+0x7a
03 00007ffb4a7607df : ffffffffffffffff ffffffffffffffff ffffffffffffffff ffffffff`ffffffff : ntdll!RtlpLogHeapFailure+0x45
04 00007ffb4a75fc11 : ffffffffffffffff 0000020568c10000 0000000000000000 00000000`00000000 : ntdll!RtlpFreeHeapInternal+0x75f
*** WARNING: Unable to verify checksum for dpdk-helloworld.exe
05 00007ff6764df8ac : 0000020568c16cf0 0000000000000000 ffffffffffffffff ffffffff`ffffffff : ntdll!RtlFreeHeap+0x51
06 00007ff676493c97 : ffffffffffffffff ffffffff00000000 ffffffffffffffff ffffffffffffffff : dpdk_helloworld!_free_base+0x1c [minkernel\crts\ucrt\src\appcrt\heap\free_base.cpp @ 105] 07 00007ff6764944de : ffffffffffffffff ffffffffffffffff ffffffffffffffff ffffffffffffffff : dpdk_helloworld!getopt_internal+0x117 [Z:\lib\librte_eal\windows\eal\getopt.c @ 264]
08 00007ff676487efa : 0000000000000000 0000000000000000 0000000000000000 00000000`00000000 : dpdk_helloworld!usual_getopt_long+0x5e [Z:\lib\librte_eal\windows\eal\getopt.c @ 448]
09 00007ff676487be4 : 00007ff676507110 0000000000000022 0000000000000004 00000000`00000200 : dpdk_helloworld!eal_parse_args+0x4a [Z:\lib\librte_eal\windows\eal\eal.c @ 148]
0a 00007ff676487493 : 02040800000506e3 1f8bfbfffffa3223 0000001d76507790 00007ff6`7649bc61 : dpdk_helloworld!rte_eal_init+0x74 [Z:\lib\librte_eal\windows\eal\eal.c @ 237]
0b 00007ff67649b5fc : 0000000000000000 0000000000000000 0000000000000000 00000000`00000000 : dpdk_helloworld!main+0x23 [Z:\examples\helloworld\main.c @ 33]
0c (Inline Function) : ---------------- ---------------- ---------------- ---------------- : dpdk_helloworld!invoke_main+0x22 [d:\agent\_work\5\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl @ 78] 0d 00007ffb49487bd4 : 0000000000000000 0000000000000000 0000000000000000 0000000000000000 : dpdk_helloworld!__scrt_common_main_seh+0x10c [d:\agent\_work\5\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl @ 288] 0e 00007ffb4a78ced1 : 0000000000000000 0000000000000000 0000000000000000 0000000000000000 : KERNEL32!BaseThreadInitThunk+0x14
0f 0000000000000000 : 0000000000000000 0000000000000000 0000000000000000 00000000`00000000 : ntdll!RtlUserThreadStart+0x21
Re: [dpdk-dev] [PATCH v7 9/9] eal: add minimum viable code to support parsing
Quoted 1 line · Dmitry Kozlyuk
Crashes at argument parsing, WinDbg log attached.
This patch works fine with meson=0.49.
I was able to execute the 'helloworld' app.
When I tried to build with meson=0.52 it failed with the error:
[9/25] Linking target lib/librte_kvargs-20.0.dll.
FAILED: lib/librte_kvargs-20.0.dll
clang @lib/librte_kvargs-20.0.dll.rsp
clang: error: no such file or directory: '/OPT:REF'
Not completely sure, if this could be the reason for the crash.
Quoted 1 line
Re: [dpdk-dev] [PATCH v7 9/9] eal: add minimum viable code to support parsing
Quoted 4 lines · Pallavi Kadam
Quoted 1 line · Dmitry Kozlyuk
Crashes at argument parsing, WinDbg log attached.
Quoted 8 lines
This patch works fine with meson=0.49.
I was able to execute the 'helloworld' app.When I tried to build with meson=0.52 it failed with the error:
[9/25] Linking targetlib/librte_kvargs-20.0.dll.
FAILED:lib/librte_kvargs-20.0.dll
clang @lib/librte_kvargs-20.0.dll.rsp
clang: error: no such file or directory: '/OPT:REF'
Fixed this error with the patch you sent before.
were able to execute parsing:
$ ./build/examples/dpdk-helloworld.exe -l 4-8 EAL: Detected 20 lcore(s) EAL: Detected 2 NUMA nodes hello from core 5 hello from core 6 hello from core 7 hello from core 8 hello from core 4
Quoted 2 lines
Not completely sure, if this could be the reason for the crash.
Re: [dpdk-dev] [PATCH v7 9/9] eal: add minimum viable code to support parsing
06/02/2020 02:39, Pallavi Kadam:
Quoted 6 lines · Pallavi Kadam
Quoted 5 lines · Dmitry Kozlyuk
Quoted 1 line
Crashes at argument parsing, WinDbg log attached.
This patch works fine with meson=0.49.
I was able to execute the 'helloworld' app.
Quoted 7 lines
Quoted 5 lines
When I tried to build with meson=0.52 it failed with the error:
[9/25] Linking targetlib/librte_kvargs-20.0.dll.
FAILED:lib/librte_kvargs-20.0.dll
clang @lib/librte_kvargs-20.0.dll.rsp
clang: error: no such file or directory: '/OPT:REF'Fixed this error with the patch you sent before.
Which patch?
Please ack the patch so I can merge it.
Re: [dpdk-dev] [PATCH v7 9/9] eal: add minimum viable code to support parsing
Quoted 7 lines · Thomas Monjalon
06/02/2020 02:39, Pallavi Kadam:
Quoted 6 lines · Pallavi Kadam
Quoted 5 lines · Dmitry Kozlyuk
Quoted 1 line
Crashes at argument parsing, WinDbg log attached.
This patch works fine with meson=0.49.
I was able to execute the 'helloworld' app.
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
When I tried to build with meson=0.52 it failed with the error:
[9/25] Linking targetlib/librte_kvargs-20.0.dll.
FAILED:lib/librte_kvargs-20.0.dll
clang @lib/librte_kvargs-20.0.dll.rsp
clang: error: no such file or directory: '/OPT:REF'Fixed this error with the patch you sent before.
Which patch?
Please ack the patch so I can merge it.
The patch below fixes the meson error:
clang: error: no such file or directory: '/OPT:REF'
https://github.com/mesonbuild/meson/pull/6483 @Dmitry, Can you please confirm if you can still see the crash?
Quoted 3 lines
Re: [dpdk-dev] [PATCH v7 9/9] eal: add minimum viable code to support parsing
In reply to Pallavi KadamQuoted 19 lines · Pallavi Kadam
Quoted 12 lines · Dmitry Kozlyuk
Quoted 1 line
Crashes at argument parsing, WinDbg log attached.
This patch works fine with meson=0.49.
I was able to execute the 'helloworld' app.When I tried to build with meson=0.52 it failed with the error:
[9/25] Linking targetlib/librte_kvargs-20.0.dll.
FAILED:lib/librte_kvargs-20.0.dll
clang @lib/librte_kvargs-20.0.dll.rsp
clang: error: no such file or directory: '/OPT:REF'Fixed this error with the patch you sent before.
were able to execute parsing:
Quoted 11 lines
$ ./build/examples/dpdk-helloworld.exe -l 4-8 EAL: Detected 20 lcore(s) EAL: Detected 2 NUMA nodes hello from core 5 hello from core 6 hello from core 7 hello from core 8 hello from core 4Quoted 2 lines
Not completely sure, if this could be the reason for the crash.
The crash does not happen with any arguments, "-l 4-8" works fine as do "-cf" and "-v", but "--log-level=eal:8" crashes reproducibly. I assume application should not crash on invalid options, but report an error and exit. For the reference, I applied your patchset to the latest dpdk:master.
Z:\>build\native\clang\examples\dpdk-helloworld.exe
EAL: Detected 4 lcore(s)
EAL: Detected 1 NUMA nodes
OK, no lcores specified.
Z:\>build\native\clang\examples\dpdk-helloworld.exe -cf
EAL: Detected 4 lcore(s)
EAL: Detected 1 NUMA nodes
hello from core 1
hello from core 2
hello from core 3
hello from core 0
OK, 4 lcores enabled.
Z:\>build\native\clang\examples\dpdk-helloworld.exe -cf --log-level=eal:8
Crash, WinDbg log attached to bug report.
Z:\>echo %errorlevel%
-1073741819
Z:\>
Attaching the build log, but I don't think it matters, it's something with getopt implementation or it's use, judging by stack trace.
P.S. I can also see "--syslog" option in the help message, you should probably hide it via #ifndef, as you did with said option handling.
Signature · 1 line
Dmitry Kozlyuk
Z:\>ninja -C build\native\clang
ninja: Entering directory `build\native\clang'
[0/1] Regenerating build files.
The Meson build system
Version: 0.53.999
Source dir: \\10.0.2.4\qemu
Build dir: \\10.0.2.4\qemu\build\native\clang
Build type: native build
Program cat found: NO
Program more found: YES (C:\Windows\system32\more.COM)
Project name: DPDK
Project version: 20.02.0-rc1
C compiler for the host machine: clang (clang 9.0.1 "clang version 9.0.1 ")
C linker for the host machine: clang link 14.24.28316.0
Host machine cpu family: x86_64
Host machine cpu: x86_64
Program cat found: NO
Program more found: YES (C:\Windows\system32\more.COM)
Program ../buildtools/symlink-drivers-solibs.sh found: YES (sh \\10.0.2.4\qemu\config\../buildtools/symlink-drivers-solibs.sh) Checking for size of "void *" : 8
Library m found: NO
Library numa found: NO
Did not find pkg-config by name 'pkg-config'
Found Pkg-config: NO
Did not find CMake 'cmake'
Found CMake: NO
Run-time dependency libbsd found: NO (tried pkgconfig and cmake)
pcap-config found: NO
Run-time dependency pcap found: NO (tried pkgconfig and config-tool)
Compiler for C supports arguments -Wextra: YES (cached)
config\meson.build:202: WARNING: Consider using the built-in warning_level option instead of using "-Wextra". Compiler for C supports arguments -Wcast-qual: YES (cached)
Compiler for C supports arguments -Wdeprecated: YES (cached)
Compiler for C supports arguments -Wformat-nonliteral: YES (cached)
Compiler for C supports arguments -Wformat-security: YES (cached)
Compiler for C supports arguments -Wmissing-declarations: YES (cached)
Compiler for C supports arguments -Wmissing-prototypes: YES (cached)
Compiler for C supports arguments -Wnested-externs: YES (cached)
Compiler for C supports arguments -Wold-style-definition: YES (cached)
Compiler for C supports arguments -Wpointer-arith: YES (cached)
Compiler for C supports arguments -Wsign-compare: YES (cached)
Compiler for C supports arguments -Wstrict-prototypes: YES (cached)
Compiler for C supports arguments -Wundef: YES (cached)
Compiler for C supports arguments -Wwrite-strings: YES (cached)
Compiler for C supports arguments -Wno-address-of-packed-member: YES (cached)
Compiler for C supports arguments -Wno-packed-not-aligned: NO (cached)
Compiler for C supports arguments -Wno-missing-field-initializers: YES (cached)
Fetching value of define "__SSE4_2__" : 1 (cached)
Fetching value of define "__AES__" : 1 (cached)
Fetching value of define "__PCLMUL__" : 1 (cached)
Fetching value of define "__AVX__" : 1 (cached)
Fetching value of define "__AVX2__" : 1 (cached)
Fetching value of define "__AVX512F__" : (cached)
Fetching value of define "__RDRND__" : 1 (cached)
Fetching value of define "__RDSEED__" : 1 (cached)
Program gen-pmdinfo-cfile.sh found: YES (sh \\10.0.2.4\qemu\buildtools\gen-pmdinfo-cfile.sh)
Program check-experimental-syms.sh found: YES (sh \\10.0.2.4\qemu\buildtools\check-experimental-syms.sh) Program python3 found: YES (C:\Python\python.exe)
Program grep found: NO
Program findstr found: YES (C:\Windows\system32\findstr.EXE)
Compiler for C supports arguments -Wno-format-truncation: NO (cached)
Message: lib/librte_kvargs: Defining dependency "kvargs"
Checking for function "getentropy" : NO (cached)
Message: lib/librte_eal: Defining dependency "eal"
Program doxygen found: NO
Program sphinx-build found: NO
Library execinfo found: NO
Compiler for C supports arguments -Wno-format-truncation: NO (cached)
Configuring rte_build_config.h using configuration
Message:
=================
Libraries Enabled
=================
libs:
kvargs, eal,
Message:
===============
Drivers Enabled
===============
Message:
=================
Content Skipped
=================
libs:
drivers:
Build targets in project: 8
Found ninja.EXE-1.9.0 at "C:\Program Files\Meson\ninja.EXE"
[8/25] Compiling C object lib/76b5a35@@rte_eal@sta/librte_eal_common_rte_option.c.obj.
In file included from ../../../lib/librte_eal/common/rte_option.c:5:
..\..\..\lib/librte_eal/windows/eal/include\getopt.h:117:1: warning: unused function 'warnx' [-Wunused-function]warnx(const char *fmt, ...)
^
1 warning generated.
[9/25] Linking target lib/librte_kvargs-0.200.dll.
clang: warning: argument unused during compilation: '-pthread' [-Wunused-command-line-argument]
LINK : warning LNK4044: unrecognized option '/-no-as-needed'; ignored
Creating library lib\librte_kvargs.dll.a and object lib\librte_kvargs.dll.exp
[15/25] Compiling C object lib/76b5a35@@rte_eal@sta/librte_eal_windows_eal_eal.c.obj.
In file included from ../../../lib/librte_eal/windows/eal/eal.c:16:
In file included from ..\..\..\lib\librte_eal\common\eal_options.h:8:
..\..\..\lib/librte_eal/windows/eal/include\getopt.h:117:1: warning: unused function 'warnx' [-Wunused-function]warnx(const char *fmt, ...)
^
1 warning generated.
[16/25] Compiling C object lib/76b5a35@@rte_eal@sta/librte_eal_common_eal_common_thread.c.obj.../../../lib/librte_eal/common/eal_common_thread.c:170:25: warning: unused parameter 'attr' [-Wunused-parameter]
const pthread_attr_t *attr,
^
1 warning generated.
[17/25] Compiling C object lib/76b5a35@@rte_eal@sta/librte_eal_common_eal_common_options.c.obj.../../../lib/librte_eal/common/eal_common_options.c:263:10: warning: 'strerror' is deprecated: This function or variable may be unsafe. Consider using strerror_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. [-Wdeprecated-declarations]
path, strerror(errno));
^
C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\ucrt\string.h:181:16: note: 'strerror' has been explicitly marked deprecated here
_Check_return_ _CRT_INSECURE_DEPRECATE(strerror_s)
^
C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.24.28314\include\vcruntime.h:311:55: note: expanded from macro '_CRT_INSECURE_DEPRECATE'
#define _CRT_INSECURE_DEPRECATE(_Replacement) _CRT_DEPRECATE_TEXT( \
^
C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.24.28314\include\vcruntime.h:301:47: note: expanded from macro '_CRT_DEPRECATE_TEXT'
#define _CRT_DEPRECATE_TEXT(_Text) __declspec(deprecated(_Text))
^../../../lib/librte_eal/common/eal_common_options.c:317:1: warning: control reaches end of non-void function [-Wreturn-type] }
^
In file included from ../../../lib/librte_eal/common/eal_common_options.c:15:
..\..\..\lib/librte_eal/windows/eal/include\getopt.h:117:1: warning: unused function 'warnx' [-Wunused-function] warnx(const char *fmt, ...)
^../../../lib/librte_eal/common/eal_common_options.c:107:20: warning: unused variable 'default_solib_dir' [-Wunused-variable]
static const char *default_solib_dir = RTE_EAL_PMD_PATH;
^../../../lib/librte_eal/common/eal_common_options.c:251:1: warning: unused function 'eal_plugindir_init' [-Wunused-function] eal_plugindir_init(const char *path)
^
5 warnings generated.
[24/25] Linking target examples/dpdk-helloworld.exe.
clang: warning: argument unused during compilation: '-pthread' [-Wunused-command-line-argument]
LINK : warning LNK4044: unrecognized option '/-no-as-needed'; ignored
[25/25] Linking target lib/librte_eal-0.200.dll.
clang: warning: argument unused during compilation: '-pthread' [-Wunused-command-line-argument]
LINK : warning LNK4044: unrecognized option '/-no-as-needed'; ignored
Creating library lib\librte_eal.dll.a and object lib\librte_eal.dll.exp
Re: [dpdk-dev] [PATCH v7 9/9] eal: add minimum viable code to support parsing
As discussed in community meeting, the goal was to have core parsing in Windows EAL 20.02.
Given that there is a crash and a doubt on the imported getopt library, I think it's better to postpone this series to 20.05.
06/02/2020 07:41, Dmitry Kozlyuk:
Quoted 62 lines
Quoted 15 lines · Pallavi Kadam
Quoted 10 lines · Dmitry Kozlyuk
Quoted 1 line
Crashes at argument parsing, WinDbg log attached.
This patch works fine with meson=0.49.
I was able to execute the 'helloworld' app.When I tried to build with meson=0.52 it failed with the error:
[9/25] Linking targetlib/librte_kvargs-20.0.dll.
FAILED:lib/librte_kvargs-20.0.dll
clang @lib/librte_kvargs-20.0.dll.rsp
clang: error: no such file or directory: '/OPT:REF'Fixed this error with the patch you sent before.
were able to execute parsing:Quoted 11 lines
$ ./build/examples/dpdk-helloworld.exe -l 4-8 EAL: Detected 20 lcore(s) EAL: Detected 2 NUMA nodes hello from core 5 hello from core 6 hello from core 7 hello from core 8 hello from core 4Quoted 2 lines
Not completely sure, if this could be the reason for the crash.
The crash does not happen with any arguments, "-l 4-8" works fine as do "-cf" and "-v", but "--log-level=eal:8" crashes reproducibly. I assume application should not crash on invalid options, but report an error and exit. For the reference, I applied your patchset to the latest dpdk:master.
Z:\>build\native\clang\examples\dpdk-helloworld.exe
EAL: Detected 4 lcore(s)
EAL: Detected 1 NUMA nodesOK, no lcores specified.
Z:\>build\native\clang\examples\dpdk-helloworld.exe -cf
EAL: Detected 4 lcore(s)
EAL: Detected 1 NUMA nodes
hello from core 1
hello from core 2
hello from core 3
hello from core 0OK, 4 lcores enabled.
Z:\>build\native\clang\examples\dpdk-helloworld.exe -cf --log-level=eal:8
Crash, WinDbg log attached to bug report.
Z:\>echo %errorlevel%
-1073741819Z:\>
Attaching the build log, but I don't think it matters, it's something with getopt implementation or it's use, judging by stack trace.
P.S. I can also see "--syslog" option in the help message, you should probably hide it via #ifndef, as you did with said option handling.
Re: [dpdk-dev] [PATCH v7 9/9] eal: add minimum viable code to support parsing
Quoted 6 lines · Thomas Monjalon
As discussed in community meeting, the goal was to have core parsing in Windows EAL 20.02.
Given that there is a crash and a doubt on the imported getopt library, I think it's better to postpone this series to 20.05.
Thomas...
We have fixed the crash in the v8 series of this patch - Pallavi sent it out for review last night. (It was a simple fix)
Can we please get this merged into 20.02? It would be great to progress Windows support in this release. (The initial Windows support was merged in 19.02, so it's been a year since we moved it forward! :-))
thanks,
Ranjit
Re: [dpdk-dev] [PATCH v7 9/9] eal: add minimum viable code to support parsing
Quoted 12 lines · Ranjit Menon
Quoted 6 lines · Thomas Monjalon
As discussed in community meeting, the goal was to have core parsing in Windows EAL 20.02.
Given that there is a crash and a doubt on the imported getopt library, I think it's better to postpone this series to 20.05.Thomas...
We have fixed the crash in the v8 series of this patch - Pallavi sent it out for review last night. (It was a simple fix)
Quoted 7 lines
Can we please get this merged into 20.02? It would be great to progress Windows support in this release. (The initial Windows support was merged in 19.02, so it's been a year since we moved it forward! :-))
thanks,
Ranjit
Sorry, I believe the initial patches were merged in 19.05, still a long time!
@Dmitry: If you could do some rudimentary tests and ACK the v8 series of this patch, it would be very helpful. thanks,
Ranjit
Re: [dpdk-dev] [EXTERNAL] Re: [PATCH v7 9/9] eal: add minimum viable code to support parsing
In reply to Thomas MonjalonQuoted 4 lines · Thomas Monjalon
As discussed in community meeting, the goal was to have core parsing in Windows EAL 20.02.
Given that there is a crash and a doubt on the imported getopt library, I think it's better to postpone this series to 20.05.
The crash is now fixed in the last patchset version.
I tested and observed no crashes.
Quoted 65 lines
06/02/2020 07:41, Dmitry Kozlyuk:
Quoted 59 lines
Quoted 14 lines · Pallavi Kadam
Quoted 10 lines · Dmitry Kozlyuk
Quoted 1 line
Crashes at argument parsing, WinDbg log attached.
This patch works fine with meson=0.49.
I was able to execute the 'helloworld' app.When I tried to build with meson=0.52 it failed with the error:
[9/25] Linking targetlib/librte_kvargs-20.0.dll.
FAILED:lib/librte_kvargs-20.0.dll
clang @lib/librte_kvargs-20.0.dll.rsp
clang: error: no such file or directory: '/OPT:REF'Fixed this error with the patch you sent before.
were able to execute parsing:Quoted 10 lines
$ ./build/examples/dpdk-helloworld.exe -l 4-8 EAL: Detected 20 lcore(s) EAL: Detected 2 NUMA nodes hello from core 5 hello from core 6 hello from core 7 hello from core 8 hello from core 4Quoted 1 line
Not completely sure, if this could be the reason for the crash.
The crash does not happen with any arguments, "-l 4-8" works fine as do "-cf" and "-v", but "--log-level=eal:8" crashes reproducibly. I assume application should not crash on invalid options, but report an error and exit. For the reference, I applied your patchset to the latest dpdk:master.
Z:\>build\native\clang\examples\dpdk-helloworld.exe
EAL: Detected 4 lcore(s)
EAL: Detected 1 NUMA nodesOK, no lcores specified.
Z:\>build\native\clang\examples\dpdk-helloworld.exe -cf
EAL: Detected 4 lcore(s)
EAL: Detected 1 NUMA nodes
hello from core 1
hello from core 2
hello from core 3
hello from core 0OK, 4 lcores enabled.
Z:\>build\native\clang\examples\dpdk-helloworld.exe -cf --log-level=eal:8
Crash, WinDbg log attached to bug report.
Z:\>echo %errorlevel%
-1073741819Z:\>
Attaching the build log, but I don't think it matters, it's something with getopt implementation or it's use, judging by stack trace.
P.S. I can also see "--syslog" option in the help message, you should probably hide it via #ifndef, as you did with said option handling.
Re: [dpdk-dev] [PATCH v7 9/9] eal: add minimum viable code to support parsing
In reply to Dmitry KozlyukHi Dmitry,
Quoted 51 lines · Dmitry Kozlyuk
Quoted 16 lines · Pallavi Kadam
Quoted 11 lines · Dmitry Kozlyuk
Quoted 1 line
Crashes at argument parsing, WinDbg log attached.
This patch works fine with meson=0.49.
I was able to execute the 'helloworld' app.When I tried to build with meson=0.52 it failed with the error:
[9/25] Linking targetlib/librte_kvargs-20.0.dll.
FAILED:lib/librte_kvargs-20.0.dll
clang @lib/librte_kvargs-20.0.dll.rsp
clang: error: no such file or directory: '/OPT:REF'Fixed this error with the patch you sent before.
were able to execute parsing:Quoted 10 lines
$ ./build/examples/dpdk-helloworld.exe -l 4-8 EAL: Detected 20 lcore(s) EAL: Detected 2 NUMA nodes hello from core 5 hello from core 6 hello from core 7 hello from core 8 hello from core 4Quoted 1 line
Not completely sure, if this could be the reason for the crash.
The crash does not happen with any arguments, "-l 4-8" works fine as do "-cf" and "-v", but "--log-level=eal:8" crashes reproducibly. I assume application should not crash on invalid options, but report an error and exit. For the reference, I applied your patchset to the latest dpdk:master.
Z:\>build\native\clang\examples\dpdk-helloworld.exe
EAL: Detected 4 lcore(s)
EAL: Detected 1 NUMA nodesOK, no lcores specified.
Z:\>build\native\clang\examples\dpdk-helloworld.exe -cf
EAL: Detected 4 lcore(s)
EAL: Detected 1 NUMA nodes
hello from core 1
hello from core 2
hello from core 3
hello from core 0OK, 4 lcores enabled.
Z:\>build\native\clang\examples\dpdk-helloworld.exe -cf --log-level=eal:8
Crash, WinDbg log attached to bug report.
Quoted 7 lines
Z:\>echo %errorlevel%
-1073741819Z:\>
Attaching the build log, but I don't think it matters, it's something with getopt implementation or it's use, judging by stack trace.
Thanks for the detailed log.
There was bit size issue in getopt file. We fixed the issue. Please try v8 and let us know.
Quoted 3 lines
P.S. I can also see "--syslog" option in the help message, you should probably hide it via #ifndef, as you did with said option handling.
Incorporated in v8. Thanks
Quoted 1 line
v8 cover Windows patchset with additional EAL functionalities
In reply to Pallavi KadamThis patchset includes additional functionalities for Windows EAL to support command-line parsing feature and some EAL common code on Windows.
This patchset can be applied to windpdk-next-dev branch in the draft repo.
v8 changes:
Fixed the naming conventions.
Fixed a crash encountered due to getopt function. Removed "--syslog" from help options for Windows.
v7 changes:
Removed Windows "eal_filesystem.h" for now and will be added later if required. Currently, Windows EAL uses common version of eal_filesystem.h.
v6 changes:
Removed sysfs function as it was not required on Windows. Removed syslog and dlfcn support for Windows.
v5 changes:
Fixed indentation in patch 6.
v4 changes:
Modified license/exceptions.txt file.
The following files in this patch-set require license exceptions as listed:
dirent.h MIT license
getopt.h BSD-2-Clause license
getopt.c ISC and BSD-2-Clause license
Removed syslog file in Windows and added ifndef Windows around syslog classification parameters in the common code.
v3 Changes:
Modified generic rte_vect to add Windows support. Moved RTE_CPU* definitions to OS specific file. Added SPDX tag on top of third party files.
v2 Changes:
syslog.h: Replaced the BSD license boilerplate to SPDX tag.
Pallavi Kadam (9):
license: add license exception for windows
eal: dirent.h implementation for windows
eal: add additional function overrides in windows header files
eal: getopt implementation for windows
eal: add function to detect process type
eal: include SSE4 support for windows
eal: remove syslog and dlfcn support for windows
build: add additional common files support
eal: add minimum viable code to support parsing
lib/librte_eal/common/eal_common_options.c | 14 + .../common/include/arch/x86/rte_vect.h | 4 +- lib/librte_eal/windows/eal/eal.c | 194 ++++- lib/librte_eal/windows/eal/eal_debug.c | 1 + lib/librte_eal/windows/eal/eal_lcore.c | 3 + lib/librte_eal/windows/eal/eal_thread.c | 11 + lib/librte_eal/windows/eal/getopt.c | 470 +++++++++++++ lib/librte_eal/windows/eal/include/dirent.h | 664 ++++++++++++++++++ lib/librte_eal/windows/eal/include/getopt.h | 92 +++ lib/librte_eal/windows/eal/include/pthread.h | 66 ++ lib/librte_eal/windows/eal/include/rte_os.h | 42 ++ lib/librte_eal/windows/eal/include/sched.h | 46 ++ .../windows/eal/include/sys/queue.h | 8 + lib/librte_eal/windows/eal/meson.build | 9 +- license/exceptions.txt | 12 +- 15 files changed, 1625 insertions(+), 11 deletions(-) create mode 100644 lib/librte_eal/windows/eal/getopt.c create mode 100644 lib/librte_eal/windows/eal/include/dirent.h create mode 100644 lib/librte_eal/windows/eal/include/getopt.h
Signature · 1 line
2.18.0.windows.1
PATCH v8 1/9 license: add license exception for windows
The Governing Board and Tech Board have provided exceptions for MIT and BSD-2-Clause license files for DPDK support on Windows.
--- license/exceptions.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
license/exceptions.txt +7 -5
@@ -9,9 +9,11 @@ Note that following licenses are not exceptions:- - Dual BSD-3-Clause OR LGPL-2.1 - GPL-2.0 (*Only for kernel code*) ------------------------------------------------------------------ +--------------------------------------------------------------------------------------------------- SPDX Identifier TB Approval Date GB Approval Date File name ------------------------------------------------------------------ -1. - ------------------------------------------------------------------ +--------------------------------------------------------------------------------------------------- +1.MIT 11/12/2019 11/12/2019 lib/librte_eal/windows/eal/include/dirent.h +2.BSD-2-Clause 01/08/2020 01/08/2020 lib/librte_eal/windows/eal/include/getopt.h +3.ISC AND + BSD-2-Clause 01/08/2020 01/08/2020 lib/librte_eal/windows/eal/getopt.c +---------------------------------------------------------------------------------------------------
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [EXTERNAL] [PATCH v8 1/9] license: add license exception for windows
Quoted 8 lines · Pallavi Kadam
The Governing Board and Tech Board have provided exceptions for MIT and BSD-2-Clause license files for DPDK support on Windows.
Signed-off-by Pallavi Kadam <[email protected]>Reviewed-by Ranjit Menon <[email protected]>--- license/exceptions.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
Re: [dpdk-dev] [PATCH v8 1/9] license: add license exception for windows
In reply to Pallavi Kadam07/02/2020 04:14, Pallavi Kadam:
Quoted 5 lines
The Governing Board and Tech Board have provided exceptions for MIT and BSD-2-Clause license files for DPDK support on Windows.
Signed-off-by Pallavi Kadam <[email protected]>Reviewed-by Ranjit Menon <[email protected]>
Quoted 7 lines
---
+--------------------------------------------------------------------------------------------------- +1.MIT 11/12/2019 11/12/2019 lib/librte_eal/windows/eal/include/dirent.h +2.BSD-2-Clause 01/08/2020 01/08/2020 lib/librte_eal/windows/eal/include/getopt.h+3.ISC AND
+ BSD-2-Clause 01/08/2020 01/08/2020lib/librte_eal/windows/eal/getopt.c
+---------------------------------------------------------------------------------------------------
I fixed the dates according to my records:
1.MIT 10/23/2019 02/10/2020 lib/librte_eal/windows/eal/include/dirent.h 2.BSD-2-Clause 10/23/2019 12/18/2019 lib/librte_eal/windows/eal/include/getopt.h
3.ISC AND
BSD-2-Clause 10/23/2019 12/18/2019 lib/librte_eal/windows/eal/getopt.c
Re: [dpdk-dev] [PATCH v8 1/9] license: add license exception for windows
Quoted 14 lines · Thomas Monjalon
07/02/2020 04:14, Pallavi Kadam:
Quoted 5 lines
The Governing Board and Tech Board have provided exceptions for MIT and BSD-2-Clause license files for DPDK support on Windows.
Signed-off-by Pallavi Kadam <[email protected]>Reviewed-by Ranjit Menon <[email protected]>Quoted 7 lines
---
+--------------------------------------------------------------------------------------------------- +1.MIT 11/12/2019 11/12/2019 lib/librte_eal/windows/eal/include/dirent.h +2.BSD-2-Clause 01/08/2020 01/08/2020 lib/librte_eal/windows/eal/include/getopt.h+3.ISC AND
+ BSD-2-Clause 01/08/2020 01/08/2020lib/librte_eal/windows/eal/getopt.c
+---------------------------------------------------------------------------------------------------
Quoted 9 lines
I fixed the dates according to my records:
1.MIT 10/23/2019 02/10/2020 lib/librte_eal/windows/eal/include/dirent.h 2.BSD-2-Clause 10/23/2019 12/18/2019 lib/librte_eal/windows/eal/include/getopt.h3.ISC AND
BSD-2-Clause 10/23/2019 12/18/2019lib/librte_eal/windows/eal/getopt.c
Thanks, Thomas!
Pallavi and I were discussing this just yesterday and we thought that we should send an update with the new dates. Thanks for taking care of this.
ranjit m.
PATCH v8 2/9 eal: dirent.h implementation for windows
In reply to Pallavi KadamAdding dirent.h on Windows to support common code. eal_common_options.c includes this file.
The original contribution is under MIT license.
https://github.com/tronkko/dirent
--- lib/librte_eal/windows/eal/include/dirent.h | 664 ++++++++++++++++++++ 1 file changed, 664 insertions(+) create mode 100644 lib/librte_eal/windows/eal/include/dirent.h
lib/librte_eal/windows/eal/include/dirent.h new file +664 -0
@@ -0,0 +1,664 @@ +/* SPDX-License-Identifier: MIT +* Dirent interface for Microsoft Visual Studio +* Version 1.21 +* Copyright (C) 2006-2012 Toni Ronkko +* https://github.com/tronkko/dirent +*/ + +#ifndef DIRENT_H +#define DIRENT_H + +/* +* Include windows.h without Windows Sockets 1.1 to prevent conflicts with +* Windows Sockets 2.0. +*/ +#ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif + +#include <windows.h> + +#include <stdio.h> +#include <stdarg.h> +#include <wchar.h> +#include <string.h> +#include <stdlib.h> +#include <malloc.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <errno.h> + +/* Maximum length of file name */ +#if !defined(PATH_MAX ) +# define PATH_MAX MAX_PATH +#endif + +/* File type flags for d_type */ +#define DT_UNKNOWN 0 +#define DT_REG S_IFREG +#define DT_DIR S_IFDIR +#define DT_CHR S_IFCHR + +/* +* File type macros. Note that block devices, sockets and links cannot be +* distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are +* only defined for compatibility. These macros should always return false +* on Windows. +*/ +#if !defined(S_ISDIR ) +# define S_ISDIR (mode) (((mode) & S_IFMT) == S_IFDIR) +#endif +#if !defined(S_ISREG ) +# define S_ISREG (mode) (((mode) & S_IFMT) == S_IFREG) +#endif + +/* Wide-character version */ +struct _wdirent { +/* Always zero */ +long d_ino; + +/* Structure size */ +unsigned short d_reclen; + +/* Length of name without \0 */ +size_t d_namlen; + +/* File type */ +int d_type; + +/* File name */ +wchar_t d_name[PATH_MAX ]; +}; +typedef struct _wdirent _wdirent ; + +struct _WDIR { +/* Current directory entry */ +struct _wdirent ent; + +/* Private file data */ +WIN32_FIND_DATAW data; + +/* True if data is valid */ +int cached; + +/* Win32 search handle */ +HANDLE handle; + +/* Initial directory name */ +wchar_t *patt; +}; +typedef struct _WDIR _WDIR ; + +static _WDIR *_wopendir (const wchar_t *dirname); +static int _wclosedir (_WDIR *dirp); + +/* For compatibility with Symbian */ +#define wdirent _wdirent +#define WDIR _WDIR +#define wopendir _wopendir +#define wclosedir _wclosedir + +/* Multi-byte character versions */ +struct dirent { +/* Always zero */ +long d_ino; + +/* Structure size */ +unsigned short d_reclen; + +/* Length of name without \0 */ +size_t d_namlen; + +/* File type */ +int d_type; + +/* File name */ +char d_name[PATH_MAX ]; +}; +typedef struct dirent dirent ; + +struct DIR { +struct dirent ent; +struct _WDIR *wdirp; +}; +typedef struct DIR DIR ; + +static DIR *opendir (const char *dirname); +static struct dirent *readdir (DIR *dirp); +static int closedir (DIR *dirp); + +/* Internal utility functions */ +static WIN32_FIND_DATAW *dirent_first (_WDIR *dirp); +static WIN32_FIND_DATAW *dirent_next (_WDIR *dirp); + +static int dirent_mbstowcs_s ( +size_t *pReturnValue, +wchar_t *wcstr, +size_t sizeInWords, +const char *mbstr, +size_t count); + +static int dirent_wcstombs_s ( +size_t *pReturnValue, +char *mbstr, +size_t sizeInBytes, +const wchar_t *wcstr, +size_t count); + +static void dirent_set_errno (int error); + +/* +* Open directory stream DIRNAME for read and return a pointer to the +* internal working area that is used to retrieve individual directory +* entries. +*/ +static _WDIR * +_wopendir (const wchar_t *dirname) +{ +_WDIR *dirp =NULL ; +int error; + +/* Must have directory name */ +if (dirname ==NULL || dirname[0 ] =='\0' ) { +dirent_set_errno (ENOENT ); +return NULL ; + } + +/* Allocate new _WDIR structure */ + dirp = (_WDIR *)malloc (sizeof (struct _WDIR )); +if (dirp !=NULL ) { +DWORD n; + +/* Reset _WDIR structure */ + dirp->handle =INVALID_HANDLE_VALUE ; + dirp->patt =NULL ; + dirp->cached =0 ; + +/* Compute the length of full path plus zero terminator +* +* Note that on WinRT there's no way to convert relative paths +* into absolute paths, so just assume its an absolute path. +*/ +#if defined(WINAPI_FAMILY ) && (WINAPI_FAMILY ==WINAPI_FAMILY_PHONE_APP ) + n =wcslen (dirname); +#else + n =GetFullPathNameW (dirname,0 ,NULL ,NULL ); +#endif + +/* Allocate room for absolute directory name and search +* pattern +*/ + dirp->patt = (wchar_t *)malloc (sizeof (wchar_t) * n +16 ); +if (dirp->patt) { +/* Convert relative directory name to an +* absolute one. This allows rewinddir() to +* function correctly even when current working +* directory is changed between opendir() +* and rewinddir(). +* +* Note that on WinRT there's no way to convert +* relative paths into absolute paths, so just +* assume its an absolute path. +*/ +#if defined(WINAPI_FAMILY ) && \ + (WINAPI_FAMILY ==WINAPI_FAMILY_PHONE_APP ) +wcsncpy_s (dirp->patt, n +1 , dirname, n); +#else + n =GetFullPathNameW (dirname, n, dirp->patt,NULL ); +#endif +if (n >0 ) { +wchar_t *p; + +/* Append search pattern \* to the directory +* name +*/ + p = dirp->patt + n; +if (dirp->patt < p) { +switch (p[-1 ]) { +case '\\' : +case '/' : +case ':' : +/* Directory ends in path separator, +* e.g.c:\temp\ +*/ +/*NOP*/ ; +break ; + +default : +/* Directory name doesn't end in path +* separator +*/ + *p++ ='\\' ; + } + } + *p++ ='*' ; + *p ='\0' ; + +/* Open directory stream and retrieve the first +* entry +*/ +if (dirent_first (dirp)) { +/* Directory stream opened successfully */ + error =0 ; + }else { +/* Cannot retrieve first entry */ + error =1 ; +dirent_set_errno (ENOENT ); + } + + }else { +/* Cannot retrieve full path name */ +dirent_set_errno (ENOENT ); + error =1 ; + } + + }else { +/* Cannot allocate memory for search pattern */ + error =1 ; + } + + }else { +/* Cannot allocate _WDIR structure */ + error =1 ; + } + +/* Clean up in case of error */ +if (error && dirp) { +_wclosedir (dirp); + dirp =NULL ; + } + +return dirp; +} + +/* +* Close directory stream opened by opendir() function. +* This invalidates the DIR structure as well as any directory +* entry read previously by _wreaddir(). +*/ +static int +_wclosedir (_WDIR *dirp) +{ +int ok; +if (dirp) { + +/* Release search handle */ +if (dirp->handle !=INVALID_HANDLE_VALUE ) { +FindClose (dirp->handle); + dirp->handle =INVALID_HANDLE_VALUE ; + } + +/* Release search pattern */ +if (dirp->patt) { +free (dirp->patt); + dirp->patt =NULL ; + } + +/* Release directory structure */ +free (dirp); + ok =/*success*/ 0 ; + + }else { +/* Invalid directory stream */ +dirent_set_errno (EBADF ); + ok =/*failure*/ -1 ; + } +return ok; +} + +/* Get first directory entry (internal) */ +static WIN32_FIND_DATAW * +dirent_first (_WDIR *dirp) +{ +WIN32_FIND_DATAW *datap; + +/* Open directory and retrieve the first entry */ + dirp->handle =FindFirstFileExW ( + dirp->patt, FindExInfoStandard, &dirp->data, + FindExSearchNameMatch,NULL ,0 ); +if (dirp->handle !=INVALID_HANDLE_VALUE ) { + +/* a directory entry is now waiting in memory */ + datap = &dirp->data; + dirp->cached =1 ; + + }else { + +/* Failed to re-open directory: no directory entry in memory */ + dirp->cached =0 ; + datap =NULL ; + + } +return datap; +} + +/* Get next directory entry (internal) */ +static WIN32_FIND_DATAW * +dirent_next (_WDIR *dirp) +{ +WIN32_FIND_DATAW *p; + +/* Get next directory entry */ +if (dirp->cached !=0 ) { + +/* A valid directory entry already in memory */ + p = &dirp->data; + dirp->cached =0 ; + + }else if (dirp->handle !=INVALID_HANDLE_VALUE ) { + +/* Get the next directory entry from stream */ +if (FindNextFileW (dirp->handle, &dirp->data) != FALSE) { +/* Got a file */ + p = &dirp->data; + }else { +/* The very last entry has been processed +*or an error occurred +*/ +FindClose (dirp->handle); + dirp->handle =INVALID_HANDLE_VALUE ; + p =NULL ; + } + + }else { + +/* End of directory stream reached */ + p =NULL ; + + } + +return p; +} + +/* +* Open directory stream using plain old C-string. +*/ +static DIR * +opendir (const char *dirname) +{ +struct DIR *dirp; +int error; + +/* Must have directory name */ +if (dirname ==NULL || dirname[0 ] =='\0' ) { +dirent_set_errno (ENOENT ); +return NULL ; + } + +/* Allocate memory for DIR structure */ + dirp = (DIR *)malloc (sizeof (struct DIR )); +if (dirp) { +wchar_t wname[PATH_MAX ]; +size_t n; + +/* Convert directory name to wide-character string */ + error =dirent_mbstowcs_s (&n, wname,PATH_MAX , + dirname,PATH_MAX ); +if (!error) { + +/* Open directory stream using wide-character name */ + dirp->wdirp =_wopendir (wname); +if (dirp->wdirp) { +/* Directory stream opened */ + error =0 ; + }else { +/* Failed to open directory stream */ + error =1 ; + } + + }else { +/* +* Cannot convert file name to wide-character string. +* This occurs if the string contains invalid multi-byte +* sequences or the output buffer is too small to +* contain the resulting string. +*/ + error =1 ; + } + + }else { +/* Cannot allocate DIR structure */ + error =1 ; + } + +/* Clean up in case of error */ +if (error && dirp) { +free (dirp); + dirp =NULL ; + } + +return dirp; +} + +/* +* Read next directory entry. +* +* When working with text consoles, please note that file names +* returned by readdir() are represented in the default ANSI code +* page while any output toconsole is typically formatted on another +* code page. Thus, non-ASCII characters in file names will not usually +* display correctly on console. The problem can be fixed in two ways: +* (1) change the character set of console to 1252 using chcp utility +* and use Lucida Console font, or (2) use _cprintf function when +* writing to console. The _cprinf() will re-encode ANSI strings to the +* console code page so many non-ASCII characters will display correcly. +*/ +static struct dirent * +readdir (DIR *dirp) +{ +WIN32_FIND_DATAW *datap; +struct dirent *entp; + +/* Read next directory entry */ + datap =dirent_next (dirp->wdirp); +if (datap) { +size_t n; +int error; + +/* Attempt to convert file name to multi-byte string */ + error =dirent_wcstombs_s (&n, dirp->ent.d_name, +PATH_MAX , datap->cFileName,PATH_MAX ); + +/* +* If the file name cannot be represented by a multi-byte +* string, then attempt to use old 8+3 file name. +* This allows traditional Unix-code to access some file +* names despite of unicode characters, although file names +* may seem unfamiliar to the user. +* +* Be ware that the code below cannot come up with a short +* file name unless the file system provides one. At least +* VirtualBox shared folders fail to do this. +*/ +if (error && datap->cAlternateFileName[0 ] !='\0' ) { + error =dirent_wcstombs_s ( + &n, dirp->ent.d_name,PATH_MAX , + datap->cAlternateFileName,PATH_MAX ); + } + +if (!error) { +DWORD attr; + +/* Initialize directory entry for return */ + entp = &dirp->ent; + +/* Length of file name excluding zero terminator */ + entp->d_namlen = n -1 ; + +/* File attributes */ + attr = datap->dwFileAttributes; +if ((attr &FILE_ATTRIBUTE_DEVICE ) !=0 ) + entp->d_type =DT_CHR ; +else if ((attr &FILE_ATTRIBUTE_DIRECTORY ) !=0 ) + entp->d_type =DT_DIR ; +else + entp->d_type =DT_REG ; + +/* Reset dummy fields */ + entp->d_ino =0 ; + entp->d_reclen =sizeof (struct dirent ); + + }else { +/* +* Cannot convert file name to multi-byte string so +* construct an errornous directory entry and return +* that. Note that we cannot return NULL as that would +* stop the processing of directory entries completely. +*/ + entp = &dirp->ent; + entp->d_name[0 ] ='?' ; + entp->d_name[1 ] ='\0' ; + entp->d_namlen =1 ; + entp->d_type =DT_UNKNOWN ; + entp->d_ino =0 ; + entp->d_reclen =0 ; + } + + }else { +/* No more directory entries */ + entp =NULL ; + } + +return entp; +} + +/* +* Close directory stream. +*/ +static int +closedir (DIR *dirp) +{ +int ok; +if (dirp) { + +/* Close wide-character directory stream */ + ok =_wclosedir (dirp->wdirp); + dirp->wdirp =NULL ; + +/* Release multi-byte character version */ +free (dirp); + + }else { + +/* Invalid directory stream */ +dirent_set_errno (EBADF ); + ok =/*failure*/ -1 ; + + } +return ok; +} + +/* Convert multi-byte string to wide character string */ +static int +dirent_mbstowcs_s ( +size_t *pReturnValue, +wchar_t *wcstr, +size_t sizeInWords, +const char *mbstr, +size_t count) +{ +int error; + +#if defined(_MSC_VER) && _MSC_VER >=1400 +/* Microsoft Visual Studio 2005 or later */ + error =mbstowcs_s (pReturnValue, wcstr, + sizeInWords, mbstr, count); +#else + +/* Older Visual Studio or non-Microsoft compiler */ +size_t n; + +/* Convert to wide-character string (or count characters) */ + n =mbstowcs (wcstr, mbstr, sizeInWords); +if (!wcstr || n < count) { + +/* Zero-terminate output buffer */ +if (wcstr && sizeInWords) { +if (n >= sizeInWords) + n = sizeInWords -1 ; + wcstr[n] =0 ; + } + +/* Length of resuting multi-byte string WITH zero +*terminator +*/ +if (pReturnValue) + *pReturnValue = n +1 ; + +/* Success */ + error =0 ; + + }else { + +/* Could not convert string */ + error =1 ; + + } +#endif + +return error; +} + +/* Convert wide-character string to multi-byte string */ +static int +dirent_wcstombs_s ( +size_t *pReturnValue, +char *mbstr, +size_t sizeInBytes,/* max size of mbstr */ +const wchar_t *wcstr, +size_t count) +{ +int error; + +#if defined(_MSC_VER) && _MSC_VER >=1400 +/* Microsoft Visual Studio 2005 or later */ + error =wcstombs_s (pReturnValue, mbstr, sizeInBytes, wcstr, count); +#else +/* Older Visual Studio or non-Microsoft compiler */ +size_t n; + +/* Convert to multi-byte string +* (or count the number of bytes needed) +*/ + n =wcstombs (mbstr, wcstr, sizeInBytes); +if (!mbstr || n < count) { +/* Zero-terminate output buffer */ +if (mbstr && sizeInBytes) { +if (n >= sizeInBytes) + n = sizeInBytes -1 ; + mbstr[n] ='\0' ; + } +/* Length of resulting multi-bytes string WITH +*zero-terminator +*/ +if (pReturnValue) + *pReturnValue = n +1 ; +/* Success */ + error =0 ; + }else { +/* Cannot convert string */ + error =1 ; + } +#endif + +return error; +} + +/* Set errno variable */ +static void +dirent_set_errno (int error) +{ +#if defined(_MSC_VER) && _MSC_VER >=1400 +/* Microsoft Visual Studio 2005 and later */ +_set_errno (error); +#else + +/* Non-Microsoft compiler or older Microsoft compiler */ + errno = error; +#endif +} + +#ifdef __cplusplus +} +#endif +#endif /*DIRENT_H*/
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [EXTERNAL] [PATCH v8 2/9] eal: dirent.h implementation for windows
Quoted 6 lines · Pallavi Kadam
Adding
dirent.hon Windows to support common code.eal_common_options.cincludes this file.The original contribution is under MIT license.
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Ftronkko%2Fdirent&data=02%7C01%7CNarcisa.Vasile%40microsoft.com%7C0bc1f84503194981e75f08d7ab7c1e5b%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637166421901560917&sdata=QhridVhRo5psnyCYGBzHDOHvhZ0JPLsoy5hJ1XA6SKU%3D&reserved=0
Quoted 8 lines
Signed-off-by Antara Ganesh Kolar <[email protected]>Signed-off-by Pallavi Kadam <[email protected]>Reviewed-by Ranjit Menon <[email protected]>Reviewed-by Keith Wiles <[email protected]>--- lib/librte_eal/windows/eal/include/dirent.h | 664 ++++++++++++++++++++ 1 file changed, 664 insertions(+) create mode 100644 lib/librte_eal/windows/eal/include/dirent.h
PATCH v8 3/9 eal: add additional function overrides in windows header files
In reply to Pallavi KadamAdding additional function definitions for pthread, cpuset implementation, asprintf implementation, in order to support common code.
--- lib/librte_eal/windows/eal/include/pthread.h | 66 +++++++++++++++++++ lib/librte_eal/windows/eal/include/rte_os.h | 42 ++++++++++++ lib/librte_eal/windows/eal/include/sched.h | 46 +++++++++++++ .../windows/eal/include/sys/queue.h | 8 +++ 4 files changed, 162 insertions(+)
lib/librte_eal/windows/eal/include/pthread.h +66 -0
@@ -14,12 +14,78 @@extern "C" {#endif +#include <Windows.h> + +#define PTHREAD_BARRIER_SERIAL_THREAD TRUE +/* defining pthread_t type on Windows since there is no in Microsoft libc*/ typedef uintptr_t pthread_t ;/* defining pthread_attr_t type on Windows since there is no in Microsoft libc*/ typedef void *pthread_attr_t ; +typedef SYNCHRONIZATION_BARRIER pthread_barrier_t ; + +#define pthread_barrier_init (barrier, attr, count) \ + InitializeSynchronizationBarrier(barrier, count, -1) +#define pthread_barrier_wait (barrier) EnterSynchronizationBarrier(barrier, \ + SYNCHRONIZATION_BARRIER_FLAGS_BLOCK_ONLY) +#define pthread_barrier_destroy (barrier) \ + DeleteSynchronizationBarrier(barrier) +#define pthread_cancel (thread) TerminateThread((HANDLE) thread, 0) + +/* pthread function overrides */ +#define pthread_self () \ + ((pthread_t)GetCurrentThreadId()) +#define pthread_setaffinity_np (thread, size, cpuset) \ + eal_set_thread_affinity_mask(thread, (unsigned long *) cpuset) +#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) + +static inline int +eal_set_thread_affinity_mask (pthread_t threadid,unsigned long *cpuset) +{ +SetThreadAffinityMask ((HANDLE ) threadid, *cpuset); +return 0 ; +} + +static inline int +eal_get_thread_affinity_mask (pthread_t threadid,unsigned long *cpuset) +{ +/* Workaround for the lack of a GetThreadAffinityMask() +*API in Windows +*/ +/* obtain previous mask by setting dummy mask */ +DWORD dwprevaffinitymask = +SetThreadAffinityMask ((HANDLE ) threadid,0x1 ); +/* set it back! */ +SetThreadAffinityMask ((HANDLE ) threadid, dwprevaffinitymask); + *cpuset = dwprevaffinitymask; +return 0 ; +} + +static inline int +eal_create_thread (void *threadid,void *threadfunc,void *args) +{ +HANDLE hThread; + hThread =CreateThread (NULL ,0 , (LPTHREAD_START_ROUTINE )threadfunc, + args,0 , (LPDWORD )threadid); +if (hThread) { +SetPriorityClass (GetCurrentProcess (),REALTIME_PRIORITY_CLASS ); +SetThreadPriority (hThread,THREAD_PRIORITY_TIME_CRITICAL ); + } +return ((hThread !=NULL ) ?0 :E_FAIL ); +} + +static inline int +pthread_join (pthread_t thread __attribute__((__unused__)), +void **value_ptr __attribute__((__unused__))) +{ +return 0 ; +} + #ifdef __cplusplus }#endif
lib/librte_eal/windows/eal/include/rte_os.h +42 -0
60 lines not on this page · raw message
lib/librte_eal/windows/eal/include/sched.h +46 -0
52 lines not on this page · raw message
lib/librte_eal/windows/eal/include/sys/queue.h +8 -0
@@ -59,6 +59,14 @@ extern "C" { #endif +/* + * List definitions. + */ +#define LIST_HEAD(name, type) \ +struct name { \ + struct type *lh_first; /* first element */ \ +} + #define QMD_TRACE_ELEM(elem) #define QMD_TRACE_HEAD(head) #define TRACEBUF
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [EXTERNAL] [PATCH v8 3/9] eal: add additional function overrides in windows header files
Quoted 8 lines · Pallavi Kadam
Adding additional function definitions for pthread, cpuset implementation, asprintf implementation, in order to support common code.
Signed-off-by Bruce Richardson <[email protected]>Signed-off-by Pallavi Kadam <[email protected]>Reviewed-by Ranjit Menon <[email protected]>Reviewed-by Keith Wiles <[email protected]>
Quoted 7 lines
--- lib/librte_eal/windows/eal/include/pthread.h | 66 +++++++++++++++++++ lib/librte_eal/windows/eal/include/rte_os.h | 42 ++++++++++++ lib/librte_eal/windows/eal/include/sched.h | 46 +++++++++++++ .../windows/eal/include/sys/queue.h | 8 +++ 4 files changed, 162 insertions(+)
PATCH v8 4/9 eal: getopt implementation for windows
In reply to Pallavi KadamAdding getopt files to support parsing option on
Windows.
The original contribution is under BSD-2 license.
https://github.com/greenplum-db/libusual/blob/master/usual/getopt.c
https://github.com/greenplum-db/libusual/blob/master/usual/getopt.h
--- lib/librte_eal/windows/eal/getopt.c | 470 ++++++++++++++++++++ lib/librte_eal/windows/eal/include/getopt.h | 92 ++++ lib/librte_eal/windows/eal/meson.build | 1 + 3 files changed, 563 insertions(+) create mode 100644 lib/librte_eal/windows/eal/getopt.c create mode 100644 lib/librte_eal/windows/eal/include/getopt.h
lib/librte_eal/windows/eal/getopt.c new file +470 -0
@@ -0,0 +1,470 @@ +/* SPDX-License-Identifier: ISC AND BSD-2-Clause +* Copyright (c) 2002 Todd C. Miller <[email protected]> +* +* Sponsored in part by the Defense Advanced Research Projects +* Agency (DARPA) and Air Force Research Laboratory, Air Force +* Materiel Command, USAF, under agreement number F39502-99-1-0512. +*/ +/* +* Copyright (c) 2000 The NetBSD Foundation, Inc. +* All rights reserved. +* +* This code is derived from software contributed to The NetBSD Foundation +* by Dieter Baron and Thomas Klausner. +*/ + +#include <getopt.h> + +#ifdef NEED_USUAL_GETOPT + +#include <string.h> +#include <stdlib.h> + +const char *optarg;/* argument associated with option */ +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() + +#define PRINT_ERROR ((opterr) && (*options != ':')) + +#define FLAG_PERMUTE 0x01/* permute non-options to the end of argv */ +#define FLAG_ALLARGS 0x02/* treat non-options as args to option "-1" */ +#define FLAG_LONGONLY 0x04/* operate as getopt_long_only */ + +/* return values */ +#define BADCH ((int)'?') +#define BADARG ((*options == ':') ? (int)':' : (int)'?') +#define INORDER 1 + +#define EMSG "" + +static const char *place =EMSG ;/* option letter processing */ + +/* XXX: set optreset to 1 rather than these two */ +static int nonopt_start =-1 ;/* first non option argument (for permute) */ +static int nonopt_end =-1 ;/* first option after non options (for permute) */ + +/* Error messages */ +static const char recargchar[] ="option requires an argument -- %c" ; +static const char recargstring[] ="option requires an argument -- %s" ; +static const char ambig[] ="ambiguous option -- %.*s" ; +static const char noarg[] ="option doesn't take an argument -- %.*s" ; +static const char illoptchar[] ="unknown option -- %c" ; +static const char illoptstring[] ="unknown option -- %s" ; + +/* +* Compute the greatest common divisor of a and b. +*/ +static int +gcd (int a,int b) +{ +int c; + + c = a % b; +while (c !=0 ) { + a = b; + b = c; + c = a % b; + } + +return (b); +} + +/* +* Exchange the block from nonopt_start to nonopt_end with the block +* from nonopt_end to opt_end (keeping the same order of arguments +* in each block). +*/ +static void +permute_args (int panonopt_start,int panonopt_end,int opt_end, +char **nargv) +{ +int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos; +char *swap; + +/* +* compute lengths of blocks and number and size of cycles +*/ + nnonopts = panonopt_end - panonopt_start; + nopts = opt_end - panonopt_end; + ncycle =gcd (nnonopts, nopts); + cyclelen = (opt_end - panonopt_start) / ncycle; + +for (i =0 ; i < ncycle; i++) { + cstart = panonopt_end+i; + pos = cstart; +for (j =0 ; j < cyclelen; j++) { +if (pos >= panonopt_end) + pos -= nnonopts; +else + pos += nopts; + swap = nargv[pos]; +/* LINTED const cast */ + ((char **) nargv)[pos] = nargv[cstart]; +/* LINTED const cast */ + ((char **)nargv)[cstart] = swap; + } + } +} + +/* +* parse_long_options -- +* Parse long options in argc/argv argument vector. +* Returns -1 if short_too is set and the option does not match long_options. +*/ +static int +parse_long_options (char **nargv,const char *options, +const struct option *long_options,int *idx,int short_too) +{ +const char *current_argv; +char *has_equal; +size_t current_argv_len; +int i, match; + + current_argv = place; + match =-1 ; + + optind++; + + has_equal =strchr (current_argv,'=' ); +if (has_equal !=NULL ) { +/* argument found (--option=arg) */ + current_argv_len = has_equal - current_argv; + has_equal++; + }else + current_argv_len =strlen (current_argv); + +for (i =0 ; long_options[i].name; i++) { +/* find matching long option */ +if (strncmp (current_argv, long_options[i].name, + current_argv_len)) +continue ; + +if (strlen (long_options[i].name) == current_argv_len) { +/* exact match */ + match = i; +break ; + } +/* +* If this is a known short option, don't allow +* a partial match of a single character. +*/ +if (short_too && current_argv_len ==1 ) +continue ; + +if (match ==-1 )/* partial match */ + match = i; +else { +/* ambiguous abbreviation */ +if (PRINT_ERROR ) +warnx (ambig, (int )current_argv_len, + current_argv); + optopt =0 ; +return BADCH ; + } + } +if (match !=-1 ) {/* option found */ +if (long_options[match].has_arg == no_argument + && has_equal) { +if (PRINT_ERROR ) +warnx (noarg, (int )current_argv_len, + current_argv); +/* +* XXX: GNU sets optopt to val regardless of flag +*/ +if (long_options[match].flag ==NULL ) + optopt = long_options[match].val; +else + optopt =0 ; +return BADARG ; + } +if (long_options[match].has_arg == required_argument || + long_options[match].has_arg == optional_argument) { +if (has_equal) + optarg = has_equal; +else if (long_options[match].has_arg == + required_argument) { +/* +* optional argument doesn't use next nargv +*/ + optarg = nargv[optind++]; + } + } +if ((long_options[match].has_arg == required_argument) + && (optarg ==NULL )) { +/* +* Missing argument; leading ':' indicates no error +* should be generated. +*/ +if (PRINT_ERROR ) +warnx (recargstring, + current_argv); +/* +* XXX: GNU sets optopt to val regardless of flag +*/ +if (long_options[match].flag ==NULL ) + optopt = long_options[match].val; +else + optopt =0 ; + --optind; +return BADARG ; + } + }else {/* unknown option */ +if (short_too) { + --optind; +return (-1 ); + } +if (PRINT_ERROR ) +warnx (illoptstring, current_argv); + optopt =0 ; +return BADCH ; + } +if (idx) + *idx = match; +if (long_options[match].flag) { + *long_options[match].flag = long_options[match].val; +return 0 ; + }else +return (long_options[match].val); +} + +/* +* getopt_internal -- +* Parse argc/argv argument vector. Called by user level routines. +*/ +static int +getopt_internal (int nargc,char **nargv,const char *options, +const struct option *long_options,int *idx,int flags) +{ +char *oli;/* option letter list index */ +int optchar, short_too; +static int posixly_correct =-1 ; +char *buf; +size_t len; +int optreset =0 ; + +if (options ==NULL ) +return (-1 ); + +/* +* Disable GNU extensions if POSIXLY_CORRECT is set or options +* string begins with a '+'. +*/ +if (posixly_correct ==-1 ) + posixly_correct =_dupenv_s (&buf, &len,"POSIXLY_CORRECT" ); +if (!posixly_correct || *options =='+' ) + flags &= ~FLAG_PERMUTE ; +else if (*options =='-' ) + flags |=FLAG_ALLARGS ; +if (*options =='+' || *options =='-' ) + options++; +if (!posixly_correct) +free (buf); +/* +* reset if requested +*/ +if (optind ==0 ) + optind = optreset =1 ; + + optarg =NULL ; +if (optreset) + nonopt_start = nonopt_end =-1 ; +start: +if (optreset || !*place) {/* update scanning pointer */ + optreset =0 ; +if (optind >= nargc) {/* end of argument vector */ + place =EMSG ; +if (nonopt_end !=-1 ) { +/* do permutation, if we have to */ +permute_args (nonopt_start, nonopt_end, + optind, nargv); + optind -= nonopt_end - nonopt_start; + }else if (nonopt_start !=-1 ) { +/* +* If we skipped non-options, set optind +* to the first of them. +*/ + optind = nonopt_start; + } + nonopt_start = nonopt_end =-1 ; +return (-1 ); + } + place = nargv[optind]; +if (*place !='-' || + (place[1 ] =='\0' &&strchr (options,'-' ) ==NULL )) { + place =EMSG ;/* found non-option */ +if (flags &FLAG_ALLARGS ) { +/* +* GNU extension: +* return non-option as argument to option 1 +*/ + optarg = nargv[optind++]; +return INORDER ; + } +if (!(flags &FLAG_PERMUTE )) { +/* +* If no permutation wanted, stop parsing +* at first non-option. +*/ +return (-1 ); + } +/* do permutation */ +if (nonopt_start ==-1 ) + nonopt_start = optind; +else if (nonopt_end !=-1 ) { +permute_args (nonopt_start, nonopt_end, + optind, nargv); + nonopt_start = optind - + (nonopt_end - nonopt_start); + nonopt_end =-1 ; + } + optind++; +/* process next argument */ + goto start; + } +if (nonopt_start !=-1 && nonopt_end ==-1 ) + nonopt_end = optind; + +/* +* If we have "-" do nothing, if "--" we are done. +*/ +if (place[1 ] !='\0' && *++place =='-' && place[1 ] =='\0' ) { + optind++; + place =EMSG ; +/* +* We found an option (--), so if we skipped +* non-options, we have to permute. +*/ +if (nonopt_end !=-1 ) { +permute_args (nonopt_start, nonopt_end, + optind, nargv); + optind -= nonopt_end - nonopt_start; + } + nonopt_start = nonopt_end =-1 ; +return (-1 ); + } + } + +/* +* Check long options if: +* 1) we were passed some +* 2) the arg is not just "-" +* 3) either the arg starts with -- we are getopt_long_only() +*/ +if (long_options !=NULL && place != nargv[optind] && + (*place =='-' || (flags &FLAG_LONGONLY ))) { + short_too =0 ; +if (*place =='-' ) + place++;/* --foo long option */ +else if (*place !=':' &&strchr (options, *place) !=NULL ) + short_too =1 ;/* could be short option too */ + + optchar =parse_long_options (nargv, options, long_options, + idx, short_too); +if (optchar !=-1 ) { + place =EMSG ; +return optchar; + } + } + + optchar = (int )*place++; + oli =strchr (options, optchar); +if (optchar == (int )':' || + (optchar == (int )'-' && *place !='\0' ) || + oli ==NULL ) { +/* +* If the user specified "-" and '-' isn't listed in +* options, return -1 (non-option) as per POSIX. +* Otherwise, it is an unknown option character (or ':'). +*/ +if (optchar == (int )'-' && *place =='\0' ) +return (-1 ); +if (!*place) + ++optind; +if (PRINT_ERROR ) +warnx (illoptchar, optchar); + optopt = optchar; +return BADCH ; + } +if (long_options !=NULL && optchar =='W' && oli[1 ] ==';' ) { +/* -W long-option */ +if (*place) + ; +else if (++optind >= nargc) {/* no arg */ + place =EMSG ; +if (PRINT_ERROR ) +warnx (recargchar, optchar); + optopt = optchar; +return BADARG ; + }/* white space */ + place = nargv[optind]; + optchar =parse_long_options (nargv, options, long_options, + idx,0 ); + place =EMSG ; +return optchar; + } +if (*++oli !=':' ) {/* doesn't take argument */ +if (!*place) + ++optind; + }else {/* takes (optional) argument */ + optarg =NULL ; +if (*place)/* no white space */ + optarg = place; +else if (oli[1 ] !=':' ) {/* arg not optional */ +if (++optind >= nargc) {/* no arg */ + place =EMSG ; +if (PRINT_ERROR ) +warnx (recargchar, optchar); + optopt = optchar; +return BADARG ; + } + optarg = nargv[optind]; + } + place =EMSG ; + ++optind; + } +/* dump back option letter */ +return optchar; +} + +/* +* getopt -- +* Parse argc/argv argument vector. +*/ +int +getopt (int nargc,char *nargv[],const char *options) +{ +return getopt_internal (nargc, nargv, options,NULL ,NULL , +FLAG_PERMUTE ); +} + +/* +* getopt_long -- +* Parse argc/argv argument vector. +*/ +int +getopt_long (int nargc,char *nargv[],const char *options, +const struct option *long_options,int *idx) +{ + +return (getopt_internal (nargc, nargv, options, long_options, idx, +FLAG_PERMUTE )); +} + +/* +* getopt_long_only -- +* Parse argc/argv argument vector. +*/ +int +getopt_long_only (int nargc,char *nargv[],const char *options, +const struct option *long_options,int *idx) +{ + +return (getopt_internal (nargc, nargv, options, long_options, idx, +FLAG_PERMUTE |FLAG_LONGONLY )); +} + +#endif /* NEED_USUAL_GETOPT */
lib/librte_eal/windows/eal/include/getopt.h new file +92 -0
92 lines not on this page · raw message
lib/librte_eal/windows/eal/meson.build +1 -0
@@ -17,4 +17,5 @@ env_sources = files('eal.c', 'eal_debug.c', 'eal_lcore.c', 'eal_thread.c', + 'getopt.c', )
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [EXTERNAL] [PATCH v8 4/9] eal: getopt implementation for windows
Quoted 11 lines · Pallavi Kadam
Adding getopt files to support parsing option on
Windows.The original contribution is under BSD-2 license.
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fgreenplum-db%2Flibusual%2Fblob%2Fmaster%2Fusual%2Fgetopt.c&data=02%7C01%7CNarcisa.Vasile%40microsoft.com%7Cb0740364811e4d99d2e408d7ab7c2e37%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637166422146049654&sdata=UkpRuUbgfTQXbnMKApxlZmtoOIOcPZrFN%2BnnZ%2B2CXmw%3D&reserved=0
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fgreenplum-db%2Flibusual%2Fblob%2Fmaster%2Fusual%2Fgetopt.h&data=02%7C01%7CNarcisa.Vasile%40microsoft.com%7Cb0740364811e4d99d2e408d7ab7c2e37%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637166422146049654&sdata=lGlLnaGZQ0beLe8ZweVZZVZDopib%2BDuWpAto2A1JkLc%3D&reserved=0Signed-off-by Antara Ganesh Kolar <[email protected]>Signed-off-by Pallavi Kadam <[email protected]>Reviewed-by Ranjit Menon <[email protected]>Reviewed-by Keith Wiles <[email protected]>
Quoted 8 lines
--- lib/librte_eal/windows/eal/getopt.c | 470 ++++++++++++++++++++ lib/librte_eal/windows/eal/include/getopt.h | 92 ++++ lib/librte_eal/windows/eal/meson.build | 1 + 3 files changed, 563 insertions(+) create mode 100644 lib/librte_eal/windows/eal/getopt.c create mode 100644 lib/librte_eal/windows/eal/include/getopt.h
PATCH v8 5/9 eal: add function to detect process type
In reply to Pallavi KadamAdding a function to detect process type, also included header files to contain suitable function declarations and to support extra warning flags.
--- lib/librte_eal/windows/eal/eal.c | 61 ++++++++++++++++++++++++- lib/librte_eal/windows/eal/eal_debug.c | 1 + lib/librte_eal/windows/eal/eal_lcore.c | 3 ++ lib/librte_eal/windows/eal/eal_thread.c | 11 +++++ 4 files changed, 75 insertions(+), 1 deletion(-)
lib/librte_eal/windows/eal/eal.c +60 -1
@@ -2,21 +2,48 @@* Copyright(c) 2019 Intel Corporation */ +#include <sys/stat.h> #include <io.h> #include <fcntl.h> #include <rte_debug.h> #include <rte_eal.h> +#include <eal_memcfg.h> #include <rte_errno.h> #include <rte_lcore.h> #include <eal_thread.h> +#include <eal_internal_cfg.h> +#include <eal_filesystem.h> +#include <eal_options.h> #include <eal_private.h> +/* define fd variable here, because file needs to be kept open for the +* duration of the program, as we hold a write lock on it in the primary proc +*/ +static int mem_cfg_fd =-1 ; + +/* early configuration structure, when memory config is not mmapped */ +static struct rte_mem_config early_mem_config; +/* Address of global and public configuration */ -static struct rte_config rte_config; +static struct rte_config rte_config = { + .mem_config = &early_mem_config, +};/* internal configuration (per-core) */ struct lcore_config lcore_config[RTE_MAX_LCORE ]; +/* internal configuration */ +struct internal_config internal_config; + +/* platform-specific runtime dir */ +static char runtime_dir[PATH_MAX ]; + +const char * +rte_eal_get_runtime_dir (void ) +{ +return runtime_dir; +} +/* Return a pointer to the configuration structure */ struct rte_config *rte_eal_get_configuration (void )
@@ -24,6 +51,38 @@ rte_eal_get_configuration(void)return &rte_config; } +/* Detect if we are a primary or a secondary process */ +enum rte_proc_type_t +eal_proc_type_detect (void ) +{ +enum rte_proc_type_t ptype =RTE_PROC_PRIMARY ; +const char *pathname =eal_runtime_config_path (); + +/* if we can open the file but not get a write-lock we are a secondary +* process. NOTE: if we get a file handle back, we keep that open +* and don't close it to prevent a race condition between multiple opens +*/ +errno_t err =_sopen_s (&mem_cfg_fd, pathname, + _O_RDWR, _SH_DENYNO, _S_IREAD | _S_IWRITE); +if (err ==0 ) { +OVERLAPPED soverlapped = {0 }; + soverlapped.Offset =sizeof (*rte_config.mem_config); + soverlapped.OffsetHigh =0 ; + +HANDLE hwinfilehandle = (HANDLE )_get_osfhandle (mem_cfg_fd); + +if (!LockFileEx (hwinfilehandle, +LOCKFILE_EXCLUSIVE_LOCK |LOCKFILE_FAIL_IMMEDIATELY ,0 , +sizeof (*rte_config.mem_config),0 , &soverlapped)) + ptype =RTE_PROC_SECONDARY ; + } + +RTE_LOG (INFO ,EAL ,"Auto-detected process type: %s\n" , + ptype ==RTE_PROC_PRIMARY ?"PRIMARY" :"SECONDARY" ); + +return ptype; +} +static int sync_func(void *arg __rte_unused) {
lib/librte_eal/windows/eal/eal_debug.c +1 -0
@@ -4,6 +4,7 @@#include <stdarg.h> #include <rte_log.h> +#include <rte_debug.h> /* call abort(), it will generate a coredump if enabled */ void
lib/librte_eal/windows/eal/eal_lcore.c +3 -0
@@ -6,6 +6,9 @@#include <rte_common.h> +#include "eal_private.h" +#include "eal_thread.h" +/* global data structure that contains the CPU map */ static struct _wcpu_map { unsigned int total_procs;
lib/librte_eal/windows/eal/eal_thread.c +11 -0
@@ -10,11 +10,14 @@#include <rte_lcore.h> #include <rte_per_lcore.h> #include <rte_common.h> +#include <rte_memory.h> #include <eal_thread.h> #include "eal_private.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; +RTE_DEFINE_PER_LCORE (rte_cpuset_t, _cpuset);/* * Send a message to a slave lcore identified by slave_id to call a
@@ -152,3 +155,11 @@ eal_thread_create(pthread_t *thread)return 0 ; } + +int +rte_thread_setname(__rte_unused pthread_t id, __rte_unused const char *name) +{ +/* TODO */ +/* This is a stub, not the expected result */ +return 0 ; +}
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [EXTERNAL] [PATCH v8 5/9] eal: add function to detect process type
Quoted 8 lines · Pallavi Kadam
Adding a function to detect process type, also included header files to contain suitable function declarations and to support extra warning flags.
Signed-off-by Pallavi Kadam <[email protected]>Signed-off-by Antara Ganesh Kolar <[email protected]>Reviewed-by Ranjit Menon <[email protected]>Reviewed-by Keith Wiles <[email protected]>
Quoted 7 lines
--- lib/librte_eal/windows/eal/eal.c | 61 ++++++++++++++++++++++++- lib/librte_eal/windows/eal/eal_debug.c | 1 + lib/librte_eal/windows/eal/eal_lcore.c | 3 ++ lib/librte_eal/windows/eal/eal_thread.c | 11 +++++ 4 files changed, 75 insertions(+), 1 deletion(-)
PATCH v8 6/9 eal: include SSE4 support for windows
In reply to Pallavi KadamModified \common\include\arch\x86\rte_vect.h
to include SSE4 header for Windows.
--- lib/librte_eal/common/include/arch/x86/rte_vect.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/librte_eal/common/include/arch/x86/rte_vect.h +3 -1
@@ -15,7 +15,9 @@#include <rte_config.h> #include "generic/rte_vect.h" -#if (defined(__ICC) || (__GNUC__ ==4 && __GNUC_MINOR__ <4 )) +#if (defined(__ICC) || \ + (defined(_WIN64)) || \ + (__GNUC__ ==4 && __GNUC_MINOR__ <4 ))#include <smmintrin.h> /* SSE4 */
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [EXTERNAL] [PATCH v8 6/9] eal: include SSE4 support for windows
Quoted 11 lines · Pallavi Kadam
Modified \common\include\arch\x86\rte_vect.h
to include SSE4 header for Windows.Signed-off-by Antara Ganesh Kolar <[email protected]>Signed-off-by Pallavi Kadam <[email protected]>Reviewed-by Ranjit Menon <[email protected]>Reviewed-by Keith Wiles <[email protected]>--- lib/librte_eal/common/include/arch/x86/rte_vect.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
PATCH v8 7/9 eal: remove syslog and dlfcn support for windows
In reply to Pallavi KadamExcluding syslog/ dlfcn definitions and parameters from Windows by adding #ifndef RTE_EXEC_ENV_WINDOWS.
Note: This is a temporary change. In future, separate 'unix' directory will be created for unix specific functions.
--- lib/librte_eal/common/eal_common_options.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
lib/librte_eal/common/eal_common_options.c +14 -0
@@ -6,12 +6,16 @@#include <stdlib.h> #include <unistd.h> #include <string.h> +#ifndef RTE_EXEC_ENV_WINDOWS #include <syslog.h> +#endif #include <ctype.h> #include <limits.h> #include <errno.h> #include <getopt.h> +#ifndef RTE_EXEC_ENV_WINDOWS #include <dlfcn.h> +#endif #include <sys/types.h> #include <sys/stat.h> #include <dirent.h>
@@ -205,7 +209,9 @@ eal_reset_internal_config(struct internal_config *internal_cfg) } internal_cfg->base_virtaddr =0 ; +#ifdef LOG_DAEMON internal_cfg->syslog_facility =LOG_DAEMON ; +#endif /* if set to NONE, interrupt mode is determined automatically */ internal_cfg->vfio_intr_mode =RTE_INTR_MODE_NONE ;
@@ -278,6 +284,7 @@ eal_plugindir_init(const char *path)int eal_plugins_init (void ) { +#ifndef RTE_EXEC_ENV_WINDOWS struct shared_driver *solib =NULL ;struct stat sb;
@@ -306,6 +313,7 @@ eal_plugins_init(void) }return 0 ; +#endif }/*
@@ -927,6 +935,7 @@ eal_parse_lcores(const char *lcores)return ret; } +#ifndef RTE_EXEC_ENV_WINDOWS static int eal_parse_syslog (const char *facility,struct internal_config *conf) {
@@ -965,6 +974,7 @@ eal_parse_syslog(const char *facility, struct internal_config *conf) }return -1 ; } +#endif static int eal_parse_log_priority (const char *level)
@@ -1389,6 +1399,7 @@ eal_parse_common_option(int opt, const char *optarg, }break ; +#ifndef RTE_EXEC_ENV_WINDOWS case OPT_SYSLOG_NUM :if (eal_parse_syslog (optarg, conf) <0 ) { RTE_LOG(ERR, EAL, "invalid parameters for --"
@@ -1396,6 +1407,7 @@ eal_parse_common_option(int opt, const char *optarg, return -1; }break ; +#endif case OPT_LOG_LEVEL_NUM : {if (eal_parse_log_level (optarg) <0 ) {
@@ -1675,7 +1687,9 @@ eal_common_usage(void)" (can be used multiple times)\n" " --" OPT_VMWARE_TSC_MAP " Use VMware TSC map instead of native RDTSC\n" " --" OPT_PROC_TYPE " Type of this process (primary|secondary|auto)\n" +#ifndef RTE_EXEC_ENV_WINDOWS" --" OPT_SYSLOG " Set syslog facility\n" +#endif " --"OPT_LOG_LEVEL"=<int> Set global log level\n"" --" OPT_LOG_LEVEL "=<type-match>:<int>\n" " Set specific log level\n"
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [EXTERNAL] [PATCH v8 7/9] eal: remove syslog and dlfcn support for windows
Quoted 12 lines · Pallavi Kadam
Excluding syslog/ dlfcn definitions and parameters from Windows by adding #ifndef
RTE_EXEC_ENV_WINDOWS.Note: This is a temporary change. In future, separate 'unix' directory will be created for unix specific functions.
Signed-off-by Pallavi Kadam <[email protected]>Reviewed-by Ranjit Menon <[email protected]>--- lib/librte_eal/common/eal_common_options.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
PATCH v8 8/9 build: add additional common files support
In reply to Pallavi KadamAdded support for additional common files in meson build to expand Windows EAL and to support the lcore parsing feature on Windows.
--- lib/librte_eal/windows/eal/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
lib/librte_eal/windows/eal/meson.build +7 -1
@@ -8,10 +8,16 @@ env_headers = files( 'include/rte_os.h', ) common_sources = files( + '../../common/eal_common_bus.c', + '../../common/eal_common_class.c', + '../../common/eal_common_devargs.c', '../../common/eal_common_errno.c', '../../common/eal_common_launch.c', '../../common/eal_common_lcore.c', - '../../common/eal_common_log.c' + '../../common/eal_common_log.c', + '../../common/eal_common_options.c', + '../../common/eal_common_thread.c', + '../../common/rte_option.c', ) env_sources = files('eal.c', 'eal_debug.c',
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [EXTERNAL] [PATCH v8 8/9] build: add additional common files support
Quoted 4 lines · Pallavi Kadam
Added support for additional common files in meson build to expand Windows EAL and to support the lcore parsing feature on Windows.
Quoted 8 lines
Signed-off-by Pallavi Kadam <[email protected]>Signed-off-by Antara Ganesh Kolar <[email protected]>Reviewed-by Ranjit Menon <[email protected]>Reviewed-by Keith Wiles <[email protected]>--- lib/librte_eal/windows/eal/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
PATCH v8 9/9 eal: add minimum viable code to support parsing
In reply to Pallavi KadamAdding specific logic for eal.c to support parsing on Windows.
--- lib/librte_eal/windows/eal/eal.c | 133 ++++++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 3 deletions(-)
lib/librte_eal/windows/eal/eal.c +130 -3
@@ -16,6 +16,9 @@#include <eal_options.h> #include <eal_private.h> +/* Allow the application to print its usage message too if set */ +static rte_usage_hook_t rte_application_usage_hook; +/* define fd variable here, because file needs to be kept open for the * duration of the program, as we hold a write lock on it in the primary proc */
@@ -83,6 +86,124 @@ eal_proc_type_detect(void)return ptype; } +/* display usage */ +static void +eal_usage (const char *prgname) +{ +printf ("\nUsage: %s " , prgname); +eal_common_usage (); +/* Allow the application to print its usage message too +*if hook is set +*/ +if (rte_application_usage_hook) { +printf ("===== Application Usage =====\n\n" ); +rte_application_usage_hook (prgname); + } +} + +/* Parse the arguments for --log-level only */ +static void +eal_log_level_parse (int argc,char **argv) +{ +int opt; +char **argvopt; +int option_index; + + argvopt = argv; + +eal_reset_internal_config (&internal_config); + +while ((opt =getopt_long (argc, argvopt, eal_short_options, + eal_long_options, &option_index)) !=EOF ) { + +int ret; + +/* getopt is not happy, stop right now */ +if (opt =='?' ) +break ; + + ret = (opt ==OPT_LOG_LEVEL_NUM ) ? +eal_parse_common_option (opt, optarg, + &internal_config) :0 ; + +/* common parser is not happy */ +if (ret <0 ) +break ; + } + + optind =0 ;/* reset getopt lib */ +} + +/* Parse the argument given in the command line of the application */ +__attribute__((optnone))static int +eal_parse_args (int argc,char **argv) +{ +int opt, ret; +char **argvopt; +int option_index; +char *prgname = argv[0 ]; + + argvopt = argv; + +while ((opt =getopt_long (argc, argvopt, eal_short_options, + eal_long_options, &option_index)) !=EOF ) { + +int ret; + +/* getopt is not happy, stop right now */ +if (opt =='?' ) { +eal_usage (prgname); +return -1 ; + } + + ret =eal_parse_common_option (opt, optarg, &internal_config); +/* common parser is not happy */ +if (ret <0 ) { +eal_usage (prgname); +return -1 ; + } +/* common parser handled this option */ +if (ret ==0 ) +continue ; + +switch (opt) { +case 'h' : +eal_usage (prgname); +exit (EXIT_SUCCESS ); +default : +if (opt <OPT_LONG_MIN_NUM &&isprint (opt)) { +RTE_LOG (ERR ,EAL ,"Option %c is not supported " +"on Windows\n" , opt); + }else if (opt >=OPT_LONG_MIN_NUM && + opt <OPT_LONG_MAX_NUM ) { +RTE_LOG (ERR ,EAL ,"Option %s is not supported " +"on Windows\n" , + eal_long_options[option_index].name); + }else { +RTE_LOG (ERR ,EAL ,"Option %d is not supported " +"on Windows\n" , opt); + } +eal_usage (prgname); +return -1 ; + } + } + +if (eal_adjust_config (&internal_config) !=0 ) +return -1 ; + +/* sanity checks */ +if (eal_check_common_options (&internal_config) !=0 ) { +eal_usage (prgname); +return -1 ; + } + +if (optind >=0 ) + argv[optind -1 ] = prgname; + ret = optind -1 ; + optind =0 ;/* reset getopt lib */ +return ret; +} +static int sync_func(void *arg __rte_unused) {
@@ -98,9 +219,11 @@ rte_eal_init_alert(const char *msg)/* Launch threads, called at application init(). */ int -rte_eal_init(int argc __rte_unused, char **argv __rte_unused) +rte_eal_init (int argc,char **argv) { -int i; +int i, fctret; + +eal_log_level_parse (argc, argv);/* create a map of all processors in the system */ eal_create_cpu_map ();
@@ -111,6 +234,10 @@ rte_eal_init(int argc __rte_unused, char **argv __rte_unused)return -1 ; } + fctret =eal_parse_args (argc, argv); +if (fctret <0 ) +exit (1 ); +eal_thread_init_master (rte_config.master_lcore);RTE_LCORE_FOREACH_SLAVE (i) {
@@ -139,5 +266,5 @@ rte_eal_init(int argc __rte_unused, char **argv __rte_unused)*/ rte_eal_mp_remote_launch (sync_func,NULL ,SKIP_MASTER );rte_eal_mp_wait_lcore (); -return 0 ; +return fctret; }
Signature · 1 line
2.18.0.windows.1
Re: [dpdk-dev] [EXTERNAL] [PATCH v8 9/9] eal: add minimum viable code to support parsing
Quoted 11 lines · Pallavi Kadam
Adding specific logic for
eal.cto support parsing on Windows.Signed-off-by Pallavi Kadam <[email protected]>Signed-off-by Antara Ganesh Kolar <[email protected]>Reviewed-by Ranjit Menon <[email protected]>Reviewed-by Keith Wiles <[email protected]>--- lib/librte_eal/windows/eal/eal.c | 133 ++++++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 3 deletions(-)
Quoted 11 lines
This patchset includes additional functionalities for Windows EAL to support command-line parsing feature and some EAL common code on Windows.
This patchset can be applied to windpdk-next-dev branch in the draft repo.
v8 changes:
Fixed the naming conventions.
Fixed a crash encountered due to getopt function. Removed "--syslog" from help options for Windows.
Observing no issues on Windows 10, Meson 0.53.999, Clang 9.0.1.
Signature · 1 line
Dmitry Kozlyuk
Thomas Monjalon
Applied07/02/2020 20:05, Dmitry Kozlyuk:
Quoted 12 lines
Quoted 11 lines
This patchset includes additional functionalities for Windows EAL to support command-line parsing feature and some EAL common code on Windows.
This patchset can be applied to windpdk-next-dev branch in the draft repo.
v8 changes:
Fixed the naming conventions.
Fixed a crash encountered due to getopt function. Removed "--syslog" from help options for Windows.
Quoted 3 lines
Observing no issues on Windows 10, Meson 0.53.999, Clang 9.0.1.
Reviewed-by Dmitry Kozlyuk <[email protected]>
Applied, thanks
Quoted 65 lines · Pallavi Kadam
This patchset includes additional functionalities for Windows EAL to support command-line parsing feature and some EAL common code on Windows.
This patchset can be applied to windpdk-next-dev branch in the draft repo.
v8 changes:
Fixed the naming conventions.
Fixed a crash encountered due to getopt function. Removed "--syslog" from help options for Windows.v7 changes:
Removed Windows "eal_filesystem.h" for now and will be added later if required. Currently, Windows EAL uses common version ofeal_filesystem.h.v6 changes:
Removed sysfs function as it was not required on Windows. Removed syslog and dlfcn support for Windows.v5 changes:
Fixed indentation in patch 6.v4 changes:
Modifiedlicense/exceptions.txtfile.
The following files in this patch-set require license exceptions as listed:
dirent.hMIT license
getopt.hBSD-2-Clause license
getopt.cISC and BSD-2-Clause licenseRemoved syslog file in Windows and added ifndef Windows around syslog classification parameters in the common code.
v3 Changes:
Modified genericrte_vectto add Windows support. Moved RTE_CPU* definitions to OS specific file. Added SPDX tag on top of third party files.v2 Changes:
syslog.h: Replaced the BSD license boilerplate to SPDX tag.Pallavi Kadam (9):
license: add license exception for windows
eal:dirent.himplementation for windows
eal: add additional function overrides in windows header files
eal: getopt implementation for windows
eal: add function to detect process type
eal: include SSE4 support for windows
eal: remove syslog and dlfcn support for windows
build: add additional common files support
eal: add minimum viable code to support parsinglib/librte_eal/common/eal_common_options.c | 14 + .../common/include/arch/x86/rte_vect.h | 4 +- lib/librte_eal/windows/eal/eal.c | 194 ++++- lib/librte_eal/windows/eal/eal_debug.c | 1 + lib/librte_eal/windows/eal/eal_lcore.c | 3 + lib/librte_eal/windows/eal/eal_thread.c | 11 + lib/librte_eal/windows/eal/getopt.c | 470 +++++++++++++ lib/librte_eal/windows/eal/include/dirent.h | 664 ++++++++++++++++++ lib/librte_eal/windows/eal/include/getopt.h | 92 +++ lib/librte_eal/windows/eal/include/pthread.h | 66 ++ lib/librte_eal/windows/eal/include/rte_os.h | 42 ++
Quoted 9 lines
lib/librte_eal/windows/eal/include/sched.h | 46 ++ .../windows/eal/include/sys/queue.h | 8 + lib/librte_eal/windows/eal/meson.build | 9 +- license/exceptions.txt | 12 +- 15 files changed, 1625 insertions(+), 11 deletions(-) create mode 100644 lib/librte_eal/windows/eal/getopt.c create mode 100644 lib/librte_eal/windows/eal/include/dirent.h create mode 100644 lib/librte_eal/windows/eal/include/getopt.h
Tested-by Narcisa Vasile <[email protected]>
Acked-by Narcisa Vasile <[email protected]>
Quoted 65 lines · Pallavi Kadam
This patchset includes additional functionalities for Windows EAL to support command-line parsing feature and some EAL common code on Windows.
This patchset can be applied to windpdk-next-dev branch in the draft repo.
v8 changes:
Fixed the naming conventions.
Fixed a crash encountered due to getopt function. Removed "--syslog" from help options for Windows.v7 changes:
Removed Windows "eal_filesystem.h" for now and will be added later if required. Currently, Windows EAL uses common version ofeal_filesystem.h.v6 changes:
Removed sysfs function as it was not required on Windows. Removed syslog and dlfcn support for Windows.v5 changes:
Fixed indentation in patch 6.v4 changes:
Modifiedlicense/exceptions.txtfile.
The following files in this patch-set require license exceptions as listed:
dirent.hMIT license
getopt.hBSD-2-Clause license
getopt.cISC and BSD-2-Clause licenseRemoved syslog file in Windows and added ifndef Windows around syslog classification parameters in the common code.
v3 Changes:
Modified genericrte_vectto add Windows support. Moved RTE_CPU* definitions to OS specific file. Added SPDX tag on top of third party files.v2 Changes:
syslog.h: Replaced the BSD license boilerplate to SPDX tag.Pallavi Kadam (9):
license: add license exception for windows
eal:dirent.himplementation for windows
eal: add additional function overrides in windows header files
eal: getopt implementation for windows
eal: add function to detect process type
eal: include SSE4 support for windows
eal: remove syslog and dlfcn support for windows
build: add additional common files support
eal: add minimum viable code to support parsinglib/librte_eal/common/eal_common_options.c | 14 + .../common/include/arch/x86/rte_vect.h | 4 +- lib/librte_eal/windows/eal/eal.c | 194 ++++- lib/librte_eal/windows/eal/eal_debug.c | 1 + lib/librte_eal/windows/eal/eal_lcore.c | 3 + lib/librte_eal/windows/eal/eal_thread.c | 11 + lib/librte_eal/windows/eal/getopt.c | 470 +++++++++++++ lib/librte_eal/windows/eal/include/dirent.h | 664 ++++++++++++++++++ lib/librte_eal/windows/eal/include/getopt.h | 92 +++ lib/librte_eal/windows/eal/include/pthread.h | 66 ++ lib/librte_eal/windows/eal/include/rte_os.h | 42 ++
Quoted 9 lines
lib/librte_eal/windows/eal/include/sched.h | 46 ++ .../windows/eal/include/sys/queue.h | 8 + lib/librte_eal/windows/eal/meson.build | 9 +- license/exceptions.txt | 12 +- 15 files changed, 1625 insertions(+), 11 deletions(-) create mode 100644 lib/librte_eal/windows/eal/getopt.c create mode 100644 lib/librte_eal/windows/eal/include/dirent.h create mode 100644 lib/librte_eal/windows/eal/include/getopt.h
Quoted 65 lines · Pallavi Kadam
This patchset includes additional functionalities for Windows EAL to support command-line parsing feature and some EAL common code on Windows.
This patchset can be applied to windpdk-next-dev branch in the draft repo.
v8 changes:
Fixed the naming conventions.
Fixed a crash encountered due to getopt function. Removed "--syslog" from help options for Windows.v7 changes:
Removed Windows "eal_filesystem.h" for now and will be added later if required. Currently, Windows EAL uses common version ofeal_filesystem.h.v6 changes:
Removed sysfs function as it was not required on Windows. Removed syslog and dlfcn support for Windows.v5 changes:
Fixed indentation in patch 6.v4 changes:
Modifiedlicense/exceptions.txtfile.
The following files in this patch-set require license exceptions as listed:
dirent.hMIT license
getopt.hBSD-2-Clause license
getopt.cISC and BSD-2-Clause licenseRemoved syslog file in Windows and added ifndef Windows around syslog classification parameters in the common code.
v3 Changes:
Modified genericrte_vectto add Windows support. Moved RTE_CPU* definitions to OS specific file. Added SPDX tag on top of third party files.v2 Changes:
syslog.h: Replaced the BSD license boilerplate to SPDX tag.Pallavi Kadam (9):
license: add license exception for windows
eal:dirent.himplementation for windows
eal: add additional function overrides in windows header files
eal: getopt implementation for windows
eal: add function to detect process type
eal: include SSE4 support for windows
eal: remove syslog and dlfcn support for windows
build: add additional common files support
eal: add minimum viable code to support parsinglib/librte_eal/common/eal_common_options.c | 14 + .../common/include/arch/x86/rte_vect.h | 4 +- lib/librte_eal/windows/eal/eal.c | 194 ++++- lib/librte_eal/windows/eal/eal_debug.c | 1 + lib/librte_eal/windows/eal/eal_lcore.c | 3 + lib/librte_eal/windows/eal/eal_thread.c | 11 + lib/librte_eal/windows/eal/getopt.c | 470 +++++++++++++ lib/librte_eal/windows/eal/include/dirent.h | 664 ++++++++++++++++++ lib/librte_eal/windows/eal/include/getopt.h | 92 +++ lib/librte_eal/windows/eal/include/pthread.h | 66 ++ lib/librte_eal/windows/eal/include/rte_os.h | 42 ++
Quoted 9 lines
lib/librte_eal/windows/eal/include/sched.h | 46 ++ .../windows/eal/include/sys/queue.h | 8 + lib/librte_eal/windows/eal/meson.build | 9 +- license/exceptions.txt | 12 +- 15 files changed, 1625 insertions(+), 11 deletions(-) create mode 100644 lib/librte_eal/windows/eal/getopt.c create mode 100644 lib/librte_eal/windows/eal/include/dirent.h create mode 100644 lib/librte_eal/windows/eal/include/getopt.h
Quoted 65 lines · Pallavi Kadam
This patchset includes additional functionalities for Windows EAL to support command-line parsing feature and some EAL common code on Windows.
This patchset can be applied to windpdk-next-dev branch in the draft repo.
v8 changes:
Fixed the naming conventions.
Fixed a crash encountered due to getopt function. Removed "--syslog" from help options for Windows.v7 changes:
Removed Windows "eal_filesystem.h" for now and will be added later if required. Currently, Windows EAL uses common version ofeal_filesystem.h.v6 changes:
Removed sysfs function as it was not required on Windows. Removed syslog and dlfcn support for Windows.v5 changes:
Fixed indentation in patch 6.v4 changes:
Modifiedlicense/exceptions.txtfile.
The following files in this patch-set require license exceptions as listed:
dirent.hMIT license
getopt.hBSD-2-Clause license
getopt.cISC and BSD-2-Clause licenseRemoved syslog file in Windows and added ifndef Windows around syslog classification parameters in the common code.
v3 Changes:
Modified genericrte_vectto add Windows support. Moved RTE_CPU* definitions to OS specific file. Added SPDX tag on top of third party files.v2 Changes:
syslog.h: Replaced the BSD license boilerplate to SPDX tag.Pallavi Kadam (9):
license: add license exception for windows
eal:dirent.himplementation for windows
eal: add additional function overrides in windows header files
eal: getopt implementation for windows
eal: add function to detect process type
eal: include SSE4 support for windows
eal: remove syslog and dlfcn support for windows
build: add additional common files support
eal: add minimum viable code to support parsinglib/librte_eal/common/eal_common_options.c | 14 + .../common/include/arch/x86/rte_vect.h | 4 +- lib/librte_eal/windows/eal/eal.c | 194 ++++- lib/librte_eal/windows/eal/eal_debug.c | 1 + lib/librte_eal/windows/eal/eal_lcore.c | 3 + lib/librte_eal/windows/eal/eal_thread.c | 11 + lib/librte_eal/windows/eal/getopt.c | 470 +++++++++++++ lib/librte_eal/windows/eal/include/dirent.h | 664 ++++++++++++++++++ lib/librte_eal/windows/eal/include/getopt.h | 92 +++ lib/librte_eal/windows/eal/include/pthread.h | 66 ++ lib/librte_eal/windows/eal/include/rte_os.h | 42 ++
Quoted 9 lines
lib/librte_eal/windows/eal/include/sched.h | 46 ++ .../windows/eal/include/sys/queue.h | 8 + lib/librte_eal/windows/eal/meson.build | 9 +- license/exceptions.txt | 12 +- 15 files changed, 1625 insertions(+), 11 deletions(-) create mode 100644 lib/librte_eal/windows/eal/getopt.c create mode 100644 lib/librte_eal/windows/eal/include/dirent.h create mode 100644 lib/librte_eal/windows/eal/include/getopt.h
Quoted 65 lines · Pallavi Kadam
This patchset includes additional functionalities for Windows EAL to support command-line parsing feature and some EAL common code on Windows.
This patchset can be applied to windpdk-next-dev branch in the draft repo.
v8 changes:
Fixed the naming conventions.
Fixed a crash encountered due to getopt function. Removed "--syslog" from help options for Windows.v7 changes:
Removed Windows "eal_filesystem.h" for now and will be added later if required. Currently, Windows EAL uses common version ofeal_filesystem.h.v6 changes:
Removed sysfs function as it was not required on Windows. Removed syslog and dlfcn support for Windows.v5 changes:
Fixed indentation in patch 6.v4 changes:
Modifiedlicense/exceptions.txtfile.
The following files in this patch-set require license exceptions as listed:
dirent.hMIT license
getopt.hBSD-2-Clause license
getopt.cISC and BSD-2-Clause licenseRemoved syslog file in Windows and added ifndef Windows around syslog classification parameters in the common code.
v3 Changes:
Modified genericrte_vectto add Windows support. Moved RTE_CPU* definitions to OS specific file. Added SPDX tag on top of third party files.v2 Changes:
syslog.h: Replaced the BSD license boilerplate to SPDX tag.Pallavi Kadam (9):
license: add license exception for windows
eal:dirent.himplementation for windows
eal: add additional function overrides in windows header files
eal: getopt implementation for windows
eal: add function to detect process type
eal: include SSE4 support for windows
eal: remove syslog and dlfcn support for windows
build: add additional common files support
eal: add minimum viable code to support parsinglib/librte_eal/common/eal_common_options.c | 14 + .../common/include/arch/x86/rte_vect.h | 4 +- lib/librte_eal/windows/eal/eal.c | 194 ++++- lib/librte_eal/windows/eal/eal_debug.c | 1 + lib/librte_eal/windows/eal/eal_lcore.c | 3 + lib/librte_eal/windows/eal/eal_thread.c | 11 + lib/librte_eal/windows/eal/getopt.c | 470 +++++++++++++ lib/librte_eal/windows/eal/include/dirent.h | 664 ++++++++++++++++++ lib/librte_eal/windows/eal/include/getopt.h | 92 +++ lib/librte_eal/windows/eal/include/pthread.h | 66 ++ lib/librte_eal/windows/eal/include/rte_os.h | 42 ++
Quoted 9 lines
lib/librte_eal/windows/eal/include/sched.h | 46 ++ .../windows/eal/include/sys/queue.h | 8 + lib/librte_eal/windows/eal/meson.build | 9 +- license/exceptions.txt | 12 +- 15 files changed, 1625 insertions(+), 11 deletions(-) create mode 100644 lib/librte_eal/windows/eal/getopt.c create mode 100644 lib/librte_eal/windows/eal/include/dirent.h create mode 100644 lib/librte_eal/windows/eal/include/getopt.h