DPDK patches and discussions
 help / color / mirror / Atom feed
From: Pallavi Kadam <pallavi.kadam@intel.com>
To: dev@dpdk.org, thomas@monjalon.net
Cc: Harini.Ramakrishnan@microsoft.com, keith.wiles@intel.com,
	bruce.richardson@intel.com, david.marchand@redhat.com,
	jerinjacobk@gmail.com, ranjit.menon@intel.com,
	antara.ganesh.kolar@intel.com, pallavi.kadam@intel.com
Subject: [dpdk-dev] [PATCH v6 10/10] eal: add minimum viable code to support parsing
Date: Thu, 30 Jan 2020 16:03:07 -0800	[thread overview]
Message-ID: <20200131000307.10608-11-pallavi.kadam@intel.com> (raw)
In-Reply-To: <20200131000307.10608-1-pallavi.kadam@intel.com>

Adding specific logic for eal.c to support parsing on
Windows.

Signed-off-by: Pallavi Kadam <pallavi.kadam@intel.com>
Signed-off-by: Antara Ganesh Kolar <antara.ganesh.kolar@intel.com>
Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
Reviewed-by: Keith Wiles <keith.wiles@intel.com>
---
 lib/librte_eal/windows/eal/eal.c | 133 ++++++++++++++++++++++++++++++-
 1 file changed, 130 insertions(+), 3 deletions(-)

diff --git a/lib/librte_eal/windows/eal/eal.c b/lib/librte_eal/windows/eal/eal.c
index 6693c4d60..0d7c45f18 100644
--- a/lib/librte_eal/windows/eal/eal.c
+++ b/lib/librte_eal/windows/eal/eal.c
@@ -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;
 }
-- 
2.18.0.windows.1


  parent reply	other threads:[~2020-01-31  0:05 UTC|newest]

