projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Have the job set ->terminate when runtime is exceeded
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index e5d776c22f6a13481508a565c2d76671d2475faf..b5f9abcef122f618f546540380f546d1f21db6af 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-17,12
+17,13
@@
#include "fio.h"
#include "parse.h"
#include "fio.h"
#include "parse.h"
-static char fio_version_string[] = "fio 1.1
4a
";
+static char fio_version_string[] = "fio 1.1
5.2
";
#define FIO_RANDSEED (0xb1899bedUL)
static char **ini_file;
static int max_jobs = MAX_JOBS;
#define FIO_RANDSEED (0xb1899bedUL)
static char **ini_file;
static int max_jobs = MAX_JOBS;
+static int dump_cmdline;
struct thread_data def_thread;
struct thread_data *threads = NULL;
struct thread_data def_thread;
struct thread_data *threads = NULL;
@@
-85,6
+86,11
@@
static struct option long_options[FIO_NR_OPTIONS] = {
.has_arg = optional_argument,
.val = 'c',
},
.has_arg = optional_argument,
.val = 'c',
},
+ {
+ .name = "showcmd",
+ .has_arg = no_argument,
+ .val = 's'
+ },
{
.name = NULL,
},
{
.name = NULL,
},
@@
-116,6
+122,7
@@
static struct thread_data *get_new_job(int global, struct thread_data *parent)
*td = *parent;
dup_files(td, parent);
*td = *parent;
dup_files(td, parent);
+ options_mem_dupe(td);
td->thread_number = thread_number;
return td;
td->thread_number = thread_number;
return td;
@@
-267,6
+274,11
@@
static int fixup_options(struct thread_data *td)
return 1;
}
return 1;
}
+ if (!o->timeout && o->time_based) {
+ log_err("fio: time_based requires a runtime/timeout setting\n");
+ o->time_based = 0;
+ }
+
return 0;
}
return 0;
}
@@
-380,6
+392,14
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
if (td == &def_thread)
return 0;
if (td == &def_thread)
return 0;
+ /*
+ * if we are just dumping the output command line, don't add the job
+ */
+ if (dump_cmdline) {
+ put_job(td);
+ return 0;
+ }
+
engine = get_engine_name(td->o.ioengine);
td->io_ops = load_ioengine(td, engine);
if (!td->io_ops) {
engine = get_engine_name(td->o.ioengine);
td->io_ops = load_ioengine(td, engine);
if (!td->io_ops) {
@@
-412,6
+432,13
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
if (fixup_options(td))
goto err;
if (fixup_options(td))
goto err;
+ if (td->io_ops->flags & FIO_DISKLESSIO) {
+ struct fio_file *f;
+
+ for_each_file(td, f, i)
+ f->real_file_size = -1ULL;
+ }
+
td->mutex = fio_sem_init(0);
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
td->mutex = fio_sem_init(0);
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
@@
-480,6
+507,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
td_new->o.numjobs = 1;
td_new->o.stonewall = 0;
td_new->o.numjobs = 1;
td_new->o.stonewall = 0;
+ td_new->o.new_group = 0;
if (file_alloced) {
td_new->o.filename = NULL;
if (file_alloced) {
td_new->o.filename = NULL;
@@
-543,15
+571,27
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
p = fgets(string, 4095, f);
if (!p)
break;
p = fgets(string, 4095, f);
if (!p)
break;
+
+ strip_blank_front(&p);
+ strip_blank_end(p);
+
if (is_empty_or_comment(p))
continue;
if (is_empty_or_comment(p))
continue;
- if (sscanf(p, "[%255s]", name) != 1)
+ if (sscanf(p, "[%255s]", name) != 1) {
+ log_err("fio: option <%s> outside of job section\n", p);
continue;
continue;
+ }
global = !strncmp(name, "global", 6);
name[strlen(name) - 1] = '\0';
global = !strncmp(name, "global", 6);
name[strlen(name) - 1] = '\0';
+ if (dump_cmdline) {
+ log_info("fio ");
+ if (!global)
+ log_info("--name=%s ", name);
+ }
+
td = get_new_job(global, &def_thread);
if (!td) {
ret = 1;
td = get_new_job(global, &def_thread);
if (!td) {
ret = 1;
@@
-586,6
+626,8
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
* easier on the user.
*/
ret |= fio_option_parse(td, p);
* easier on the user.
*/
ret |= fio_option_parse(td, p);
+ if (!ret && dump_cmdline)
+ log_info("--%s ", p);
}
if (!ret) {
}
if (!ret) {
@@
-597,6
+639,9
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
}
} while (!ret);
}
} while (!ret);
+ if (dump_cmdline)
+ log_info("\n");
+
free(string);
free(name);
fclose(f);
free(string);
free(name);
fclose(f);
@@
-688,6
+733,7
@@
static void usage(void)
printf("\t--version\tPrint version info and exit\n");
printf("\t--help\t\tPrint this page\n");
printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of them\n");
printf("\t--version\tPrint version info and exit\n");
printf("\t--help\t\tPrint this page\n");
printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of them\n");
+ printf("\t--showcmd\tTurn a job file into command line options\n");
}
static int parse_cmd_line(int argc, char *argv[])
}
static int parse_cmd_line(int argc, char *argv[])
@@
-722,6
+768,9
@@
static int parse_cmd_line(int argc, char *argv[])
exit(0);
case 'c':
exit(fio_show_option_help(optarg));
exit(0);
case 'c':
exit(fio_show_option_help(optarg));
+ case 's':
+ dump_cmdline = 1;
+ break;
case 'v':
printf("%s\n", fio_version_string);
exit(0);
case 'v':
printf("%s\n", fio_version_string);
exit(0);
@@
-801,8
+850,12
@@
int parse_options(int argc, char *argv[])
}
free(ini_file);
}
free(ini_file);
+ options_mem_free(&def_thread);
if (!thread_number) {
if (!thread_number) {
+ if (dump_cmdline)
+ return 0;
+
log_err("No jobs defined(s)\n");
return 1;
}
log_err("No jobs defined(s)\n");
return 1;
}