X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=045131e8ecd7115490dba0c62bc362d4aa4ef7e2;hp=8efd7a4ef6777e429a9ee6d6d1b303f67d0e6e64;hb=9abea48bee7340fdf0aee00fa734a3071d47ed86;hpb=e46d809110bd4ad2980ca64931b683673444454b

diff --git a/init.c b/init.c
index 8efd7a4e..045131e8 100644
--- a/init.c
+++ b/init.c
@@ -23,7 +23,14 @@
 
 #include "lib/getopt.h"
 
-static char fio_version_string[] = "fio 1.58";
+#if FIO_PATCH > 0
+static char fio_version_string[] =	__fio_stringify(FIO_MAJOR) "."	\
+					__fio_stringify(FIO_MINOR) "."	\
+					__fio_stringify(FIO_PATCH);
+#else
+static char fio_version_string[] =	__fio_stringify(FIO_MAJOR) "."	\
+					__fio_stringify(FIO_MINOR);
+#endif
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -181,6 +188,74 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
 	},
 };
 
+static void free_shm(void)
+{
+	struct shmid_ds sbuf;
+
+	if (threads) {
+		void *tp = threads;
+
+		threads = NULL;
+		file_hash_exit();
+		fio_debug_jobp = NULL;
+		shmdt(tp);
+		shmctl(shm_id, IPC_RMID, &sbuf);
+	}
+
+	scleanup();
+}
+
+/*
+ * The thread area is shared between the main process and the job
+ * threads/processes. So setup a shared memory segment that will hold
+ * all the job info. We use the end of the region for keeping track of
+ * open files across jobs, for file sharing.
+ */
+static int setup_thread_area(void)
+{
+	void *hash;
+
+	if (threads)
+		return 0;
+
+	/*
+	 * 1024 is too much on some machines, scale max_jobs if
+	 * we get a failure that looks like too large a shm segment
+	 */
+	do {
+		size_t size = max_jobs * sizeof(struct thread_data);
+
+		size += file_hash_size;
+		size += sizeof(unsigned int);
+
+		shm_id = shmget(0, size, IPC_CREAT | 0600);
+		if (shm_id != -1)
+			break;
+		if (errno != EINVAL) {
+			perror("shmget");
+			break;
+		}
+
+		max_jobs >>= 1;
+	} while (max_jobs);
+
+	if (shm_id == -1)
+		return 1;
+
+	threads = shmat(shm_id, NULL, 0);
+	if (threads == (void *) -1) {
+		perror("shmat");
+		return 1;
+	}
+
+	memset(threads, 0, max_jobs * sizeof(struct thread_data));
+	hash = (void *) threads + max_jobs * sizeof(struct thread_data);
+	fio_debug_jobp = (void *) hash + file_hash_size;
+	*fio_debug_jobp = -1;
+	file_hash_init(hash);
+	return 0;
+}
+
 /*
  * Return a free job structure.
  */
@@ -190,6 +265,10 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
 
 	if (global)
 		return &def_thread;
+	if (setup_thread_area()) {
+		log_err("error: failed to setup shm segment\n");
+		return NULL;
+	}
 	if (thread_number >= max_jobs) {
 		log_err("error: maximum number of jobs (%d) reached.\n",
 				max_jobs);
@@ -664,12 +743,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		goto err;
 
 	if (td->o.write_lat_log) {
-		setup_log(&td->ts.lat_log);
-		setup_log(&td->ts.slat_log);
-		setup_log(&td->ts.clat_log);
+		setup_log(&td->lat_log);
+		setup_log(&td->slat_log);
+		setup_log(&td->clat_log);
 	}
 	if (td->o.write_bw_log)
-		setup_log(&td->ts.bw_log);
+		setup_log(&td->bw_log);
 
 	if (!td->o.name)
 		td->o.name = strdup(jobname);
@@ -994,72 +1073,6 @@ static int fill_def_thread(void)
 	return 0;
 }
 
