#include "fio.h"
#include "parse.h"
-static char fio_version_string[] = "fio 1.17.1";
+static char fio_version_string[] = "fio 1.17.2";
#define FIO_RANDSEED (0xb1899bedUL)
unsigned int global;
struct thread_data *td;
char *string, *name;
- fpos_t off;
FILE *f;
char *p;
int ret = 0, stonewall;
int first_sect = 1;
+ int skip_fgets = 0;
if (!strcmp(file, "-"))
f = stdin;
stonewall = stonewall_flag;
do {
- p = fgets(string, 4095, f);
- if (!p)
- break;
+ /*
+ * if skip_fgets is set, we already have loaded a line we
+ * haven't handled.
+ */
+ if (!skip_fgets) {
+ p = fgets(string, 4095, f);
+ if (!p)
+ break;
+ }
+ skip_fgets = 0;
strip_blank_front(&p);
strip_blank_end(p);
stonewall = 0;
}
- fgetpos(f, &off);
while ((p = fgets(string, 4096, f)) != NULL) {
if (is_empty_or_comment(p))
continue;
strip_blank_front(&p);
- if (p[0] == '[')
+ /*
+ * new section, break out and make sure we don't
+ * fgets() a new line at the top.
+ */
+ if (p[0] == '[') {
+ skip_fgets = 1;
break;
+ }
strip_blank_end(p);
- fgetpos(f, &off);
-
/*
* Don't break here, continue parsing options so we
* dump all the bad ones. Makes trial/error fixups
log_info("--%s ", p);
}
- if (!ret) {
- fsetpos(f, &off);
+ if (!ret)
ret = add_job(td, name, 0);
- } else {
+ else {
log_err("fio: job %s dropped\n", name);
put_job(td);
}
return 1;
}
+ memset(threads, 0, max_jobs * sizeof(struct thread_data));
atexit(free_shm);
return 0;
}
-static void usage(void)
+static void usage(const char *name)
{
printf("%s\n", fio_version_string);
+ printf("%s [options] [job options] <job file(s)>\n", name);
printf("\t--output\tWrite output to file\n");
printf("\t--timeout\tRuntime in seconds\n");
printf("\t--latency-log\tGenerate per-job latency logs\n");
terse_output = 1;
break;
case 'h':
- usage();
+ usage(argv[0]);
exit(0);
case 'c':
exit(fio_show_option_help(optarg));
return 0;
log_err("No jobs defined(s)\n");
+ usage(argv[0]);
return 1;
}