#define DEF_RWMIX_CYCLE (500)
#define DEF_RWMIX_READ (50)
#define DEF_NICE (0)
+#define DEF_NR_FILES (1)
+#define DEF_UNLINK (0)
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;
+ /*
+ * 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 {
}
/*
- * 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;
/*
td->filetype = FIO_TYPE_CHAR;
}
+ if (td->odirect)
+ td->io_ops->flags |= FIO_RAWIO;
+
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;
+ f->fileno = i;
+
+ 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;
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 (!str)
- str = DEF_IO_ENGINE_NAME;
-
td->io_ops = load_ioengine(td, str);
if (td->io_ops)
return 0;
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;
}
fgetpos(f, &off);
continue;
}
+ if (!check_strset(p, "unlink")) {
+ td->unlink = 1;
+ fgetpos(f, &off);
+ continue;
+ }
if (!check_strstore(p, "iolog", tmpbuf)) {
if (td->write_iolog) {
log_err("fio: read iolog overrides given write_iolog\n");
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;
+ def_thread.unlink = DEF_UNLINK;
#ifdef FIO_HAVE_DISK_UTIL
def_thread.do_disk_util = 1;
#endif