X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=ee0f36fdee54b2e6e2838df4d9d02eeab70f642b;hb=2393acbabe0f290da2d8f02c6ac0c1edf6ddb08a;hp=624d2842d69b2e576487357d9d6f44e4443f650c;hpb=656395b6dfc16faf75c802ac82b78a5fdeaf439d;p=fio.git diff --git a/init.c b/init.c index 624d2842..ee0f36fd 100644 --- a/init.c +++ b/init.c @@ -31,6 +31,9 @@ static int str_prioclass_cb(void *, unsigned int *); 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 *); +static int str_opendir_cb(void *, const char *); #define __stringify_1(x) #x #define __stringify(x) __stringify_1(x) @@ -55,13 +58,22 @@ static struct fio_option options[] = { .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 = "opendir", + .type = FIO_OPT_STR_STORE, + .off1 = td_var_offset(opendir), + .cb = str_opendir_cb, + .help = "Recursively add files from this directory and down", }, { .name = "rw", @@ -495,6 +507,13 @@ static struct fio_option options[] = { .help = "Include fsync at the end of job", .def = "0", }, + { + .name = "fsync_on_close", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(fsync_on_close), + .help = "fsync files on close", + .def = "0", + }, { .name = "unlink", .type = FIO_OPT_BOOL, @@ -721,12 +740,6 @@ static void fixup_options(struct thread_data *td) 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 */ @@ -754,6 +767,9 @@ static void fixup_options(struct thread_data *td) if (td->iodepth_batch > td->iodepth || !td->iodepth_batch) td->iodepth_batch = td->iodepth; + if (td->nr_files > td->files_index) + td->nr_files = td->files_index; + if (td->open_files > td->nr_files || !td->open_files) td->open_files = td->nr_files; } @@ -802,11 +818,11 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) { 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; - int fn_given; + char fname[PATH_MAX]; + int numjobs; /* * the def_thread is just for options, it's not a real job @@ -829,67 +845,26 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (td->odirect) td->io_ops->flags |= FIO_RAWIO; - fn_given = (long) td->filename; - if (!td->filename) + if (!td->filename && !td->files_index) { 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 (fn_given) - td->nr_uniq_files = 1; - else - td->nr_uniq_files = td->open_files; - - if (td->filetype == FIO_TYPE_FILE) { - 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); - - for_each_file(td, f, i) { - memset(f, 0, sizeof(*f)); - f->fd = -1; - - if (fn_given) - sprintf(tmp + len, "%s", td->filename); - else - sprintf(tmp + len, "%s.%d.%d", td->filename, td->thread_number, i); - f->file_name = strdup(tmp); - } - } 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(td->filename); } + fixup_options(td); + for_each_file(td, f, i) { - f->file_size = td->total_file_size / td->nr_files; - f->file_offset = td->start_offset; + if (td->directory && f->filetype == FIO_TYPE_FILE) { + sprintf(fname, "%s/%s", td->directory, f->file_name); + f->file_name = strdup(fname); + } } td->mutex = fio_sem_init(0); @@ -979,8 +954,9 @@ err: 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; @@ -1141,6 +1117,58 @@ static int str_fst_cb(void *data, const char *str) return 0; } +static int str_filename_cb(void *data, const char *input) +{ + struct thread_data *td = data; + char *fname, *str, *p; + + p = str = strdup(input); + + strip_blank_front(&str); + strip_blank_end(str); + + if (!td->files_index) + td->nr_files = 0; + + 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; +} + +static int str_opendir_cb(void *data, const char fio_unused *str) +{ + struct thread_data *td = data; + + if (!td->files_index) + td->nr_files = 0; + + return add_dir_files(td, td->opendir); +} + /* * This is our [ini] type file parser. */