#include "lib/getopt.h"
-static char fio_version_string[] = "fio 1.53";
+static char fio_version_string[] = "fio 1.57";
#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 struct thread_data def_thread;
int write_bw_log = 0;
int read_only = 0;
-static int def_timeout;
static int write_lat_log;
static int prev_group_jobs;
*/
static struct option l_opts[FIO_NR_OPTIONS] = {
{
- .name = "output",
+ .name = (char *) "output",
.has_arg = required_argument,
.val = 'o',
},
{
- .name = "timeout",
+ .name = (char *) "timeout",
.has_arg = required_argument,
.val = 't',
},
{
- .name = "latency-log",
+ .name = (char *) "latency-log",
.has_arg = required_argument,
.val = 'l',
},
{
- .name = "bandwidth-log",
+ .name = (char *) "bandwidth-log",
.has_arg = required_argument,
.val = 'b',
},
{
- .name = "minimal",
+ .name = (char *) "minimal",
.has_arg = optional_argument,
.val = 'm',
},
{
- .name = "version",
+ .name = (char *) "version",
.has_arg = no_argument,
.val = 'v',
},
{
- .name = "help",
+ .name = (char *) "help",
.has_arg = no_argument,
.val = 'h',
},
{
- .name = "cmdhelp",
+ .name = (char *) "cmdhelp",
.has_arg = optional_argument,
.val = 'c',
},
{
- .name = "showcmd",
+ .name = (char *) "showcmd",
.has_arg = no_argument,
.val = 's',
},
{
- .name = "readonly",
+ .name = (char *) "readonly",
.has_arg = no_argument,
.val = 'r',
},
{
- .name = "eta",
+ .name = (char *) "eta",
.has_arg = required_argument,
.val = 'e',
},
{
- .name = "debug",
+ .name = (char *) "debug",
.has_arg = required_argument,
.val = 'd',
},
{
- .name = "section",
+ .name = (char *) "section",
.has_arg = required_argument,
.val = 'x',
},
{
- .name = "alloc-size",
+ .name = (char *) "alloc-size",
.has_arg = required_argument,
.val = 'a',
},
{
- .name = "profile",
+ .name = (char *) "profile",
.has_arg = required_argument,
.val = 'p',
},
{
- .name = "warnings-fatal",
+ .name = (char *) "warnings-fatal",
.has_arg = no_argument,
.val = 'w',
},
+ {
+ .name = (char *) "max-jobs",
+ .has_arg = required_argument,
+ .val = 'j',
+ },
{
.name = NULL,
},
}
if (profile_td_init(td))
- return 1;
+ goto err;
engine = get_engine_name(td->o.ioengine);
td->io_ops = load_ioengine(td, engine);
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;
}
* fill default options
*/
fio_fill_default_options(&def_thread);
-
- def_thread.o.timeout = def_timeout;
return 0;
}
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("\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");
}
smalloc_pool_size = atoi(optarg);
break;
case 't':
- def_timeout = atoi(optarg);
+ def_thread.o.timeout = atoi(optarg);
break;
case 'l':
write_lat_log = 1;
if (!strncmp(opt, "name", 4) && td) {
ret = add_job(td, td->o.name ?: "fio", 0);
- if (ret) {
- put_job(td);
+ if (ret)
return 0;
- }
td = NULL;
}
if (!td) {
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;
if (td) {
if (!ret)
ret = add_job(td, td->o.name ?: "fio", 0);
- if (ret)
- put_job(td);
}
while (optind < argc) {