#include "fio.h"
#include "parse.h"
+#include "smalloc.h"
+#include "filehash.h"
-static char fio_version_string[] = "fio 1.18.1";
+static char fio_version_string[] = "fio 1.20-rc2";
#define FIO_RANDSEED (0xb1899bedUL)
unsigned long long mlock_size = 0;
FILE *f_out = NULL;
FILE *f_err = NULL;
+char *job_section = NULL;
int write_bw_log = 0;
int read_only = 0;
-static int def_timeout = 0;
-static int write_lat_log = 0;
+static int def_timeout;
+static int write_lat_log;
static int prev_group_jobs;
* Command line options. These will contain the above, plus a few
* extra that only pertain to fio itself and not jobs.
*/
-static struct option long_options[FIO_NR_OPTIONS] = {
+static struct option l_opts[FIO_NR_OPTIONS] = {
{
.name = "output",
.has_arg = required_argument,
.has_arg = required_argument,
.val = 'd',
},
+ {
+ .name = "section",
+ .has_arg = required_argument,
+ .val = 'x',
+ },
{
.name = NULL,
},
struct thread_options *o = &td->o;
if (read_only && td_write(td)) {
- log_err("fio: job <%s> has write bit set, but fio is in read-only mode\n", td->o.name);
+ log_err("fio: job <%s> has write bit set, but fio is in"
+ " read-only mode\n", td->o.name);
return 1;
}
-
+
if (o->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100)
o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ];
o->overwrite = 1;
if (!o->min_bs[DDIR_READ])
- o->min_bs[DDIR_READ]= o->bs[DDIR_READ];
+ o->min_bs[DDIR_READ] = o->bs[DDIR_READ];
if (!o->max_bs[DDIR_READ])
o->max_bs[DDIR_READ] = o->bs[DDIR_READ];
if (!o->min_bs[DDIR_WRITE])
- o->min_bs[DDIR_WRITE]= o->bs[DDIR_WRITE];
+ o->min_bs[DDIR_WRITE] = o->bs[DDIR_WRITE];
if (!o->max_bs[DDIR_WRITE])
o->max_bs[DDIR_WRITE] = o->bs[DDIR_WRITE];
if (o->fill_device && !o->size)
o->size = ULONG_LONG_MAX;
-
+
if (td_rw(td) && td->o.verify != VERIFY_NONE)
log_info("fio: mixed read/write workload with verify. May not "
"work as expected, unless you pre-populated the file\n");
add_file(td, jobname);
else {
for (i = 0; i < td->o.nr_files; i++) {
- sprintf(fname, "%s.%d.%d", jobname, td->thread_number, i);
+ sprintf(fname, "%s.%d.%d", jobname,
+ td->thread_number, i);
add_file(td, fname);
}
}
f->real_file_size = -1ULL;
}
- td->mutex = fio_sem_init(0);
+ td->mutex = fio_mutex_init(0);
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;
if (!terse_output) {
if (!job_add_num) {
- if (!strcmp(td->io_ops->name, "cpuio"))
- log_info("%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->o.name, td->o.cpuload, td->o.cpucycle);
- else {
+ if (!strcmp(td->io_ops->name, "cpuio")) {
+ log_info("%s: ioengine=cpu, cpuload=%u,"
+ " cpucycle=%u\n", td->o.name,
+ td->o.cpuload,
+ td->o.cpucycle);
+ } else {
char *c1, *c2, *c3, *c4;
c1 = to_kmg(td->o.min_bs[DDIR_READ]);
c3 = to_kmg(td->o.min_bs[DDIR_WRITE]);
c4 = to_kmg(td->o.max_bs[DDIR_WRITE]);
- log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->o.name, td->groupid, ddir_str[td->o.td_ddir], c1, c2, c3, c4, td->io_ops->name, td->o.iodepth);
+ log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s,"
+ " ioengine=%s, iodepth=%u\n",
+ td->o.name, td->groupid,
+ ddir_str[td->o.td_ddir],
+ c1, c2, c3, c4,
+ td->io_ops->name,
+ td->o.iodepth);
free(c1);
free(c2);
return -1;
}
+static int skip_this_section(const char *name)
+{
+ if (!job_section)
+ return 0;
+ if (!strncmp(name, "global", 6))
+ return 0;
+
+ return strncmp(job_section, name, strlen(job_section));
+}
+
static int is_empty_or_comment(char *line)
{
unsigned int i;
int ret = 0, stonewall;
int first_sect = 1;
int skip_fgets = 0;
+ int inside_skip = 0;
if (!strcmp(file, "-"))
f = stdin;
if (is_empty_or_comment(p))
continue;
if (sscanf(p, "[%255s]", name) != 1) {
- log_err("fio: option <%s> outside of [] job section\n", p);
+ if (inside_skip)
+ continue;
+ log_err("fio: option <%s> outside of [] job section\n",
+ p);
break;
}
+ if (skip_this_section(name)) {
+ inside_skip = 1;
+ continue;
+ } else
+ inside_skip = 0;
+
global = !strncmp(name, "global", 6);
name[strlen(name) - 1] = '\0';
threads = NULL;
shmctl(shm_id, IPC_RMID, &sbuf);
}
+
+ scleanup();
}
/*
* The thread area is shared between the main process and the job
* threads/processes. So setup a shared memory segment that will hold
- * all the job info.
+ * all the job info. We use the end of the region for keeping track of
+ * open files across jobs, for file sharing.
*/
static int setup_thread_area(void)
{
+ void *hash;
+
/*
* 1024 is too much on some machines, scale max_jobs if
* we get a failure that looks like too large a shm segment
do {
size_t size = max_jobs * sizeof(struct thread_data);
+ size += file_hash_size;
+
shm_id = shmget(0, size, IPC_CREAT | 0600);
if (shm_id != -1)
break;
}
memset(threads, 0, max_jobs * sizeof(struct thread_data));
+ hash = (void *) threads + max_jobs * sizeof(struct thread_data);
+ file_hash_init(hash);
atexit(free_shm);
return 0;
}
printf("\t--minimal\tMinimal (terse) output\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--cmdhelp=cmd\tPrint command help, \"all\" for all of"
+ " them\n");
printf("\t--showcmd\tTurn a job file into command line options\n");
printf("\t--eta=when\tWhen ETA estimate should be printed\n");
printf("\t \tMay be \"always\", \"never\" or \"auto\"\n");
- printf("\t--readonly\tTurn on safety read-only checks, preventing writes\n");
+ printf("\t--readonly\tTurn on safety read-only checks, preventing"
+ " writes\n");
+ printf("\t--section=name\tOnly run specified section in job file\n");
}
#ifdef FIO_INC_DEBUG
{ .name = "mem", .shift = FD_MEM, },
{ .name = "blktrace", .shift = FD_BLKTRACE },
{ .name = "verify", .shift = FD_VERIFY },
+ { .name = "random", .shift = FD_RANDOM },
+ { .name = "parse", .shift = FD_PARSE },
{ },
};
-static void set_debug(const char *string)
+static int set_debug(const char *string)
{
struct debug_level *dl;
char *p = (char *) string;
log_info("%s,", dl->name);
}
log_info("all\n");
- return;
+ return 1;
} else if (!strcmp(string, "all")) {
fio_debug = ~0UL;
- return;
+ return 0;
}
while ((opt = strsep(&p, ",")) != NULL) {
if (!found)
log_err("fio: debug mask %s not found\n", opt);
}
+ return 0;
}
#else
static void set_debug(const char *string)
{
log_err("fio: debug tracing not included in build\n");
+ return 1;
}
#endif
static int parse_cmd_line(int argc, char *argv[])
{
struct thread_data *td = NULL;
- int c, ini_idx = 0, lidx, ret, dont_add_job = 0, bad_options = 0;
+ int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0;
- while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) {
+ while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) {
switch (c) {
case 't':
def_timeout = atoi(optarg);
eta_print = FIO_ETA_NEVER;
break;
case 'd':
- set_debug(optarg);
+ if (set_debug(optarg))
+ do_exit++;
+ break;
+ case 'x':
+ if (!strcmp(optarg, "global")) {
+ log_err("fio: can't use global as only "
+ "section\n");
+ do_exit++;
+ exit_val = 1;
+ break;
+ }
+ if (job_section)
+ free(job_section);
+ job_section = strdup(optarg);
break;
case FIO_GETOPT_JOB: {
- const char *opt = long_options[lidx].name;
+ const char *opt = l_opts[lidx].name;
char *val = optarg;
if (!strncmp(opt, "name", 4) && td) {
td = NULL;
}
if (!td) {
+ int is_section = !strncmp(opt, "name", 4);
int global = 0;
- if (strncmp(opt, "name", 4) ||
- !strncmp(val, "global", 6))
+ if (!is_section || !strncmp(val, "global", 6))
global = 1;
+ if (is_section && skip_this_section(val))
+ continue;
+
td = get_new_job(global, &def_thread);
if (!td)
return 0;
}
ret = fio_cmd_option_parse(td, opt, val);
- if (ret)
- dont_add_job = 1;
break;
}
default:
- bad_options++;
+ do_exit++;
+ exit_val = 1;
break;
}
}
- if (bad_options)
- exit(1);
+ if (do_exit)
+ exit(exit_val);
if (td) {
- if (dont_add_job)
- put_job(td);
- else {
+ if (!ret)
ret = add_job(td, td->o.name ?: "fio", 0);
- if (ret)
- put_job(td);
- }
+ if (ret)
+ put_job(td);
}
while (optind < argc) {
f_out = stdout;
f_err = stderr;
- fio_options_dup_and_init(long_options);
+ fio_options_dup_and_init(l_opts);
if (setup_thread_area())
return 1;
projects / fio.git / blobdiff