-static void free_shm(void)
-{
-	struct shmid_ds sbuf;
-
-	if (threads) {
-		void *tp = threads;
-
-		threads = NULL;
-		file_hash_exit();
-		fio_debug_jobp = NULL;
-		shmdt(tp);
-		shmctl(shm_id, IPC_RMID, &sbuf);
-	}
-
-	scleanup();
-}
-
-/*
- * The thread area is shared between the main process and the job
- * threads/processes. So setup a shared memory segment that will hold
- * all the job info. We use the end of the region for keeping track of
- * open files across jobs, for file sharing.
- */
-static int setup_thread_area(void)
-{
-	void *hash;
-
-	/*
-	 * 1024 is too much on some machines, scale max_jobs if
-	 * we get a failure that looks like too large a shm segment
-	 */
-	do {
-		size_t size = max_jobs * sizeof(struct thread_data);
-
-		size += file_hash_size;
-		size += sizeof(unsigned int);
-
-		shm_id = shmget(0, size, IPC_CREAT | 0600);
-		if (shm_id != -1)
-			break;
-		if (errno != EINVAL) {
-			perror("shmget");
-			break;
-		}
-
-		max_jobs >>= 1;
-	} while (max_jobs);
-
-	if (shm_id == -1)
-		return 1;
-
-	threads = shmat(shm_id, NULL, 0);
-	if (threads == (void *) -1) {
-		perror("shmat");
-		return 1;
-	}
-
-	memset(threads, 0, max_jobs * sizeof(struct thread_data));
-	hash = (void *) threads + max_jobs * sizeof(struct thread_data);
-	fio_debug_jobp = (void *) hash + file_hash_size;
-	*fio_debug_jobp = -1;
-	file_hash_init(hash);
-	atexit(free_shm);
-	return 0;
-}
-
 static void usage(const char *name)
 {
 	printf("%s\n", fio_version_string);
@@ -1192,28 +1205,35 @@ static void fio_options_fill_optstring(void)
 	ostr[c] = '\0';
 }
 
