Skip to contentSkip to conversation

Windows logging

PATCH Superseded Pallavi Kadam 5 participants 16 messages Apr 29, 2020 – May 7, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

cover Windows logging

This patchset adds EAL logging support on Windows. Logs will be sent to console output.

Pallavi Kadam (2):
eal: initialize eal logging on Windows
eal: add fnmatch implementation on Windows

 lib/librte_eal/windows/eal.c             |   3 +
 lib/librte_eal/windows/eal_log.c         |  16 +++
 lib/librte_eal/windows/fnmatch.c         | 172 +++++++++++++++++++++++
 lib/librte_eal/windows/include/fnmatch.h |  16 +--
 lib/librte_eal/windows/meson.build       |   2 +
 5 files changed, 201 insertions(+), 8 deletions(-)
 create mode 100644 lib/librte_eal/windows/eal_log.c
 create mode 100644 lib/librte_eal/windows/fnmatch.c
Signature · 1 line
2.18.0.windows.1
#1 lore raw

PATCH 1/2 eal: initialize eal logging on Windows

Add logging function on Windows to send log output to the console.

---
 lib/librte_eal/windows/eal.c       |  3 +++
 lib/librte_eal/windows/eal_log.c   | 16 ++++++++++++++++
 lib/librte_eal/windows/meson.build |  1 +
 3 files changed, 20 insertions(+)
 create mode 100644 lib/librte_eal/windows/eal_log.c
