#include "smalloc.h"
#include "filehash.h"
#include "verify.h"
+#include "profile.h"
-static char fio_version_string[] = "fio 1.36-rc1";
+static char fio_version_string[] = "fio 1.37";
#define FIO_RANDSEED (0xb1899bedUL)
FILE *f_out = NULL;
FILE *f_err = NULL;
char *job_section = NULL;
+char *exec_profile = NULL;
int write_bw_log = 0;
int read_only = 0;
},
};
-static const char *tiobench_opts[] = {
- "buffered=0", "size=4*1024*$mb_memory", "bs=4k", "timeout=600",
- "numjobs=4", "group_reporting", "thread", "overwrite=1",
- "filename=.fio.tio.1:.fio.tio.2:.fio.tio.3:.fio.tio.4",
- "name=seqwrite", "rw=write", "end_fsync=1",
- "name=randwrite", "stonewall", "rw=randwrite", "end_fsync=1",
- "name=seqread", "stonewall", "rw=read",
- "name=randread", "stonewall", "rw=randread", NULL,
-};
-
-static const char **fio_prof_strings[PROFILE_END] = {
- NULL,
- tiobench_opts,
-};
-
-static const char *profiles[PROFILE_END] = {
- "none",
- "tiobench",
-};
-
FILE *get_f_out()
{
return f_out;
td = &threads[thread_number++];
*td = *parent;
+ td->o.uid = td->o.gid = -1U;
+
dup_files(td, parent);
options_mem_dupe(td);
+ profile_add_hooks(td);
+
td->thread_number = thread_number;
return td;
}
{
if (td == &def_thread)
return;
+
+ profile_td_exit(td);
if (td->error)
log_info("fio: %s\n", td->verror);
static int __setup_rate(struct thread_data *td, enum fio_ddir ddir)
{
unsigned int bs = td->o.min_bs[ddir];
- unsigned long long rate;
- unsigned long ios_per_msec;
+ unsigned long long bytes_per_sec;
- if (td->o.rate[ddir]) {
- rate = td->o.rate[ddir];
- ios_per_msec = (rate * 1000LL) / bs;
- } else
- ios_per_msec = td->o.rate_iops[ddir] * 1000UL;
+ if (td->o.rate[ddir])
+ bytes_per_sec = td->o.rate[ddir];
+ else
+ bytes_per_sec = td->o.rate_iops[ddir] * bs;
- if (!ios_per_msec) {
+ if (!bytes_per_sec) {
log_err("rate lower than supported\n");
return -1;
}
- td->rate_usec_cycle[ddir] = 1000000000ULL / ios_per_msec;
+ td->rate_nsec_cycle[ddir] = 1000000000ULL / bytes_per_sec;
td->rate_pending_usleep[ddir] = 0;
return 0;
}
" that isn't seekable. Pre-read disabled.\n");
}
+#ifndef FIO_HAVE_FDATASYNC
+ if (td->o.fdatasync_blocks) {
+ log_info("fio: this platform does not support fdatasync()"
+ " falling back to using fsync(). Use the 'fsync'"
+ " option instead of 'fdatasync' to get rid of"
+ " this warning\n");
+ td->o.fsync_blocks = td->o.fdatasync_blocks;
+ td->o.fdatasync_blocks = 0;
+ }
+#endif
+
return 0;
}
return 0;
}
+ if (profile_td_init(td))
+ return 1;
+
engine = get_engine_name(td->o.ioengine);
td->io_ops = load_ioengine(td, engine);
if (!td->io_ops) {
return -1;
}
+/*
+ * Parse as if 'o' was a command line
+ */
+void add_job_opts(const char **o)
+{
+ struct thread_data *td, *td_parent;
+ int i, in_global = 1;
+ char jobname[32];
+
+ i = 0;
+ td_parent = td = NULL;
+ while (o[i]) {
+ if (!strncmp(o[i], "name", 4)) {
+ in_global = 0;
+ if (td)
+ add_job(td, jobname, 0);
+ td = NULL;
+ sprintf(jobname, "%s", o[i] + 5);
+ }
+ if (in_global && !td_parent)
+ td_parent = get_new_job(1, &def_thread);
+ else if (!in_global && !td) {
+ if (!td_parent)
+ td_parent = &def_thread;
+ td = get_new_job(0, td_parent);
+ }
+ if (in_global)
+ fio_options_parse(td_parent, (char **) &o[i], 1);
+ else
+ fio_options_parse(td, (char **) &o[i], 1);
+ i++;
+ }
+
+ if (td)
+ add_job(td, jobname, 0);
+}
+
static int skip_this_section(const char *name)
{
if (!job_section)
{ .name = "diskutil", .shift = FD_DISKUTIL },
{ .name = "job", .shift = FD_JOB },
{ .name = "mutex", .shift = FD_MUTEX },
+ { .name = "profile", .shift = FD_PROFILE },
{ .name = NULL, },
};
}
#endif
-static int load_profile(const char *profile)
-{
- struct thread_data *td, *td_parent;
- const char **o;
- int i, in_global = 1;
- char jobname[32];
-
- dprint(FD_PARSE, "loading profile %s\n", profile);
-
- for (i = 0; i < PROFILE_END; i++) {
- if (!strcmp(profile, profiles[i]))
- break;
- }
-
- if (i == PROFILE_END) {
- log_err("fio: unknown profile %s\n", profile);
- return 1;
- }
-
- o = fio_prof_strings[i];
- if (!o)
- return 0;
-
- i = 0;
- td_parent = td = NULL;
- while (o[i]) {
- if (!strncmp(o[i], "name", 4)) {
- in_global = 0;
- if (td)
- add_job(td, jobname, 0);
- td = NULL;
- sprintf(jobname, "%s", o[i] + 5);
- }
- if (in_global && !td_parent)
- td_parent = get_new_job(1, &def_thread);
- else if (!in_global && !td) {
- if (!td_parent)
- td_parent = &def_thread;
- td = get_new_job(0, td_parent);
- }
- if (in_global)
- fio_options_parse(td_parent, (char **) &o[i], 1);
- else
- fio_options_parse(td, (char **) &o[i], 1);
- i++;
- }
- if (td)
- add_job(td, jobname, 0);
- return 0;
-}
-
static int parse_cmd_line(int argc, char *argv[])
{
struct thread_data *td = NULL;
job_section = strdup(optarg);
break;
case 'p':
- if (load_profile(optarg))
- do_exit++;
+ exec_profile = strdup(optarg);
break;
case FIO_GETOPT_JOB: {
const char *opt = l_opts[lidx].name;
if (!thread_number) {
if (dump_cmdline)
return 0;
+ if (exec_profile)
+ return 0;
log_err("No jobs defined(s)\n\n");
usage(argv[0]);
projects / fio.git / blobdiff