Commit a4457f67 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

lib/event: Drop -J opt for interrupt-mode 

This opt was introduced via:
  https://review.spdk.io/gerrit/c/spdk/spdk/+/18578
which duplicated this opt from:
https://review.spdk.io/gerrit/c/spdk/spdk/+/18912


which got merged first.

To mitigate, keep only the long opt for the interrupt-mode and use
it in tests instead.

Change-Id: I17fd3f19a2844ee92df1125bafaff7b55a859414
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/20271


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 852f907f

include/spdk/event.h

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ int spdk_app_parse_core_mask(const char *mask, struct spdk_cpuset *cpumask); 
 */

const struct spdk_cpuset *spdk_app_get_core_mask(void);



#define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:r:s:uvA:B:JL:RW:"

#define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:r:s:uvA:B:L:RW:"



enum spdk_app_parse_args_rvals {

	SPDK_APP_PARSE_ARGS_HELP = 0,

lib/event/app.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static const struct option g_cmdline_options[] = { 
	{"pci-allowed",			required_argument,	NULL, PCI_ALLOWED_OPT_IDX},

#define PCI_WHITELIST_OPT_IDX	'W'

	{"pci-whitelist",		required_argument,	NULL, PCI_WHITELIST_OPT_IDX}, /* deprecated */

#define INTERRUPT_MODE_OPT_IDX	'J'

#define INTERRUPT_MODE_OPT_IDX 256

	{"interrupt-mode",		no_argument,		NULL, INTERRUPT_MODE_OPT_IDX},

#define SILENCE_NOTICELOG_OPT_IDX 257

	{"silence-noticelog",		no_argument,		NULL, SILENCE_NOTICELOG_OPT_IDX},
@@ -971,7 +971,7 @@ usage(void (*app_usage)(void)) 
	printf("     --vfio-vf-token       VF token (UUID) shared between SR-IOV PF and VFs for vfio_pci driver\n");

	spdk_log_usage(stdout, "-L");

	spdk_trace_mask_usage(stdout, "-e");

	printf(" -J, --interrupt-mode      set app to interrupt mode (Warning: CPU usage will be reduced only if all pollers in the app support interrupt mode)\n");

	printf("     --interrupt-mode      set app to interrupt mode (Warning: CPU usage will be reduced only if all pollers in the app support interrupt mode)\n");

	if (app_usage) {

		app_usage();

	}

test/nvmf/target/nvmf_vfio_user.sh

+1 −1
Original line number Diff line number Diff line
@@ -105,5 +105,5 @@ run_nvmf_vfio_user 
stop_nvmf_vfio_user



# Start the target in interrupt mode

setup_nvmf_vfio_user '-J' '-M -I'

setup_nvmf_vfio_user '--interrupt-mode' '-M -I'

stop_nvmf_vfio_user