#define DEF_RWMIX_CYCLE (500)
#define DEF_RWMIX_READ (50)
#define DEF_NICE (0)
+#define DEF_NR_FILES (1)
static int def_timeout = DEF_TIMEOUT;
*td = *parent;
td->name[0] = '\0';
- td->fd = -1;
td->thread_number = thread_number;
return td;
}
char *ddir_str[] = { "read", "write", "randread", "randwrite",
"rw", NULL, "randrw" };
struct stat sb;
- int numjobs, ddir;
+ int numjobs, ddir, i;
+ struct fio_file *f;
#ifndef FIO_HAVE_LIBAIO
if (td->io_engine == FIO_LIBAIO) {
if (td == &def_thread)
return 0;
- if (td->io_engine & FIO_SYNCIO)
+ /*
+ * Set default io engine, if none set
+ */
+ if (!td->io_ops) {
+ td->io_ops = load_ioengine(td, DEF_IO_ENGINE_NAME);
+ if (!td->io_ops) {
+ log_err("default engine %s not there?\n", DEF_IO_ENGINE_NAME);
+ return 1;
+ }
+ }
+
+ if (td->io_ops->flags & FIO_SYNCIO)
td->iodepth = 1;
else {
if (!td->iodepth)
}
/*
- * only really works for sequential io for now
+ * only really works for sequential io for now, and with 1 file
*/
- if (td->zone_size && !td->sequential)
+ if (td->zone_size && !td->sequential && td->nr_files == 1)
td->zone_size = 0;
/*
if (td->filetype == FIO_TYPE_FILE) {
char tmp[PATH_MAX];
+ int len = 0;
+ int i;
if (td->directory && td->directory[0] != '\0')
- sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->thread_number);
- else
- sprintf(tmp, "%s.%d", jobname, td->thread_number);
- td->file_name = strdup(tmp);
- } else
- td->file_name = strdup(jobname);
+ sprintf(tmp, "%s/", td->directory);
+
+ td->files = malloc(sizeof(struct fio_file) * td->nr_files);
+
+ for_each_file(td, f, i) {
+ memset(f, 0, sizeof(*f));
+ f->fd = -1;
+ sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i);
+ f->file_name = strdup(tmp);
+ }
+ } else {
+ 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;
+ }
+
fio_sem_init(&td->mutex, 0);
td->clat_stat[0].min_val = td->clat_stat[1].min_val = ULONG_MAX;
ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
if (!terse_output) {
- if (!job_add_num)
- fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
- else if (job_add_num == 1)
+ if (!job_add_num) {
+ if (td->io_ops->flags & FIO_CPUIO)
+ fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
+ else
+ fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_ops->name, td->iodepth);
+ } else if (job_add_num == 1)
fprintf(f_out, "...\n");
}
int init_random_state(struct thread_data *td)
{
unsigned long seeds[4];
- int fd, num_maps, blocks;
+ int fd, num_maps, blocks, i;
fd = open("/dev/urandom", O_RDONLY);
if (fd == -1) {
if (td->rand_repeatable)
seeds[3] = DEF_RANDSEED;
- blocks = (td->io_size + td->min_bs - 1) / td->min_bs;
- num_maps = blocks / BLOCKS_PER_MAP;
- td->file_map = malloc(num_maps * sizeof(long));
- td->num_maps = num_maps;
- memset(td->file_map, 0, num_maps * sizeof(long));
+ for (i = 0; i < td->nr_files; i++) {
+ struct fio_file *f = &td->files[i];
+
+ blocks = (f->file_size + td->min_bs - 1) / td->min_bs;
+ num_maps = blocks / BLOCKS_PER_MAP;
+ f->file_map = malloc(num_maps * sizeof(long));
+ f->num_maps = num_maps;
+ memset(f->file_map, 0, num_maps * sizeof(long));
+ }
os_random_seed(seeds[3], &td->random_state);
return 0;
static int str_ioengine_cb(struct thread_data *td, char *str)
{
- if (!strncmp(str, "linuxaio", 8) || !strncmp(str, "aio", 3) ||
- !strncmp(str, "libaio", 6)) {
- strcpy(td->io_engine_name, "libaio");
- td->io_engine = FIO_LIBAIO;
- return 0;
- } else if (!strncmp(str, "posixaio", 8)) {
- strcpy(td->io_engine_name, "posixaio");
- td->io_engine = FIO_POSIXAIO;
+ td->io_ops = load_ioengine(td, str);
+ if (td->io_ops)
return 0;
- } else if (!strncmp(str, "sync", 4)) {
- strcpy(td->io_engine_name, "sync");
- td->io_engine = FIO_SYNCIO;
- return 0;
- } else if (!strncmp(str, "mmap", 4)) {
- strcpy(td->io_engine_name, "mmap");
- td->io_engine = FIO_MMAPIO;
- return 0;
- } else if (!strncmp(str, "sgio", 4)) {
- strcpy(td->io_engine_name, "sgio");
- td->io_engine = FIO_SGIO;
- return 0;
- } else if (!strncmp(str, "splice", 6)) {
- strcpy(td->io_engine_name, "splice");
- td->io_engine = FIO_SPLICEIO;
- return 0;
- }
- log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice\n");
+ log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice, cpu\n");
return 1;
}
fgetpos(f, &off);
continue;
}
+ if (!check_int(p, "cpuload", &td->cpuload)) {
+ fgetpos(f, &off);
+ continue;
+ }
+ if (!check_int(p, "cpuchunks", &td->cpucycle)) {
+ fgetpos(f, &off);
+ continue;
+ }
if (!check_int(p, "thinktime", &td->thinktime)) {
fgetpos(f, &off);
continue;
continue;
}
if (!check_str_time(p, "timeout", &ull)) {
- td->timeout = ul1;
+ td->timeout = ull;
fgetpos(f, &off);
continue;
}
fgetpos(f, &off);
continue;
}
+ if (!check_int(p, "nrfiles", &td->nr_files)) {
+ fgetpos(f, &off);
+ continue;
+ }
if (!check_range_bytes(p, "bsrange", &ul1, &ul2)) {
if (ul1 > ul2) {
td->max_bs = ul1;
fgetpos(f, &off);
continue;
}
- if (!check_str_bytes(p, "size", &td->file_size)) {
+ if (!check_str_bytes(p, "size", &td->total_file_size)) {
fgetpos(f, &off);
continue;
}
- if (!check_str_bytes(p, "offset", &td->file_offset)) {
+ if (!check_str_bytes(p, "offset", &td->start_offset)) {
fgetpos(f, &off);
continue;
}
def_thread.bs = DEF_BS;
def_thread.min_bs = -1;
def_thread.max_bs = -1;
- def_thread.io_engine = DEF_IO_ENGINE;
- strcpy(def_thread.io_engine_name, DEF_IO_ENGINE_NAME);
def_thread.odirect = DEF_ODIRECT;
def_thread.ratecycle = DEF_RATE_CYCLE;
def_thread.sequential = DEF_SEQUENTIAL;
def_thread.rwmixread = DEF_RWMIX_READ;
def_thread.nice = DEF_NICE;
def_thread.rand_repeatable = DEF_RAND_REPEAT;
+ def_thread.nr_files = DEF_NR_FILES;
#ifdef FIO_HAVE_DISK_UTIL
def_thread.do_disk_util = 1;
#endif
printf("\t-l Generate per-job latency logs\n");
printf("\t-w Generate per-job bandwidth logs\n");
printf("\t-m Minimal (terse) output\n");
- printf("\t-f Job file (Required)\n");
printf("\t-v Print version info and exit\n");
}
switch (c) {
case 't':
def_timeout = atoi(optarg);
- idx++;
+ idx = optind;
break;
case 'l':
write_lat_log = 1;
- idx++;
+ idx = optind;
break;
case 'w':
write_bw_log = 1;
- idx++;
+ idx = optind;
break;
case 'o':
f_out = fopen(optarg, "w+");
exit(1);
}
f_err = f_out;
- idx++;
+ idx = optind;
break;
case 'm':
terse_output = 1;
- idx++;
+ idx = optind;
break;
case 'h':
usage(argv[0]);
ini_file[ini_idx - 1] = strdup(argv[idx]);
idx++;
}
-
+
if (!f_out) {
f_out = stdout;
f_err = stderr;
projects / fio.git / blobdiff