-static int parse_cmd_line(int argc, char *argv[])
+int parse_cmd_line(int argc, char *argv[])
 {
 	struct thread_data *td = NULL;
 	int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0;
 	char *ostr = cmd_optstr;
 	int daemonize_server = 0;
+	char *cur_client = NULL;
+	int backend = 0;
 
 	while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) {
 		switch (c) {
 		case 'a':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			smalloc_pool_size = atoi(optarg);
 			break;
 		case 't':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			def_thread.o.timeout = atoi(optarg);
 			break;
 		case 'l':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			write_lat_log = 1;
 			break;
 		case 'b':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			write_bw_log = 1;
 			break;
 		case 'o':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			f_out = fopen(optarg, "w+");
 			if (!f_out) {
 				perror("fopen output");
@@ -1222,6 +1242,7 @@ static int parse_cmd_line(int argc, char *argv[])
 			f_err = f_out;
 			break;
 		case 'm':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			terse_output = 1;
 			break;
 		case 'h':
@@ -1230,15 +1251,18 @@ static int parse_cmd_line(int argc, char *argv[])
 		case 'c':
 			exit(fio_show_option_help(optarg));
 		case 's':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			dump_cmdline = 1;
 			break;
 		case 'r':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			read_only = 1;
 			break;
 		case 'v':
 			log_info("%s\n", fio_version_string);
 			exit(0);
 		case 'V':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			terse_version = atoi(optarg);
 			if (terse_version != 2) {
 				log_err("fio: bad terse version format\n");
@@ -1247,18 +1271,22 @@ static int parse_cmd_line(int argc, char *argv[])
 			}
 			break;
 		case 'e':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			if (!strcmp("always", optarg))
 				eta_print = FIO_ETA_ALWAYS;
 			else if (!strcmp("never", optarg))
 				eta_print = FIO_ETA_NEVER;
 			break;
 		case 'd':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			if (set_debug(optarg))
 				do_exit++;
 			break;
 		case 'x': {
 			size_t new_size;
 
+			fio_client_add_cmd_option(cur_client, argv[optind]);
+
 			if (!strcmp(optarg, "global")) {
 				log_err("fio: can't use global as only "
 					"section\n");
@@ -1273,12 +1301,15 @@ static int parse_cmd_line(int argc, char *argv[])
 			break;
 			}
 		case 'p':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			exec_profile = strdup(optarg);
 			break;
 		case FIO_GETOPT_JOB: {
 			const char *opt = l_opts[lidx].name;
 			char *val = optarg;
 
+			fio_client_add_cmd_option(cur_client, argv[optind]);
+
 			if (!strncmp(opt, "name", 4) && td) {
 				ret = add_job(td, td->o.name ?: "fio", 0);
 				if (ret)
@@ -1304,9 +1335,11 @@ static int parse_cmd_line(int argc, char *argv[])
 			break;
 		}
 		case 'w':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			warnings_fatal = 1;
 			break;
 		case 'j':
+			fio_client_add_cmd_option(cur_client, argv[optind]);
 			max_jobs = atoi(optarg);
 			if (!max_jobs || max_jobs > REAL_MAX_JOBS) {
 				log_err("fio: invalid max jobs: %d\n", max_jobs);
@@ -1322,6 +1355,7 @@ static int parse_cmd_line(int argc, char *argv[])
 				break;
 			}
 			is_backend = 1;
+			backend = 1;
 			break;
 		case 'D':
 			daemonize_server = 1;
@@ -1337,12 +1371,15 @@ static int parse_cmd_line(int argc, char *argv[])
 				break;
 			}
 			fio_client_add(optarg);
+			cur_client = optarg;
 			break;
 		default:
 			do_exit++;
 			exit_val = 1;
 			break;
 		}
+		if (do_exit)
+			break;
 	}
 
 	if (do_exit)
@@ -1351,10 +1388,10 @@ static int parse_cmd_line(int argc, char *argv[])
 	if (nr_clients && fio_clients_connect()) {
 		do_exit++;
 		exit_val = 1;
-		return 1;
+		return -1;
 	}
 
-	if (is_backend)
+	if (is_backend && backend)
 		return fio_start_server(daemonize_server);
 
 	if (td) {
@@ -1382,24 +1419,26 @@ int parse_options(int argc, char *argv[])
 	fio_options_fill_optstring();
 	fio_options_dup_and_init(l_opts);
 
-	if (setup_thread_area())
-		return 1;
+	atexit(free_shm);
+
 	if (fill_def_thread())
 		return 1;
 
 	job_files = parse_cmd_line(argc, argv);
 
-	for (i = 0; i < job_files; i++) {
-		if (fill_def_thread())
-			return 1;
-		if (nr_clients) {
-			if (fio_clients_send_ini(ini_file[i]))
-				return 1;
-			free(ini_file[i]);
-		} else if (!is_backend) {
-			if (parse_jobs_ini(ini_file[i], 0, i))
+	if (job_files > 0) {
+		for (i = 0; i < job_files; i++) {
+			if (fill_def_thread())
 				return 1;
-			free(ini_file[i]);
+			if (nr_clients) {
+				if (fio_clients_send_ini(ini_file[i]))
+					return 1;
+				free(ini_file[i]);
+			} else if (!is_backend) {
+				if (parse_jobs_ini(ini_file[i], 0, i))
+					return 1;
+				free(ini_file[i]);
+			}
 		}
 	}
 
@@ -1414,8 +1453,10 @@ int parse_options(int argc, char *argv[])
 		if (is_backend || nr_clients)
 			return 0;
 
-		log_err("No jobs(s) defined\n\n");
-		usage(argv[0]);
+		if (job_files > 0) {
+			log_err("No jobs(s) defined\n\n");
+			usage(argv[0]);
+		}
 		return 1;
 	}