Thread overview: 149+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-06 22:09 [dpdk-dev] [PATCH 0/9] Windows patchset with additional EAL functionalities Pallavi Kadam
2019-09-06 22:09 ` [dpdk-dev] [PATCH 1/9] eal: eal stub to support parsing feature on windows Pallavi Kadam
2019-09-06 22:09 ` [dpdk-dev] [PATCH 2/9] eal: syslog implementation for windows Pallavi Kadam
2019-09-06 22:09 ` [dpdk-dev] [PATCH 3/9] eal: add windows compatible header files Pallavi Kadam
2019-09-06 22:09 ` [dpdk-dev] [PATCH 4/9] eal: dirent.h implementation for windows Pallavi Kadam
2019-09-06 22:09 ` [dpdk-dev] [PATCH 5/9] eal: add additional function overrides in windows header files Pallavi Kadam
2019-09-06 22:09 ` [dpdk-dev] [PATCH 6/9] eal: getopt implementation for windows Pallavi Kadam
2019-09-06 22:09 ` [dpdk-dev] [PATCH 7/9] eal: add function to detect process type Pallavi Kadam
2019-09-06 22:09 ` [dpdk-dev] [PATCH 8/9] build: add additional common files support Pallavi Kadam
2019-09-06 22:09 ` [dpdk-dev] [PATCH 9/9] eal: add minimum viable code to support parsing Pallavi Kadam
2019-09-09 19:53 ` [dpdk-dev] [PATCH 0/9] Windows patchset with additional EAL functionalities Pallavi Kadam
2019-09-09 19:53   ` [dpdk-dev] [PATCH 1/9] eal: eal stub to support parsing feature on windows Pallavi Kadam
2019-09-09 19:53   ` [dpdk-dev] [PATCH 2/9] eal: syslog implementation for windows Pallavi Kadam
2019-09-10  9:17     ` Stephen Hemminger
2019-09-25 23:38       ` Pallavi Kadam
2019-09-09 19:53   ` [dpdk-dev] [PATCH 3/9] eal: add windows compatible header files Pallavi Kadam
2019-09-10  9:19     ` Stephen Hemminger
2019-09-12 17:11       ` Pallavi Kadam
2019-09-12 21:36         ` Stephen Hemminger
2019-09-09 19:53   ` [dpdk-dev] [PATCH 4/9] eal: dirent.h implementation for windows Pallavi Kadam
2019-09-09 19:54   ` [dpdk-dev] [PATCH 5/9] eal: add additional function overrides in windows header files Pallavi Kadam
2019-09-09 19:54   ` [dpdk-dev] [PATCH 6/9] eal: getopt implementation for windows Pallavi Kadam
2019-09-12 21:40     ` Stephen Hemminger
2019-09-13  9:46       ` Bruce Richardson
2019-09-13 17:23         ` Pallavi Kadam
2019-09-09 19:54   ` [dpdk-dev] [PATCH 7/9] eal: add function to detect process type Pallavi Kadam
2019-09-09 19:54   ` [dpdk-dev] [PATCH 8/9] build: add additional common files support Pallavi Kadam
2019-09-09 19:54   ` [dpdk-dev] [PATCH 9/9] eal: add minimum viable code to support parsing Pallavi Kadam
2019-09-26 20:29   ` [dpdk-dev] [PATCH v2 0/9] Windows patchset with additional EAL functionalities Pallavi Kadam
2019-09-26 20:29     ` [dpdk-dev] [PATCH v2 1/9] eal: eal stub to support parsing feature on windows Pallavi Kadam
2019-09-26 20:29     ` [dpdk-dev] [PATCH v2 2/9] eal: syslog implementation for windows Pallavi Kadam
2019-09-26 20:29     ` [dpdk-dev] [PATCH v2 3/9] eal: add windows compatible header files Pallavi Kadam
2019-09-27  7:58       ` Jerin Jacob
2019-09-30 17:49         ` Pallavi Kadam
2019-10-01  5:56           ` Jerin Jacob
2019-10-03  0:40             ` Pallavi Kadam
2019-09-26 20:29     ` [dpdk-dev] [PATCH v2 4/9] eal: dirent.h implementation for windows Pallavi Kadam
2019-09-26 20:29     ` [dpdk-dev] [PATCH v2 5/9] eal: add additional function overrides in windows header files Pallavi Kadam
2019-09-27  8:06       ` Jerin Jacob
2019-09-30 23:11         ` Pallavi Kadam
2019-09-26 20:29     ` [dpdk-dev] [PATCH v2 6/9] eal: getopt implementation for windows Pallavi Kadam
2019-09-26 21:27       ` Stephen Hemminger
2019-09-26 23:26         ` Pallavi Kadam
2019-09-26 20:29     ` [dpdk-dev] [PATCH v2 7/9] eal: add function to detect process type Pallavi Kadam
2019-09-26 20:29     ` [dpdk-dev] [PATCH v2 8/9] build: add additional common files support Pallavi Kadam
2019-09-26 20:29     ` [dpdk-dev] [PATCH v2 9/9] eal: add minimum viable code to support parsing Pallavi Kadam
2019-10-22 20:02     ` [dpdk-dev] [PATCH v3 0/9] Windows patchset with additional EAL functionalities Pallavi Kadam
2019-10-22 20:02       ` [dpdk-dev] [PATCH v3 1/9] eal: eal stub to support parsing feature on windows Pallavi Kadam
2019-10-22 20:02       ` [dpdk-dev] [PATCH v3 2/9] eal: syslog implementation for windows Pallavi Kadam
2019-10-22 20:02       ` [dpdk-dev] [PATCH v3 3/9] eal: add windows compatible header files Pallavi Kadam
2019-10-22 20:02       ` [dpdk-dev] [PATCH v3 4/9] eal: dirent.h implementation for windows Pallavi Kadam
2019-10-22 20:02       ` [dpdk-dev] [PATCH v3 5/9] eal: add additional function overrides in windows header files Pallavi Kadam
2019-10-22 20:02       ` [dpdk-dev] [PATCH v3 6/9] eal: getopt implementation for windows Pallavi Kadam
2019-10-22 20:02       ` [dpdk-dev] [PATCH v3 7/9] eal: add function to detect process type Pallavi Kadam
2019-10-22 20:02       ` [dpdk-dev] [PATCH v3 8/9] build: add additional common files support Pallavi Kadam
2019-10-22 20:02       ` [dpdk-dev] [PATCH v3 9/9] eal: add minimum viable code to support parsing Pallavi Kadam
2020-01-09  3:13       ` [dpdk-dev] [PATCH v4 0/9] Windows patchset with additional EAL functionalities Pallavi Kadam
2020-01-09  3:13         ` [dpdk-dev] [PATCH v4 1/9] license: add license exception for windows Pallavi Kadam
2020-01-09  3:13         ` [dpdk-dev] [PATCH v4 2/9] eal: dirent.h implementation " Pallavi Kadam
2020-01-09  3:13         ` [dpdk-dev] [PATCH v4 3/9] eal: add windows compatible header files Pallavi Kadam
2020-01-09  3:13         ` [dpdk-dev] [PATCH v4 4/9] eal: add additional function overrides in windows " Pallavi Kadam
2020-01-09  3:13         ` [dpdk-dev] [PATCH v4 5/9] eal: getopt implementation for windows Pallavi Kadam
2020-01-09  3:13         ` [dpdk-dev] [PATCH v4 6/9] eal: add function to detect process type Pallavi Kadam
2020-01-09  6:35           ` Stephen Hemminger
2020-01-09 22:18             ` Pallavi Kadam
2020-01-09  3:13         ` [dpdk-dev] [PATCH v4 7/9] eal: remove syslog support for windows Pallavi Kadam
2020-01-09  3:13         ` [dpdk-dev] [PATCH v4 8/9] build: add additional common files support Pallavi Kadam
2020-01-09  3:13         ` [dpdk-dev] [PATCH v4 9/9] eal: add minimum viable code to support parsing Pallavi Kadam
2020-01-13 21:55         ` [dpdk-dev] [PATCH v5 0/9] Windows patchset with additional EAL functionalities Pallavi Kadam
2020-01-13 21:55           ` [dpdk-dev] [PATCH v5 1/9] license: add license exception for windows Pallavi Kadam
2020-01-13 21:55           ` [dpdk-dev] [PATCH v5 2/9] eal: dirent.h implementation " Pallavi Kadam
2020-01-13 21:55           ` [dpdk-dev] [PATCH v5 3/9] eal: add windows compatible header files Pallavi Kadam
2020-01-27 22:41             ` Thomas Monjalon
2020-01-28 23:34               ` Pallavi Kadam
2020-01-13 21:55           ` [dpdk-dev] [PATCH v5 4/9] eal: add additional function overrides in windows " Pallavi Kadam
2020-01-13 21:55           ` [dpdk-dev] [PATCH v5 5/9] eal: getopt implementation for windows Pallavi Kadam
2020-01-13 21:55           ` [dpdk-dev] [PATCH v5 6/9] eal: add function to detect process type Pallavi Kadam
2020-01-13 21:55           ` [dpdk-dev] [PATCH v5 7/9] eal: remove syslog support for windows Pallavi Kadam
2020-01-27 22:52             ` Thomas Monjalon
2020-01-28 23:45               ` Pallavi Kadam
2020-01-13 21:55           ` [dpdk-dev] [PATCH v5 8/9] build: add additional common files support Pallavi Kadam
2020-01-27 22:55             ` Thomas Monjalon
2020-01-28 23:46               ` Pallavi Kadam
2020-01-13 21:55           ` [dpdk-dev] [PATCH v5 9/9] eal: add minimum viable code to support parsing Pallavi Kadam
2020-01-31  0:02           ` [dpdk-dev] [PATCH v6 00/10] Windows patchset with additional EAL functionalities Pallavi Kadam
2020-01-31  0:02             ` [dpdk-dev] [PATCH v6 01/10] license: add license exception for windows Pallavi Kadam
2020-01-31  0:02             ` [dpdk-dev] [PATCH v6 02/10] eal: dirent.h implementation " Pallavi Kadam
2020-01-31  0:03             ` [dpdk-dev] [PATCH v6 03/10] eal: include filesystem " Pallavi Kadam
2020-01-31  6:04               ` Dmitry Kozliuk
2020-01-31 22:03                 ` Pallavi Kadam
2020-01-31  0:03             ` [dpdk-dev] [PATCH v6 04/10] eal: add additional function overrides in windows header files Pallavi Kadam
2020-01-31  0:03             ` [dpdk-dev] [PATCH v6 05/10] eal: getopt implementation for windows Pallavi Kadam
2020-01-31  0:03             ` [dpdk-dev] [PATCH v6 06/10] eal: add function to detect process type Pallavi Kadam
2020-01-31  0:03             ` [dpdk-dev] [PATCH v6 07/10] eal: include SSE4 support for windows Pallavi Kadam
2020-01-31  0:03             ` [dpdk-dev] [PATCH v6 08/10] eal: remove syslog and dlfcn " Pallavi Kadam
2020-01-31  0:03             ` [dpdk-dev] [PATCH v6 09/10] build: add additional common files support Pallavi Kadam
2020-01-31  0:03             ` Pallavi Kadam [this message]
2020-02-01  0:03             ` [dpdk-dev] [PATCH v7 0/9] Windows patchset with additional EAL functionalities Pallavi Kadam
2020-02-01  0:03               ` [dpdk-dev] [PATCH v7 1/9] license: add license exception for windows Pallavi Kadam
2020-02-01  0:03               ` [dpdk-dev] [PATCH v7 2/9] eal: dirent.h implementation " Pallavi Kadam
2020-02-01  0:04               ` [dpdk-dev] [PATCH v7 3/9] eal: add additional function overrides in windows header files Pallavi Kadam
2020-02-05 19:54                 ` Dmitry Kozlyuk
2020-02-01  0:04               ` [dpdk-dev] [PATCH v7 4/9] eal: getopt implementation for windows Pallavi Kadam
2020-02-01  0:04               ` [dpdk-dev] [PATCH v7 5/9] eal: add function to detect process type Pallavi Kadam
2020-02-05 20:04                 ` Dmitry Kozlyuk
2020-02-06  0:56                   ` Pallavi Kadam
2020-02-01  0:04               ` [dpdk-dev] [PATCH v7 6/9] eal: include SSE4 support for windows Pallavi Kadam
2020-02-01  0:04               ` [dpdk-dev] [PATCH v7 7/9] eal: remove syslog and dlfcn " Pallavi Kadam
2020-02-01  0:04               ` [dpdk-dev] [PATCH v7 8/9] build: add additional common files support Pallavi Kadam
2020-02-01  0:04               ` [dpdk-dev] [PATCH v7 9/9] eal: add minimum viable code to support parsing Pallavi Kadam
2020-02-05 19:54                 ` Dmitry Kozlyuk
2020-02-06  0:39                   ` Pallavi Kadam
2020-02-06  1:39                     ` Pallavi Kadam
2020-02-06  2:11                       ` Thomas Monjalon
2020-02-06  3:18                         ` Pallavi Kadam
2020-02-06  6:41                       ` Dmitry Kozlyuk
2020-02-06  9:26                         ` Thomas Monjalon
2020-02-07 16:46                           ` Ranjit Menon
2020-02-07 17:17                             ` Ranjit Menon
2020-02-08  0:43                           ` [dpdk-dev] [EXTERNAL] " Narcisa Ana Maria Vasile
2020-02-07  3:45                         ` [dpdk-dev] " Pallavi Kadam
2020-02-07  3:14               ` [dpdk-dev] [PATCH v8 0/9] Windows patchset with additional EAL functionalities Pallavi Kadam
2020-02-07  3:14                 ` [dpdk-dev] [PATCH v8 1/9] license: add license exception for windows Pallavi Kadam
2020-02-12  0:38                   ` [dpdk-dev] [EXTERNAL] " Narcisa Ana Maria Vasile
2020-02-12 21:38                   ` [dpdk-dev] " Thomas Monjalon
2020-02-12 21:55                     ` Ranjit Menon
2020-02-07  3:14                 ` [dpdk-dev] [PATCH v8 2/9] eal: dirent.h implementation " Pallavi Kadam
2020-02-12  0:40                   ` [dpdk-dev] [EXTERNAL] " Narcisa Ana Maria Vasile
2020-02-07  3:14                 ` [dpdk-dev] [PATCH v8 3/9] eal: add additional function overrides in windows header files Pallavi Kadam
2020-02-12  0:40                   ` [dpdk-dev] [EXTERNAL] " Narcisa Ana Maria Vasile
2020-02-07  3:14                 ` [dpdk-dev] [PATCH v8 4/9] eal: getopt implementation for windows Pallavi Kadam
2020-02-12  0:41                   ` [dpdk-dev] [EXTERNAL] " Narcisa Ana Maria Vasile
2020-02-07  3:14                 ` [dpdk-dev] [PATCH v8 5/9] eal: add function to detect process type Pallavi Kadam
2020-02-12  0:42                   ` [dpdk-dev] [EXTERNAL] " Narcisa Ana Maria Vasile
2020-02-07  3:14                 ` [dpdk-dev] [PATCH v8 6/9] eal: include SSE4 support for windows Pallavi Kadam
2020-02-12  0:42                   ` [dpdk-dev] [EXTERNAL] " Narcisa Ana Maria Vasile
2020-02-07  3:14                 ` [dpdk-dev] [PATCH v8 7/9] eal: remove syslog and dlfcn " Pallavi Kadam
2020-02-12  0:42                   ` [dpdk-dev] [EXTERNAL] " Narcisa Ana Maria Vasile
2020-02-07  3:14                 ` [dpdk-dev] [PATCH v8 8/9] build: add additional common files support Pallavi Kadam
2020-02-12  0:42                   ` [dpdk-dev] [EXTERNAL] " Narcisa Ana Maria Vasile
2020-02-07  3:14                 ` [dpdk-dev] [PATCH v8 9/9] eal: add minimum viable code to support parsing Pallavi Kadam
2020-02-12  0:43                   ` [dpdk-dev] [EXTERNAL] " Narcisa Ana Maria Vasile
2020-02-07 19:05                 ` [dpdk-dev] [PATCH v8 0/9] Windows patchset with additional EAL functionalities Dmitry Kozlyuk
2020-02-12 21:52                   ` Thomas Monjalon
2020-02-08  0:36                 ` [dpdk-dev] [EXTERNAL] " Narcisa Ana Maria Vasile
2020-02-08  1:04                 ` Narcisa Ana Maria Vasile
2020-02-10 20:32                 ` Narcisa Ana Maria Vasile
2020-02-10 21:22                 ` Narcisa Ana Maria Vasile
2020-02-11 21:25                 ` Narcisa Ana Maria Vasile

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200131000307.10608-11-pallavi.kadam@intel.com \
    --to=pallavi.kadam@intel.com \
    --cc=Harini.Ramakrishnan@microsoft.com \
    --cc=antara.ganesh.kolar@intel.com \
    --cc=bruce.richardson@intel.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=jerinjacobk@gmail.com \
    --cc=keith.wiles@intel.com \
    --cc=ranjit.menon@intel.com \
    --cc=thomas@monjalon.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).