@@ -2045,8 +2045,7 @@ rte_vect_set_max_simd_bitwidth(uint16_t bitwidth)
void
eal_common_usage(void)
{
- printf("[options]\n\n"
- "EAL common options:\n"
+ printf("EAL common options:\n"
" -c COREMASK Hexadecimal bitmask of cores to run on\n"
" -l CORELIST List of cores to run on\n"
" The argument format is <c1>[-c2][,c3[-c4],...]\n"
@@ -2076,7 +2075,7 @@ eal_common_usage(void)
" --"OPT_VDEV" Add a virtual device.\n"
" The argument format is <driver><id>[,key=val,...]\n"
" (ex: --vdev=net_pcap0,iface=eth2).\n"
- " --"OPT_IOVA_MODE" Set IOVA mode. 'pa' for IOVA_PA\n"
+ " --"OPT_IOVA_MODE" Set IOVA mode. 'pa' for IOVA_PA\n"
" 'va' for IOVA_VA\n"
" -d LIB.so|DIR Add a driver or driver directory\n"
" (can be used multiple times)\n"
@@ -2116,11 +2115,11 @@ eal_common_usage(void)
#endif /* !RTE_EXEC_ENV_WINDOWS */
" -v Display version information on startup\n"
" -h, --help This help\n"
- " --"OPT_IN_MEMORY" Operate entirely in memory. This will\n"
+ " --"OPT_IN_MEMORY" Operate entirely in memory. This will\n"
" disable secondary process support\n"
" --"OPT_BASE_VIRTADDR" Base virtual address\n"
- " --"OPT_TELEMETRY" Enable telemetry support (on by default)\n"
- " --"OPT_NO_TELEMETRY" Disable telemetry support\n"
+ " --"OPT_TELEMETRY" Enable telemetry support (on by default)\n"
+ " --"OPT_NO_TELEMETRY" Disable telemetry support\n"
" --"OPT_FORCE_MAX_SIMD_BITWIDTH" Force the max SIMD bitwidth\n"
"\nEAL options for DEBUG use only:\n"
" --"OPT_HUGE_UNLINK" Unlink hugepage files after init\n"
@@ -421,13 +421,13 @@ eal_usage(const char *prgname)
{
rte_usage_hook_t hook = eal_get_application_usage_hook();
- printf("\nUsage: %s ", prgname);
- eal_common_usage();
- /* Allow the application to print its usage message too if hook is set */
if (hook) {
- printf("===== Application Usage =====\n\n");
+ /* Print application usage through EAL options parsing. */
(hook)(prgname);
+ printf("\n");
}
+
+ eal_common_usage();
}
static inline size_t
@@ -535,7 +535,12 @@ eal_usage(const char *prgname)
{
rte_usage_hook_t hook = eal_get_application_usage_hook();
- printf("\nUsage: %s ", prgname);
+ if (hook) {
+ /* Print application usage through EAL options parsing. */
+ (hook)(prgname);
+ printf("\n");
+ }
+
eal_common_usage();
printf("EAL Linux options:\n"
" --"OPT_SOCKET_MEM" Memory to allocate on sockets (comma separated values)\n"
@@ -549,11 +554,6 @@ eal_usage(const char *prgname)
" --"OPT_SINGLE_FILE_SEGMENTS" Put all hugepage memory in single files\n"
" --"OPT_MATCH_ALLOCATIONS" Free hugepages exactly as allocated\n"
"\n");
- /* Allow the application to print its usage message too if hook is set */
- if (hook) {
- printf("===== Application Usage =====\n\n");
- (hook)(prgname);
- }
}
static int
@@ -80,15 +80,13 @@ eal_usage(const char *prgname)
{
rte_usage_hook_t hook = eal_get_application_usage_hook();
- printf("\nUsage: %s ", prgname);
- eal_common_usage();
- /* Allow the application to print its usage message too
- * if hook is set
- */
if (hook) {
- printf("===== Application Usage =====\n\n");
+ /* Print application usage through EAL options parsing. */
(hook)(prgname);
+ printf("\n");
}
+
+ eal_common_usage();
}
/* Parse the arguments for --log-level only */