projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Escape minus signs in manpage to fix lintian warning:
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index b96350a66f09d64e3d39602f0717801ef92c9c37..0435dd02fa197a9731d5c123432bba54cd606152 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-22,13
+22,14
@@
#include "lib/getopt.h"
#include "lib/getopt.h"
-static char fio_version_string[] = "fio 1.5
1
";
+static char fio_version_string[] = "fio 1.5
9
";
#define FIO_RANDSEED (0xb1899bedUL)
static char **ini_file;
#define FIO_RANDSEED (0xb1899bedUL)
static char **ini_file;
-static int max_jobs = MAX_JOBS;
+static int max_jobs =
FIO_
MAX_JOBS;
static int dump_cmdline;
static int dump_cmdline;
+static int def_timeout;
static struct thread_data def_thread;
struct thread_data *threads = NULL;
static struct thread_data def_thread;
struct thread_data *threads = NULL;
@@
-43,11
+44,11
@@
char **job_sections = NULL;
int nr_job_sections = 0;
char *exec_profile = NULL;
int warnings_fatal = 0;
int nr_job_sections = 0;
char *exec_profile = NULL;
int warnings_fatal = 0;
+int terse_version = 2;
int write_bw_log = 0;
int read_only = 0;
int write_bw_log = 0;
int read_only = 0;
-static int def_timeout;
static int write_lat_log;
static int prev_group_jobs;
static int write_lat_log;
static int prev_group_jobs;
@@
-64,85
+65,95
@@
static char cmd_optstr[256];
*/
static struct option l_opts[FIO_NR_OPTIONS] = {
{
*/
static struct option l_opts[FIO_NR_OPTIONS] = {
{
- .name = "output",
+ .name =
(char *)
"output",
.has_arg = required_argument,
.val = 'o',
},
{
.has_arg = required_argument,
.val = 'o',
},
{
- .name = "timeout",
+ .name =
(char *)
"timeout",
.has_arg = required_argument,
.val = 't',
},
{
.has_arg = required_argument,
.val = 't',
},
{
- .name = "latency-log",
+ .name =
(char *)
"latency-log",
.has_arg = required_argument,
.val = 'l',
},
{
.has_arg = required_argument,
.val = 'l',
},
{
- .name = "bandwidth-log",
+ .name =
(char *)
"bandwidth-log",
.has_arg = required_argument,
.val = 'b',
},
{
.has_arg = required_argument,
.val = 'b',
},
{
- .name = "minimal",
+ .name =
(char *)
"minimal",
.has_arg = optional_argument,
.val = 'm',
},
{
.has_arg = optional_argument,
.val = 'm',
},
{
- .name = "version",
+ .name =
(char *)
"version",
.has_arg = no_argument,
.val = 'v',
},
{
.has_arg = no_argument,
.val = 'v',
},
{
- .name = "help",
+ .name =
(char *)
"help",
.has_arg = no_argument,
.val = 'h',
},
{
.has_arg = no_argument,
.val = 'h',
},
{
- .name = "cmdhelp",
+ .name =
(char *)
"cmdhelp",
.has_arg = optional_argument,
.val = 'c',
},
{
.has_arg = optional_argument,
.val = 'c',
},
{
- .name = "showcmd",
+ .name =
(char *)
"showcmd",
.has_arg = no_argument,
.val = 's',
},
{
.has_arg = no_argument,
.val = 's',
},
{
- .name = "readonly",
+ .name =
(char *)
"readonly",
.has_arg = no_argument,
.val = 'r',
},
{
.has_arg = no_argument,
.val = 'r',
},
{
- .name = "eta",
+ .name =
(char *)
"eta",
.has_arg = required_argument,
.val = 'e',
},
{
.has_arg = required_argument,
.val = 'e',
},
{
- .name = "debug",
+ .name =
(char *)
"debug",
.has_arg = required_argument,
.val = 'd',
},
{
.has_arg = required_argument,
.val = 'd',
},
{
- .name = "section",
+ .name =
(char *)
"section",
.has_arg = required_argument,
.val = 'x',
},
{
.has_arg = required_argument,
.val = 'x',
},
{
- .name = "alloc-size",
+ .name =
(char *)
"alloc-size",
.has_arg = required_argument,
.val = 'a',
},
{
.has_arg = required_argument,
.val = 'a',
},
{
- .name = "profile",
+ .name =
(char *)
"profile",
.has_arg = required_argument,
.val = 'p',
},
{
.has_arg = required_argument,
.val = 'p',
},
{
- .name = "warnings-fatal",
+ .name =
(char *)
"warnings-fatal",
.has_arg = no_argument,
.val = 'w',
},
.has_arg = no_argument,
.val = 'w',
},
+ {
+ .name = (char *) "max-jobs",
+ .has_arg = required_argument,
+ .val = 'j',
+ },
+ {
+ .name = (char *) "terse-version",
+ .has_arg = required_argument,
+ .val = 'V',
+ },
{
.name = NULL,
},
{
.name = NULL,
},
@@
-191,7
+202,7
@@
static void put_job(struct thread_data *td)
{
if (td == &def_thread)
return;
{
if (td == &def_thread)
return;
-
+
profile_td_exit(td);
if (td->error)
profile_td_exit(td);
if (td->error)
@@
-511,6
+522,8
@@
void td_fill_rand_seeds(struct thread_data *td)
td_fill_rand_seeds_os(td);
else
td_fill_rand_seeds_internal(td);
td_fill_rand_seeds_os(td);
else
td_fill_rand_seeds_internal(td);
+
+ init_rand_seed(&td->buf_state, td->rand_seeds[7]);
}
/*
}
/*
@@
-568,7
+581,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
}
if (profile_td_init(td))
}
if (profile_td_init(td))
-
return 1
;
+
goto err
;
engine = get_engine_name(td->o.ioengine);
td->io_ops = load_ioengine(td, engine);
engine = get_engine_name(td->o.ioengine);
td->io_ops = load_ioengine(td, engine);
@@
-612,6
+625,12
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
td->mutex = fio_mutex_init(0);
td->mutex = fio_mutex_init(0);
+ td->ts.clat_percentiles = td->o.clat_percentiles;
+ if (td->o.overwrite_plist)
+ td->ts.percentile_list = td->o.percentile_list;
+ else
+ td->ts.percentile_list = NULL;
+
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX;
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX;
@@
-771,7
+790,7
@@
static int is_empty_or_comment(char *line)
return 1;
if (line[i] == '#')
return 1;
return 1;
if (line[i] == '#')
return 1;
- if (!isspace(
line[i]) && !iscntrl(
line[i]))
+ if (!isspace(
(int) line[i]) && !iscntrl((int)
line[i]))
return 0;
}
return 0;
}
@@
-835,7
+854,7
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
if (is_empty_or_comment(p))
continue;
if (is_empty_or_comment(p))
continue;
- if (sscanf(p, "[%255
s
]", name) != 1) {
+ if (sscanf(p, "[%255
[^\n]
]", name) != 1) {
if (inside_skip)
continue;
log_err("fio: option <%s> outside of [] job section\n",
if (inside_skip)
continue;
log_err("fio: option <%s> outside of [] job section\n",
@@
-941,13
+960,12
@@
static int fill_def_thread(void)
memset(&def_thread, 0, sizeof(def_thread));
fio_getaffinity(getpid(), &def_thread.o.cpumask);
memset(&def_thread, 0, sizeof(def_thread));
fio_getaffinity(getpid(), &def_thread.o.cpumask);
+ def_thread.o.timeout = def_timeout;
/*
* fill default options
*/
fio_fill_default_options(&def_thread);
/*
* fill default options
*/
fio_fill_default_options(&def_thread);
-
- def_thread.o.timeout = def_timeout;
return 0;
}
return 0;
}
@@
-1019,6
+1037,7
@@
static int setup_thread_area(void)
static void usage(const char *name)
{
static void usage(const char *name)
{
+ printf("%s\n", fio_version_string);
printf("%s [options] [job options] <job file(s)>\n", name);
printf("\t--debug=options\tEnable debug logging\n");
printf("\t--output\tWrite output to file\n");
printf("%s [options] [job options] <job file(s)>\n", name);
printf("\t--debug=options\tEnable debug logging\n");
printf("\t--output\tWrite output to file\n");
@@
-1027,6
+1046,7
@@
static void usage(const char *name)
printf("\t--bandwidth-log\tGenerate per-job bandwidth logs\n");
printf("\t--minimal\tMinimal (terse) output\n");
printf("\t--version\tPrint version info and exit\n");
printf("\t--bandwidth-log\tGenerate per-job bandwidth logs\n");
printf("\t--minimal\tMinimal (terse) output\n");
printf("\t--version\tPrint version info and exit\n");
+ printf("\t--terse-version=x Terse version output format\n");
printf("\t--help\t\tPrint this page\n");
printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of"
" them\n");
printf("\t--help\t\tPrint this page\n");
printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of"
" them\n");
@@
-1039,6
+1059,7
@@
static void usage(const char *name)
printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb"
" (def 1024)\n");
printf("\t--warnings-fatal Fio parser warnings are fatal\n");
printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb"
" (def 1024)\n");
printf("\t--warnings-fatal Fio parser warnings are fatal\n");
+ printf("\t--max-jobs\tMaximum number of threads/processes to support\n");
printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>");
printf("\n Jens Axboe <jaxboe@fusionio.com>\n");
}
printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>");
printf("\n Jens Axboe <jaxboe@fusionio.com>\n");
}
@@
-1187,6
+1208,14
@@
static int parse_cmd_line(int argc, char *argv[])
case 'v':
log_info("%s\n", fio_version_string);
exit(0);
case 'v':
log_info("%s\n", fio_version_string);
exit(0);
+ case 'V':
+ terse_version = atoi(optarg);
+ if (terse_version != 2) {
+ log_err("fio: bad terse version format\n");
+ exit_val = 1;
+ do_exit++;
+ }
+ break;
case 'e':
if (!strcmp("always", optarg))
eta_print = FIO_ETA_ALWAYS;
case 'e':
if (!strcmp("always", optarg))
eta_print = FIO_ETA_ALWAYS;
@@
-1222,10
+1251,8
@@
static int parse_cmd_line(int argc, char *argv[])
if (!strncmp(opt, "name", 4) && td) {
ret = add_job(td, td->o.name ?: "fio", 0);
if (!strncmp(opt, "name", 4) && td) {
ret = add_job(td, td->o.name ?: "fio", 0);
- if (ret) {
- put_job(td);
+ if (ret)
return 0;
return 0;
- }
td = NULL;
}
if (!td) {
td = NULL;
}
if (!td) {
@@
-1249,6
+1276,14
@@
static int parse_cmd_line(int argc, char *argv[])
case 'w':
warnings_fatal = 1;
break;
case 'w':
warnings_fatal = 1;
break;
+ case 'j':
+ max_jobs = atoi(optarg);
+ if (!max_jobs || max_jobs > REAL_MAX_JOBS) {
+ log_err("fio: invalid max jobs: %d\n", max_jobs);
+ do_exit++;
+ exit_val = 1;
+ }
+ break;
default:
do_exit++;
exit_val = 1;
default:
do_exit++;
exit_val = 1;
@@
-1262,8
+1297,6
@@
static int parse_cmd_line(int argc, char *argv[])
if (td) {
if (!ret)
ret = add_job(td, td->o.name ?: "fio", 0);
if (td) {
if (!ret)
ret = add_job(td, td->o.name ?: "fio", 0);
- if (ret)
- put_job(td);
}
while (optind < argc) {
}
while (optind < argc) {