env_dpdk: save and restore optind in spdk_env_init

DPDK's use of getopt() needs special handling of the optind global
variable since we are passing it a separate array of arguments (not the
typical argv and argc).  Set optind to 1 internally to env_dpdk so that
the apps don't need to know about it, and restore optind in case the
calling app is also using getopt().

Change-Id: Icbf07002c99fa9f94c866e8eff707124b0ef679b
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/365062
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>

app/iscsi_tgt/iscsi_tgt.c

@@ -175,8 +175,6 @@ main(int argc, char **argv)
 		sleep(10);
 	}
 
-	optind = 1; /* reset the optind */
-
 	opts.shutdown_cb = spdk_iscsi_shutdown;
 	opts.usr1_handler = spdk_sigusr1;
 	spdk_app_init(&opts);

examples/ioat/perf/perf.c

@@ -298,7 +298,7 @@ parse_args(int argc, char **argv)
 		usage(argv[0]);
 		return 1;
 	}
-	optind = 1;
+
 	return 0;
 }
 

examples/ioat/verify/verify.c

@@ -275,7 +275,7 @@ parse_args(int argc, char **argv)
 		usage(argv[0]);
 		return 1;
 	}
-	optind = 1;
+
 	return 0;
 }
 

examples/nvme/hotplug/hotplug.c

@@ -409,7 +409,6 @@ parse_args(int argc, char **argv)
 		return 1;
 	}
 
-	optind = 1;
 	return 0;
 }
 

examples/nvme/identify/identify.c

@@ -960,8 +960,6 @@ parse_args(int argc, char **argv)
 		}
 	}
 
-	optind = 1;
-
 	return 0;
 }
 

examples/nvme/perf/perf.c

@@ -1179,7 +1179,7 @@ parse_args(int argc, char **argv)
 	}
 
 	g_aio_optind = optind;
-	optind = 1;
+
 	return 0;
 }
 

lib/env_dpdk/init.c

@@ -236,6 +236,7 @@ void spdk_env_init(const struct spdk_env_opts *opts)
 	char **args = NULL;
 	char **dpdk_args = NULL;
 	int argcount, i, rc;
+	int orig_optind;
 
 	argcount = spdk_build_eal_cmdline(opts, &args);
 	if (argcount <= 0) {
@@ -262,7 +263,10 @@ void spdk_env_init(const struct spdk_env_opts *opts)
 	memcpy(dpdk_args, args, sizeof(char *) * argcount);
 
 	fflush(stdout);
+	orig_optind = optind;
+	optind = 1;
 	rc = rte_eal_init(argcount, dpdk_args);
+	optind = orig_optind;
 
 	spdk_free_args(args, argcount);
 	free(dpdk_args);

test/app/stub/stub.c

@@ -105,8 +105,6 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
-	optind = 1; /* reset the optind */
-
 	spdk_env_init(&opts);
 	if (spdk_nvme_probe(NULL, NULL, probe_cb, attach_cb, NULL) != 0) {
 		fprintf(stderr, "spdk_nvme_probe() failed\n");

test/lib/bdev/bdevperf/bdevperf.c

@@ -714,8 +714,6 @@ main(int argc, char **argv)
 		g_zcopy = false;
 	}
 
-	optind = 1;  /* reset the optind */
-
 	blockdev_heads_init();
 
 	bdevtest_init(config_file, core_mask);

test/lib/event/event_perf/event_perf.c

@@ -143,8 +143,6 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
-	optind = 1;  /* reset the optind */
-
 	spdk_app_init(&opts);
 
 	g_tsc_rate = spdk_get_ticks_hz();

test/lib/event/reactor/reactor.c

@@ -134,8 +134,6 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
-	optind = 1;
-
 	opts.shutdown_cb = test_cleanup;
 
 	spdk_app_init(&opts);

test/lib/event/reactor_perf/reactor_perf.c

@@ -130,8 +130,6 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
-	optind = 1;
-
 	opts.shutdown_cb = test_cleanup;
 
 	spdk_app_init(&opts);

test/lib/nvme/aer/aer.c

@@ -240,8 +240,6 @@ parse_args(int argc, char **argv)
 		}
 	}
 
-	optind = 1;
-
 	return 0;
 }
 

test/lib/nvme/overhead/overhead.c

@@ -514,7 +514,7 @@ parse_args(int argc, char **argv)
 	}
 
 	g_aio_optind = optind;
-	optind = 1;
+
 	return 0;
 }
 

test/lib/nvme/reset/reset.c

@@ -485,7 +485,6 @@ parse_args(int argc, char **argv)
 		g_is_random = 1;
 	}
 
-	optind = 1;
 	return 0;
 }