#endif
static int str_exitall_cb(void);
static int str_cpumask_cb(void *, unsigned int *);
+static int str_fst_cb(void *, const char *);
+static int str_filename_cb(void *, const char *);
+static int str_directory_cb(void *, const char *);
#define __stringify_1(x) #x
#define __stringify(x) __stringify_1(x)
.name = "directory",
.type = FIO_OPT_STR_STORE,
.off1 = td_var_offset(directory),
+ .cb = str_directory_cb,
.help = "Directory to store files in",
},
{
.name = "filename",
.type = FIO_OPT_STR_STORE,
.off1 = td_var_offset(filename),
- .help = "Force the use of a specific file",
+ .cb = str_filename_cb,
+ .help = "File(s) to use for the workload",
},
{
.name = "rw",
{
.name = "file_service_type",
.type = FIO_OPT_STR,
+ .cb = str_fst_cb,
.off1 = td_var_offset(file_service_type),
.help = "How to select which file to service next",
.def = "roundrobin",
static int write_lat_log = 0;
int write_bw_log = 0;
+static int prev_group_jobs;
+
FILE *get_f_out()
{
return f_out;
if (td->bs_unaligned && (td->odirect || td->io_ops->flags & FIO_RAWIO))
log_err("fio: bs_unaligned may not work with raw io\n");
- /*
- * O_DIRECT and char doesn't mix, clear that flag if necessary.
- */
- if (td->filetype == FIO_TYPE_CHAR && td->odirect)
- td->odirect = 0;
-
/*
* thinktime_spin must be less than thinktime
*/
if (td->iodepth_batch > td->iodepth || !td->iodepth_batch)
td->iodepth_batch = td->iodepth;
- if (td->open_files > td->nr_files || !td->open_files)
+ if (!td->nr_files)
+ td->nr_files = td->open_files;
+ else if (td->open_files > td->nr_files || !td->open_files)
td->open_files = td->nr_files;
}
{
const char *ddir_str[] = { NULL, "read", "write", "rw", NULL,
"randread", "randwrite", "randrw" };
- struct stat sb;
- int numjobs, i;
+ unsigned int i;
struct fio_file *f;
const char *engine;
+ char fname[PATH_MAX];
+ int numjobs;
/*
* the def_thread is just for options, it's not a real job
return 1;
}
+ if (td->use_thread)
+ nr_thread++;
+ else
+ nr_process++;
+
if (td->odirect)
td->io_ops->flags |= FIO_RAWIO;
- if (!td->filename)
+ if (!td->filename) {
td->filename = strdup(jobname);
- td->filetype = FIO_TYPE_FILE;
- if (!lstat(td->filename, &sb)) {
- if (S_ISBLK(sb.st_mode))
- td->filetype = FIO_TYPE_BD;
- else if (S_ISCHR(sb.st_mode))
- td->filetype = FIO_TYPE_CHAR;
- }
-
- fixup_options(td);
-
- if (td->filename)
- td->nr_uniq_files = 1;
- else
- td->nr_uniq_files = td->open_files;
-
- if (td->filetype == FIO_TYPE_FILE || td->filename) {
- char tmp[PATH_MAX];
- int len = 0;
-
- if (td->directory && td->directory[0] != '\0') {
- if (lstat(td->directory, &sb) < 0) {
- log_err("fio: %s is not a directory\n", td->directory);
- td_verror(td, errno, "lstat");
- return 1;
- }
- if (!S_ISDIR(sb.st_mode)) {
- log_err("fio: %s is not a directory\n", td->directory);
- return 1;
+ if (td->nr_files == 1)
+ add_file(td, td->filename);
+ else {
+ for (i = 0; i < td->nr_files; i++) {
+ sprintf(fname, "%s.%d.%d", td->filename, td->thread_number, i);
+ add_file(td, fname);
}
- len = sprintf(tmp, "%s/", td->directory);
}
+ }
- td->files = malloc(sizeof(struct fio_file) * td->open_files);
+ fixup_options(td);
- for_each_file(td, f, i) {
- memset(f, 0, sizeof(*f));
- f->fd = -1;
-
- if (td->filename)
- sprintf(tmp + len, "%s", td->filename);
- else
- sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i);
- f->file_name = strdup(tmp);
+ for_each_file(td, f, i) {
+ if (td->directory && f->filetype == FIO_TYPE_FILE) {
+ sprintf(fname, "%s/%s", td->directory, f->file_name);
+ f->file_name = strdup(fname);
}
- } else {
- td->open_files = td->nr_files = 1;
- td->files = malloc(sizeof(struct fio_file));
- f = &td->files[0];
-
- memset(f, 0, sizeof(*f));
- f->fd = -1;
- f->file_name = strdup(jobname);
- }
- for_each_file(td, f, i) {
f->file_size = td->total_file_size / td->nr_files;
f->file_offset = td->start_offset;
}
td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
- if (td->stonewall && td->thread_number > 1)
+ if ((td->stonewall || td->numjobs > 1) && prev_group_jobs) {
+ prev_group_jobs = 0;
groupid++;
+ }
td->groupid = groupid;
+ prev_group_jobs++;
if (setup_rate(td))
goto err;
if (add_job(td_new, jobname, job_add_num))
goto err;
}
+
+ if (td->numjobs > 1) {
+ groupid++;
+ prev_group_jobs = 0;
+ }
+
return 0;
err:
put_job(td);
int init_random_state(struct thread_data *td)
{
unsigned long seeds[5];
- int fd, num_maps, blocks, i;
+ int fd, num_maps, blocks;
struct fio_file *f;
+ unsigned int i;
if (td->io_ops->flags & FIO_DISKLESSIO)
return 0;
blocks = (f->real_file_size + td->rw_min_bs - 1) / td->rw_min_bs;
num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
f->file_map = malloc(num_maps * sizeof(long));
+ if (!f->file_map) {
+ log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
+ return 1;
+ }
f->num_maps = num_maps;
memset(f->file_map, 0, num_maps * sizeof(long));
}
/*
* Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
*/
-static char *get_mmap_file(const char *str)
+static char *get_opt_postfix(const char *str)
{
char *p = strstr(str, ":");
struct thread_data *td = data;
if (td->mem_type == MEM_MMAPHUGE || td->mem_type == MEM_MMAP) {
- td->mmapfile = get_mmap_file(mem);
+ td->mmapfile = get_opt_postfix(mem);
if (td->mem_type == MEM_MMAPHUGE && !td->mmapfile) {
log_err("fio: mmaphuge:/path/to/file\n");
return 1;
return 0;
}
+static int str_fst_cb(void *data, const char *str)
+{
+ struct thread_data *td = data;
+ char *nr = get_opt_postfix(str);
+
+ td->file_service_nr = 1;
+ if (nr)
+ td->file_service_nr = atoi(nr);
+
+ return 0;
+}
+
+static int str_filename_cb(void *data, const char *input)
+{
+ struct thread_data *td = data;
+ char *fname, *str, *p;
+
+ td->nr_files = 0;
+ p = str = strdup(input);
+
+ strip_blank_front(&str);
+ strip_blank_end(str);
+
+ while ((fname = strsep(&str, ":")) != NULL) {
+ if (!strlen(fname))
+ break;
+ add_file(td, fname);
+ td->nr_files++;
+ }
+
+ free(p);
+ return 0;
+}
+
+static int str_directory_cb(void *data, const char fio_unused *str)
+{
+ struct thread_data *td = data;
+ struct stat sb;
+
+ if (lstat(td->directory, &sb) < 0) {
+ log_err("fio: %s is not a directory\n", td->directory);
+ td_verror(td, errno, "lstat");
+ return 1;
+ }
+ if (!S_ISDIR(sb.st_mode)) {
+ log_err("fio: %s is not a directory\n", td->directory);
+ return 1;
+ }
+
+ return 0;
+}
+
/*
* This is our [ini] type file parser.
*/
projects / fio.git / blobdiff