lib/librte_eal/windows/eal.c +3 -0
index 2cf7a04ef..123afed8d 100644
@@ -227,6 +227,9 @@ rte_eal_init(int argc, char **argv)
 {
 	int i, fctret;
 
+	/* initialize all logs */
+	rte_eal_log_init(NULL, 0);
+
 	eal_log_level_parse(argc, argv);
 
 	/* create a map of all processors in the system */
lib/librte_eal/windows/eal_log.c new file +16 -0
new file mode 100644
index 000000000..875981f13
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017-2018 Intel Corporation
+ */
+
+#include "eal_private.h"
+
+/* set the log to default function, called during eal init process. */
+int
+rte_eal_log_init(__rte_unused const char *id, __rte_unused int facility)
+{
+	rte_openlog_stream(stderr);
+
+	eal_log_set_default(stderr);
+
+	return 0;
+}
lib/librte_eal/windows/meson.build +1 -0
index 09dd4ab2f..e5d1d8336 100644
@@ -7,6 +7,7 @@ sources += files(
 	'eal.c',
 	'eal_debug.c',
 	'eal_lcore.c',
+	'eal_log.c',
 	'eal_thread.c',
 	'getopt.c',
 )
Signature · 1 line
2.18.0.windows.1
#2 lore raw

PATCH 2/2 eal: add fnmatch implementation on Windows

In reply to Pallavi Kadam

Added fnmatch implementation on Windows to support log level arguments.
The source file is with BSD-3-Clause license.
https://github.com/lattera/freebsd/blob/master/usr.bin/csup/fnmatch.c

---
 lib/librte_eal/windows/fnmatch.c         | 172 +++++++++++++++++++++++
 lib/librte_eal/windows/include/fnmatch.h |  16 +--
 lib/librte_eal/windows/meson.build       |   1 +
 3 files changed, 181 insertions(+), 8 deletions(-)
 create mode 100644 lib/librte_eal/windows/fnmatch.c
lib/librte_eal/windows/fnmatch.c new file +172 -0
new file mode 100644
index 000000000..f622bf54c
@@ -0,0 +1,172 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 1989, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Guido van Rossum.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
+#endif /* LIBC_SCCS and not lint */
+
+/*
+ * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
+ * Compares a filename or pathname to a pattern.
+ */
+
+#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "fnmatch.h"
+
+#define EOS	'\0'
+
+static const char *rangematch(const char *, char, int);
+
+int
+fnmatch(const char *pattern, const char *string, int flags)
+{
+	const char *stringstart;
+	char c, test;
+
+	for (stringstart = string;;)
+		switch (c = *pattern++) {
+		case EOS:
+			if ((flags & FNM_LEADING_DIR) && *string == '/')
+				return (0);
+			return (*string == EOS ? 0 : FNM_NOMATCH);
+		case '?':
+			if (*string == EOS)
+				return (FNM_NOMATCH);
+			if (*string == '/' && (flags & FNM_PATHNAME))
+				return (FNM_NOMATCH);
+			if (*string == '.' && (flags & FNM_PERIOD) &&
+			    (string == stringstart ||
+			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+				return (FNM_NOMATCH);
+			++string;
+			break;
+		case '*':
+			c = *pattern;
+			/* Collapse multiple stars. */
+			while (c == '*')
+				c = *++pattern;
+
+			if (*string == '.' && (flags & FNM_PERIOD) &&
+			    (string == stringstart ||
+			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+				return (FNM_NOMATCH);
+
+			/* Optimize for pattern with * at end or before /. */
+			if (c == EOS)
+				if (flags & FNM_PATHNAME)
+					return ((flags & FNM_LEADING_DIR) ||
+					    strchr(string, '/') == NULL ?
+					    0 : FNM_NOMATCH);
+				else
+					return (0);
+			else if (c == '/' && flags & FNM_PATHNAME) {
+				string = strchr(string, '/');
+				if (string == NULL)
+					return (FNM_NOMATCH);
+				break;
+			}
+
+			/* General case, use recursion. */
+			while ((test = *string) != EOS) {
+				if (!fnmatch(pattern, string,
+					flags & ~FNM_PERIOD))
+					return (0);
+				if (test == '/' && flags & FNM_PATHNAME)
+					break;
+				++string;
+			}
+			return (FNM_NOMATCH);
+		case '[':
+			if (*string == EOS)
+				return (FNM_NOMATCH);
+			if (*string == '/' && flags & FNM_PATHNAME)
+				return (FNM_NOMATCH);
+			pattern = rangematch(pattern, *string, flags);
+			if (pattern == NULL)
+				return (FNM_NOMATCH);
+			++string;
+			break;
+		case '\\':
+			if (!(flags & FNM_NOESCAPE)) {
+				c = *pattern++;
+				if (c == EOS) {
+					c = '\\';
+					--pattern;
+				}
+			}
+			/* FALLTHROUGH */
+		default:
+			if (c == *string)
+				;
+			else if ((flags & FNM_CASEFOLD) &&
+				 (tolower((unsigned char)c) ==
+				  tolower((unsigned char)*string)))
+				;
+			else if ((flags & FNM_PREFIX_DIRS) && *string == EOS &&
+			     ((c == '/' && string != stringstart) ||
+			     (string == stringstart+1 && *stringstart == '/')))
+				return (0);
+			else
+				return (FNM_NOMATCH);
+			string++;
+			break;
+		}
+	/* NOTREACHED */
+}
+
+static const char *
+rangematch(const char *pattern, char test, int flags)
+{
+	int negate, ok;
+	char c, c2;
+
+	/*
+	 * A bracket expression starting with an unquoted circumflex
+	 * character produces unspecified results (IEEE 1003.2-1992,
+	 * 3.13.2).  This implementation treats it like '!', for
+	 * consistency with the regular expression syntax.
+	 * J.T. Conklin ([email protected])
+	 */
+	negate = (*pattern == '!' || *pattern == '^');
+	if (negate)
+		++pattern;
+
+	if (flags & FNM_CASEFOLD)
+		test = tolower((unsigned char)test);
+
+	for (ok = 0; (c = *pattern++) != ']';) {
+		if (c == '\\' && !(flags & FNM_NOESCAPE))
+			c = *pattern++;
+		if (c == EOS)
+			return (NULL);
+
+		if (flags & FNM_CASEFOLD)
+			c = tolower((unsigned char)c);
+
+		c2 = *(pattern + 1);
+		if (*pattern == '-' && c2 != EOS && c2 != ']') {
+			pattern += 2;
+			if (c2 == '\\' && !(flags & FNM_NOESCAPE))
+				c2 = *pattern++;
+			if (c2 == EOS)
+				return (NULL);
+
+			if (flags & FNM_CASEFOLD)
+				c2 = tolower((unsigned char)c2);
+
+			if ((unsigned char)c <= (unsigned char)test &&
+			    (unsigned char)test <= (unsigned char)c2)
+				ok = 1;
+		} else if (c == test)
+			ok = 1;
+	}
+	return (ok == negate ? NULL : pattern);
+}
lib/librte_eal/windows/include/fnmatch.h +8 -8
index d0159f07a..142753c35 100644
@@ -18,6 +18,13 @@ extern "C" {
 
 #define FNM_NOMATCH 1
 
+#define FNM_NOESCAPE 0x01
+#define FNM_PATHNAME 0x02
+#define FNM_PERIOD 0x04
+#define FNM_LEADING_DIR 0x08
+#define FNM_CASEFOLD 0x10
+#define FNM_PREFIX_DIRS 0x20
+
 /**
  * This function is used for searhing a given string source
  * with the given regular expression pattern.
@@ -34,14 +41,7 @@ extern "C" {
  * @return
  *	if the pattern is found then return 0 or else FNM_NOMATCH
  */
-static inline int fnmatch(__rte_unused const char *pattern,
-		__rte_unused const char *string,
-		__rte_unused int flags)
-{
-	/* TODO */
-	/* This is a stub, not the expected result */
-	return FNM_NOMATCH;
-}
+int fnmatch(const char *pattern, const char *string, int flags);
 
 #ifdef __cplusplus
 }
lib/librte_eal/windows/meson.build +1 -0
index e5d1d8336..adfc8b9b7 100644
@@ -9,5 +9,6 @@ sources += files(
 	'eal_lcore.c',
 	'eal_log.c',
 	'eal_thread.c',
+	'fnmatch.c',
 	'getopt.c',
 )
Signature · 1 line
2.18.0.windows.1
#3 lore raw

Re: [dpdk-dev] [PATCH 2/2] eal: add fnmatch implementation on Windows

30/04/2020 01:24, Pallavi Kadam:

Quoted 4 lines

Added fnmatch implementation on Windows to support log level arguments.
The source file is with BSD-3-Clause license.
https://github.com/lattera/freebsd/blob/master/usr.bin/csup/fnmatch.c

Sorry for the naive question, I don't know Windows programming.

Do we really need this external code?
Why RtlIsNameInExpression from Windows cannot be used?
https://docs.microsoft.com/en-us/windows/win32/devnotes/rtlisnameinexpression

#4 lore raw

Re: [dpdk-dev] [PATCH 2/2] eal: add fnmatch implementation on Windows

Quoted 11 lines · On 2020-04-30 08:52 GMT+0200 Thomas Monjalon wrote:

30/04/2020 01:24, Pallavi Kadam:

Quoted 4 lines

Added fnmatch implementation on Windows to support log level arguments.
The source file is with BSD-3-Clause license.
https://github.com/lattera/freebsd/blob/master/usr.bin/csup/fnmatch.c

Sorry for the naive question, I don't know Windows programming.

Do we really need this external code?
Why RtlIsNameInExpression from Windows cannot be used?
https://docs.microsoft.com/en-us/windows/win32/devnotes/rtlisnameinexpression

The general reason not to use Win32 API for globbing is poorly documented
contract: what are the exact matching rules? They're definitely incompatible with fnmatch(3). IMO small external code is better than unknown behavior.

RtlIsNameInExpression is an internal call for drivers and services with a cumbersome API. PathMatchSpecA is the user-mode interface, but see above.

https://docs.microsoft.com/en-us/windows/win32/api/shlwapi/nf-shlwapi-pathmatchspeca

Signature · 1 line
Dmitry Kozlyuk
#5 lore raw

Re: [dpdk-dev] [PATCH 2/2] eal: add fnmatch implementation on Windows

Quoted 13 lines · Dmitry Kozlyuk
Quoted 11 lines · On 2020-04-30 08:52 GMT+0200 Thomas Monjalon wrote:

30/04/2020 01:24, Pallavi Kadam:

Quoted 4 lines

Added fnmatch implementation on Windows to support log level arguments.
The source file is with BSD-3-Clause license.
https://github.com/lattera/freebsd/blob/master/usr.bin/csup/fnmatch.c

Sorry for the naive question, I don't know Windows programming.

Do we really need this external code?
Why RtlIsNameInExpression from Windows cannot be used?
https://docs.microsoft.com/en-us/windows/win32/devnotes/rtlisnameinexpression

Quoted 9 lines

The general reason not to use Win32 API for globbing is poorly documented
contract: what are the exact matching rules? They're definitely incompatible with fnmatch(3). IMO small external code is better than unknown behavior.

RtlIsNameInExpression is an internal call for drivers and services with a cumbersome API. PathMatchSpecA is the user-mode interface, but see above.

https://docs.microsoft.com/en-us/windows/win32/api/shlwapi/nf-shlwapi-pathmatchspeca

I will agree with Dmitry here. The fnmatch external code is shipping, production quality code. So it's better to use it than writing something new.

ranjit m.

#6 lore raw

Re: [dpdk-dev] [PATCH 2/2] eal: add fnmatch implementation on Windows

01/05/2020 03:08, Ranjit Menon:

Quoted 21 lines · Dmitry Kozlyuk
Quoted 20 lines · On 2020-04-30 08:52 GMT+0200 Thomas Monjalon wrote:
Quoted 11 lines

30/04/2020 01:24, Pallavi Kadam:

Quoted 4 lines

Added fnmatch implementation on Windows to support log level arguments.
The source file is with BSD-3-Clause license.
https://github.com/lattera/freebsd/blob/master/usr.bin/csup/fnmatch.c

Sorry for the naive question, I don't know Windows programming.

Do we really need this external code?
Why RtlIsNameInExpression from Windows cannot be used?
https://docs.microsoft.com/en-us/windows/win32/devnotes/rtlisnameinexpression

The general reason not to use Win32 API for globbing is poorly documented
contract: what are the exact matching rules? They're definitely incompatible with fnmatch(3). IMO small external code is better than unknown behavior.

RtlIsNameInExpression is an internal call for drivers and services with a cumbersome API. PathMatchSpecA is the user-mode interface, but see above.

Quoted 6 lines
Quoted 2 lines

https://docs.microsoft.com/en-us/windows/win32/api/shlwapi/nf-shlwapi-pathmatchspeca

I will agree with Dmitry here. The fnmatch external code is shipping, production quality code. So it's better to use it than writing something new.

OK thank you for the explanations and opinions.

#7 lore raw
In reply to Pallavi Kadam

30/04/2020 01:24, Pallavi Kadam:

Quoted 6 lines

This patchset adds EAL logging support on Windows. Logs will be sent to console output.

Pallavi Kadam (2):
eal: initialize eal logging on Windows
eal: add fnmatch implementation on Windows

fnmatch is required to change the log level of logs specified with a globbing pattern.

I think it would be nicer to introduce fnmatch first, and state in the other patch that logging is supported on Windows.

Titles would be:
eal/windows: add fnmatch implementation
log: support on Windows

#8 lore raw
Quoted 11 lines · Thomas Monjalon

30/04/2020 01:24, Pallavi Kadam:

Quoted 6 lines

This patchset adds EAL logging support on Windows. Logs will be sent to console output.

Pallavi Kadam (2):
eal: initialize eal logging on Windows
eal: add fnmatch implementation on Windows

fnmatch is required to change the log level of logs specified with a globbing pattern.

Quoted 8 lines

I think it would be nicer to introduce fnmatch first, and state in the other patch that logging is supported on Windows.

Titles would be:
eal/windows: add fnmatch implementation
log: support on Windows

Ok, will interchange the sequence of the patches in v2. Thanks,

#9 lore raw

v2 cover Windows logging

In reply to Pallavi Kadam

This patchset adds EAL logging support on Windows. Logs will be sent to console output.

v2 Changes:
Introduced Fnmatch implementation first
Added logging support in the second patch

Pallavi Kadam (2):
eal: add fnmatch implementation
eal: add log support on Windows

 lib/librte_eal/windows/eal.c             |   3 +
 lib/librte_eal/windows/eal_log.c         |  16 +++
 lib/librte_eal/windows/fnmatch.c         | 172 +++++++++++++++++++++++
 lib/librte_eal/windows/include/fnmatch.h |  16 +--
 lib/librte_eal/windows/meson.build       |   2 +
 5 files changed, 201 insertions(+), 8 deletions(-)
 create mode 100644 lib/librte_eal/windows/eal_log.c
 create mode 100644 lib/librte_eal/windows/fnmatch.c
Signature · 1 line
2.18.0.windows.1
#10 lore raw

PATCH v2 1/2 eal: add fnmatch implementation

Fnmatch implementation is required on Windows to support log level arguments specified with a globbing pattern. The source file is with BSD-3-Clause license.
https://github.com/lattera/freebsd/blob/master/usr.bin/csup/fnmatch.c

---
 lib/librte_eal/windows/fnmatch.c         | 172 +++++++++++++++++++++++
 lib/librte_eal/windows/include/fnmatch.h |  16 +--
 lib/librte_eal/windows/meson.build       |   1 +
 3 files changed, 181 insertions(+), 8 deletions(-)
 create mode 100644 lib/librte_eal/windows/fnmatch.c
lib/librte_eal/windows/fnmatch.c new file +172 -0
new file mode 100644
index 000000000..f622bf54c
@@ -0,0 +1,172 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 1989, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Guido van Rossum.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
+#endif /* LIBC_SCCS and not lint */
+
+/*
+ * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
+ * Compares a filename or pathname to a pattern.
+ */
+
+#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "fnmatch.h"
+
+#define EOS	'\0'
+
+static const char *rangematch(const char *, char, int);
+
+int
+fnmatch(const char *pattern, const char *string, int flags)
+{
+	const char *stringstart;
+	char c, test;
+
+	for (stringstart = string;;)
+		switch (c = *pattern++) {
+		case EOS:
+			if ((flags & FNM_LEADING_DIR) && *string == '/')
+				return (0);
+			return (*string == EOS ? 0 : FNM_NOMATCH);
+		case '?':
+			if (*string == EOS)
+				return (FNM_NOMATCH);
+			if (*string == '/' && (flags & FNM_PATHNAME))
+				return (FNM_NOMATCH);
+			if (*string == '.' && (flags & FNM_PERIOD) &&
+			    (string == stringstart ||
+			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+				return (FNM_NOMATCH);
+			++string;
+			break;
+		case '*':
+			c = *pattern;
+			/* Collapse multiple stars. */
+			while (c == '*')
+				c = *++pattern;
+
+			if (*string == '.' && (flags & FNM_PERIOD) &&
+			    (string == stringstart ||
+			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
+				return (FNM_NOMATCH);
+
+			/* Optimize for pattern with * at end or before /. */
+			if (c == EOS)
+				if (flags & FNM_PATHNAME)
+					return ((flags & FNM_LEADING_DIR) ||
+					    strchr(string, '/') == NULL ?
+					    0 : FNM_NOMATCH);
+				else
+					return (0);
+			else if (c == '/' && flags & FNM_PATHNAME) {
+				string = strchr(string, '/');
+				if (string == NULL)
+					return (FNM_NOMATCH);
+				break;
+			}
+
+			/* General case, use recursion. */
+			while ((test = *string) != EOS) {
+				if (!fnmatch(pattern, string,
+					flags & ~FNM_PERIOD))
+					return (0);
+				if (test == '/' && flags & FNM_PATHNAME)
+					break;
+				++string;
+			}
+			return (FNM_NOMATCH);
+		case '[':
+			if (*string == EOS)
+				return (FNM_NOMATCH);
+			if (*string == '/' && flags & FNM_PATHNAME)
+				return (FNM_NOMATCH);
+			pattern = rangematch(pattern, *string, flags);
+			if (pattern == NULL)
+				return (FNM_NOMATCH);
+			++string;
+			break;
+		case '\\':
+			if (!(flags & FNM_NOESCAPE)) {
+				c = *pattern++;
+				if (c == EOS) {
+					c = '\\';
+					--pattern;
+				}
+			}
+			/* FALLTHROUGH */
+		default:
+			if (c == *string)
+				;
+			else if ((flags & FNM_CASEFOLD) &&
+				 (tolower((unsigned char)c) ==
+				  tolower((unsigned char)*string)))
+				;
+			else if ((flags & FNM_PREFIX_DIRS) && *string == EOS &&
+			     ((c == '/' && string != stringstart) ||
+			     (string == stringstart+1 && *stringstart == '/')))
+				return (0);
+			else
+				return (FNM_NOMATCH);
+			string++;
+			break;
+		}
+	/* NOTREACHED */
+}
+
+static const char *
+rangematch(const char *pattern, char test, int flags)
+{
+	int negate, ok;
+	char c, c2;
+
+	/*
+	 * A bracket expression starting with an unquoted circumflex
+	 * character produces unspecified results (IEEE 1003.2-1992,
+	 * 3.13.2).  This implementation treats it like '!', for
+	 * consistency with the regular expression syntax.
+	 * J.T. Conklin ([email protected])
+	 */
+	negate = (*pattern == '!' || *pattern == '^');
+	if (negate)
+		++pattern;
+
+	if (flags & FNM_CASEFOLD)
+		test = tolower((unsigned char)test);
+
+	for (ok = 0; (c = *pattern++) != ']';) {
+		if (c == '\\' && !(flags & FNM_NOESCAPE))
+			c = *pattern++;
+		if (c == EOS)
+			return (NULL);
+
+		if (flags & FNM_CASEFOLD)
+			c = tolower((unsigned char)c);
+
+		c2 = *(pattern + 1);
+		if (*pattern == '-' && c2 != EOS && c2 != ']') {
+			pattern += 2;
+			if (c2 == '\\' && !(flags & FNM_NOESCAPE))
+				c2 = *pattern++;
+			if (c2 == EOS)
+				return (NULL);
+
+			if (flags & FNM_CASEFOLD)
+				c2 = tolower((unsigned char)c2);
+
+			if ((unsigned char)c <= (unsigned char)test &&
+			    (unsigned char)test <= (unsigned char)c2)
+				ok = 1;
+		} else if (c == test)
+			ok = 1;
+	}
+	return (ok == negate ? NULL : pattern);
+}
lib/librte_eal/windows/include/fnmatch.h +8 -8
index d0159f07a..142753c35 100644
@@ -18,6 +18,13 @@ extern "C" {
 
 #define FNM_NOMATCH 1
 
+#define FNM_NOESCAPE 0x01
+#define FNM_PATHNAME 0x02
+#define FNM_PERIOD 0x04
+#define FNM_LEADING_DIR 0x08
+#define FNM_CASEFOLD 0x10
+#define FNM_PREFIX_DIRS 0x20
+
 /**
  * This function is used for searhing a given string source
  * with the given regular expression pattern.
@@ -34,14 +41,7 @@ extern "C" {
  * @return
  *	if the pattern is found then return 0 or else FNM_NOMATCH
  */
-static inline int fnmatch(__rte_unused const char *pattern,
-		__rte_unused const char *string,
-		__rte_unused int flags)
-{
-	/* TODO */
-	/* This is a stub, not the expected result */
-	return FNM_NOMATCH;
-}
+int fnmatch(const char *pattern, const char *string, int flags);
 
 #ifdef __cplusplus
 }
lib/librte_eal/windows/meson.build +1 -0
index 09dd4ab2f..8829407c4 100644
@@ -8,5 +8,6 @@ sources += files(
 	'eal_debug.c',
 	'eal_lcore.c',
 	'eal_thread.c',
+	'fnmatch.c',
 	'getopt.c',
 )
Signature · 1 line
2.18.0.windows.1
Acked-by on v2 1/2
#11 lore raw

Re: [dpdk-dev] [PATCH v2 1/2] eal: add fnmatch implementation

Quoted 10 lines · Pallavi Kadam

Fnmatch implementation is required on Windows to support log level arguments specified with a globbing pattern. The source file is with BSD-3-Clause license.
https://github.com/lattera/freebsd/blob/master/usr.bin/csup/fnmatch.c

---

#12 lore raw

PATCH v2 2/2 eal: add log support on Windows

In reply to Pallavi Kadam

Initialize logging on Windows to send log output
to the console.

---
 lib/librte_eal/windows/eal.c       |  3 +++
 lib/librte_eal/windows/eal_log.c   | 16 ++++++++++++++++
 lib/librte_eal/windows/meson.build |  1 +
 3 files changed, 20 insertions(+)
 create mode 100644 lib/librte_eal/windows/eal_log.c
lib/librte_eal/windows/eal.c +3 -0
index 2cf7a04ef..123afed8d 100644
@@ -227,6 +227,9 @@ rte_eal_init(int argc, char **argv)
 {
 	int i, fctret;
 
+	/* initialize all logs */
+	rte_eal_log_init(NULL, 0);
+
 	eal_log_level_parse(argc, argv);
 
 	/* create a map of all processors in the system */
lib/librte_eal/windows/eal_log.c new file +16 -0
new file mode 100644
index 000000000..875981f13
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017-2018 Intel Corporation
+ */
+
+#include "eal_private.h"
+
+/* set the log to default function, called during eal init process. */
+int
+rte_eal_log_init(__rte_unused const char *id, __rte_unused int facility)
+{
+	rte_openlog_stream(stderr);
+
+	eal_log_set_default(stderr);
+
+	return 0;
+}
lib/librte_eal/windows/meson.build +1 -0
index 8829407c4..adfc8b9b7 100644
@@ -7,6 +7,7 @@ sources += files(
 	'eal.c',
 	'eal_debug.c',
 	'eal_lcore.c',
+	'eal_log.c',
 	'eal_thread.c',
 	'fnmatch.c',
 	'getopt.c',
Signature · 1 line
2.18.0.windows.1
Tested-by Acked-by on v2 2/2
#13 lore raw

Re: [dpdk-dev] [PATCH v2 2/2] eal: add log support on Windows

Quoted 8 lines · Pallavi Kadam

Initialize logging on Windows to send log output to the console.

---

#14 lore raw

Re: [dpdk-dev] [PATCH v2 2/2] eal: add log support on Windows

In reply to Pallavi Kadam

06/05/2020 03:30, Pallavi Kadam:

Quoted 8 lines

Initialize logging on Windows to send log output to the console.

---

The comment below is useless. I take freedom of dropping it on apply :-)

Quoted 2 lines
lib/librte_eal/windows/eal.c +2 -0
+	/* initialize all logs */
+	rte_eal_log_init(NULL, 0);
#15 lore raw
In reply to Pallavi Kadam

06/05/2020 03:30, Pallavi Kadam:

Quoted 10 lines

This patchset adds EAL logging support on Windows. Logs will be sent to console output.

v2 Changes:
Introduced Fnmatch implementation first
Added logging support in the second patch

Pallavi Kadam (2):
eal: add fnmatch implementation
eal: add log support on Windows

Applied, thanks