X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=fae35f3c8260fd140e0852d31d2f7abe1248e88a;hb=7a16dd027f83d7ff8ff0e72bb6bb12fae046fcbf;hp=3eaf9b7f383bab8451d4c75b9d193772870cbe84;hpb=2866c82d598e30604d8a92723c664ee6ced90fb0;p=fio.git diff --git a/init.c b/init.c index 3eaf9b7f..fae35f3c 100644 --- a/init.c +++ b/init.c @@ -46,6 +46,8 @@ #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; @@ -82,7 +84,6 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent) *td = *parent; td->name[0] = '\0'; - td->fd = -1; td->thread_number = thread_number; return td; } @@ -103,7 +104,8 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) 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) { @@ -124,6 +126,17 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) 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 { @@ -132,9 +145,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) } /* - * 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; /* @@ -151,17 +164,42 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) 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; @@ -236,7 +274,8 @@ err: int init_random_state(struct thread_data *td) { unsigned long seeds[4]; - int fd, num_maps, blocks; + int fd, num_maps, blocks, i; + struct fio_file *f; fd = open("/dev/urandom", O_RDONLY); if (fd == -1) { @@ -262,11 +301,13 @@ int init_random_state(struct thread_data *td) 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_each_file(td, f, 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; @@ -594,9 +635,6 @@ static int str_mem_cb(struct thread_data *td, char *mem) 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; @@ -813,6 +851,10 @@ int parse_jobs_ini(char *file, int stonewall_flag) 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; @@ -829,11 +871,11 @@ int parse_jobs_ini(char *file, int stonewall_flag) 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; } @@ -895,6 +937,11 @@ int parse_jobs_ini(char *file, int stonewall_flag) 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"); @@ -999,6 +1046,8 @@ static int fill_def_thread(void) 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 @@ -1006,7 +1055,7 @@ static int fill_def_thread(void) return 0; } -static void usage(char *name) +static void usage(void) { printf("%s\n", fio_version_string); printf("\t-o Write output to file\n"); @@ -1049,7 +1098,7 @@ static int parse_cmd_line(int argc, char *argv[]) idx = optind; break; case 'h': - usage(argv[0]); + usage(); exit(0); case 'v': printf("%s\n", fio_version_string); @@ -1133,7 +1182,7 @@ int parse_options(int argc, char *argv[]) job_files = parse_cmd_line(argc, argv); if (!job_files) { log_err("Need job file(s)\n"); - usage(argv[0]); + usage(); return 1; }