X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=e88ff9b178a56de8d95285d5251225134dc20d0e;hp=956ff5f0a48b5a98699b43704788697cdf5f0487;hb=01ef57cef61251bdc9941404f853a89326917e25;hpb=6c23570dd5458d8f7c7086fb86675ce7b424d4fd diff --git a/init.c b/init.c index 956ff5f0..e88ff9b1 100644 --- a/init.c +++ b/init.c @@ -22,10 +22,7 @@ #define td_var_offset(var) ((size_t) &((struct thread_data *)0)->var) -static int str_rw_cb(void *, const char *); -static int str_ioengine_cb(void *, const char *); static int str_mem_cb(void *, const char *); -static int str_verify_cb(void *, const char *); static int str_lockmem_cb(void *, unsigned long *); #ifdef FIO_HAVE_IOPRIO static int str_prio_cb(void *, unsigned int *); @@ -33,6 +30,7 @@ static int str_prioclass_cb(void *, unsigned int *); #endif static int str_exitall_cb(void); static int str_cpumask_cb(void *, unsigned int *); +static int str_fst_cb(void *, const char *); #define __stringify_1(x) #x #define __stringify(x) __stringify_1(x) @@ -68,20 +66,46 @@ static struct fio_option options[] = { { .name = "rw", .type = FIO_OPT_STR, - .cb = str_rw_cb, + .off1 = td_var_offset(td_ddir), .help = "IO direction", .def = "read", - .posval = { "read", "write", "randwrite", "randread", "rw", - "randrw", }, + .posval = { + { .ival = "read", .oval = TD_DDIR_READ }, + { .ival = "write", .oval = TD_DDIR_WRITE }, + { .ival = "randread", .oval = TD_DDIR_RANDREAD }, + { .ival = "randwrite", .oval = TD_DDIR_RANDWRITE }, + { .ival = "rw", .oval = TD_DDIR_RW }, + { .ival = "randrw", .oval = TD_DDIR_RANDRW }, + }, }, { .name = "ioengine", - .type = FIO_OPT_STR, - .cb = str_ioengine_cb, + .type = FIO_OPT_STR_STORE, + .off1 = td_var_offset(ioengine), .help = "IO engine to use", .def = "sync", - .posval = { "sync", "libaio", "posixaio", "mmap", "splice", - "sg", "null", "net", "syslet-rw" }, + .posval = { + { .ival = "sync", }, +#ifdef FIO_HAVE_LIBAIO + { .ival = "libaio", }, +#endif +#ifdef FIO_HAVE_POSIXAIO + { .ival = "posixaio", }, +#endif + { .ival = "mmap", }, +#ifdef FIO_HAVE_SPLICE + { .ival = "splice", }, +#endif +#ifdef FIO_HAVE_SGIO + { .ival = "sg", }, +#endif + { .ival = "null", }, { .ival = "net", }, +#ifdef FIO_HAVE_SYSLET + { .ival = "syslet-rw", }, +#endif + { .ival = "cpuio", }, + { .ival = "external", }, + }, }, { .name = "iodepth", @@ -90,6 +114,12 @@ static struct fio_option options[] = { .help = "Amount of IO buffers to keep in flight", .def = "1", }, + { + .name = "iodepth_batch", + .type = FIO_OPT_INT, + .off1 = td_var_offset(iodepth_batch), + .help = "Number of IO to submit in one go", + }, { .name = "iodepth_low", .type = FIO_OPT_INT, @@ -152,6 +182,24 @@ static struct fio_option options[] = { .help = "Split job workload between this number of files", .def = "1", }, + { + .name = "openfiles", + .type = FIO_OPT_INT, + .off1 = td_var_offset(open_files), + .help = "Number of files to keep open at the same time", + }, + { + .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", + .posval = { + { .ival = "random", .oval = FIO_FSERVICE_RANDOM }, + { .ival = "roundrobin", .oval = FIO_FSERVICE_RR }, + }, + }, { .name = "fsync", .type = FIO_OPT_INT, @@ -214,17 +262,32 @@ static struct fio_option options[] = { .name = "mem", .type = FIO_OPT_STR, .cb = str_mem_cb, + .off1 = td_var_offset(mem_type), .help = "Backing type for IO buffers", .def = "malloc", - .posval = { "malloc", "shm", "shmhuge", "mmap", "mmaphuge", }, + .posval = { + { .ival = "malloc", .oval = MEM_MALLOC }, + { .ival = "shm", .oval = MEM_SHM }, +#ifdef FIO_HAVE_HUGETLB + { .ival = "shmhuge", .oval = MEM_SHMHUGE }, +#endif + { .ival = "mmap", .oval = MEM_MMAP }, +#ifdef FIO_HAVE_HUGETLB + { .ival = "mmaphuge", .oval = MEM_MMAPHUGE }, +#endif + }, }, { .name = "verify", .type = FIO_OPT_STR, - .cb = str_verify_cb, + .off1 = td_var_offset(verify), .help = "Verify sum function", .def = "0", - .posval = { "crc32", "md5", }, + .posval = { + { .ival = "0", .oval = VERIFY_NONE }, + { .ival = "crc32", .oval = VERIFY_CRC32 }, + { .ival = "md5", .oval = VERIFY_MD5 }, + }, }, { .name = "write_iolog", @@ -340,7 +403,7 @@ static struct fio_option options[] = { .name = "thinktime_spin", .type = FIO_OPT_INT, .off1 = td_var_offset(thinktime_spin), - .help = "Start thinktime by spinning this amount (usec)", + .help = "Start think time by spinning this amount (usec)", .def = "0", }, { @@ -414,7 +477,8 @@ static struct fio_option options[] = { .name = "cpuchunks", .type = FIO_OPT_INT, .off1 = td_var_offset(cpucycle), - .help = "Length of the CPU burn cycles", + .help = "Length of the CPU burn cycles (usecs)", + .def = "50000", }, #ifdef FIO_HAVE_CPU_AFFINITY { @@ -475,6 +539,12 @@ static struct fio_option options[] = { .help = "When using hugepages, specify size of each page", .def = __stringify(FIO_HUGE_PAGE), }, + { + .name = "group_reporting", + .type = FIO_OPT_STR_SET, + .off1 = td_var_offset(group_reporting), + .help = "Do reporting on a per-group basis", + }, { .name = NULL, }, @@ -526,7 +596,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = { }, { .name = "cmdhelp", - .has_arg = required_argument, + .has_arg = optional_argument, .val = 'c', }, { @@ -536,7 +606,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = { static int def_timeout = 0; -static char fio_version_string[] = "fio 1.11"; +static char fio_version_string[] = "fio 1.13"; static char **ini_file; static int max_jobs = MAX_JOBS; @@ -553,6 +623,16 @@ FILE *f_err = NULL; static int write_lat_log = 0; int write_bw_log = 0; +FILE *get_f_out() +{ + return f_out; +} + +FILE *get_f_err() +{ + return f_err; +} + /* * Return a free job structure. */ @@ -603,13 +683,13 @@ static void fixup_options(struct thread_data *td) td->iodepth = 1; else { if (!td->iodepth) - td->iodepth = td->nr_files; + td->iodepth = td->open_files; } /* * only really works for sequential io for now, and with 1 file */ - if (td->zone_size && !td->sequential && td->nr_files == 1) + if (td->zone_size && td_random(td) && td->open_files == 1) td->zone_size = 0; /* @@ -654,8 +734,26 @@ static void fixup_options(struct thread_data *td) /* * The low water mark cannot be bigger than the iodepth */ - if (td->iodepth_low > td->iodepth || !td->iodepth_low) - td->iodepth_low = td->iodepth; + if (td->iodepth_low > td->iodepth || !td->iodepth_low) { + /* + * syslet work around - if the workload is sequential, + * we want to let the queue drain all the way down to + * avoid seeking between async threads + */ + if (!strcmp(td->io_ops->name, "syslet-rw") && !td_random(td)) + td->iodepth_low = 1; + else + td->iodepth_low = td->iodepth; + } + + /* + * If batch number isn't set, default to the same as iodepth + */ + if (td->iodepth_batch > td->iodepth || !td->iodepth_batch) + td->iodepth_batch = td->iodepth; + + if (td->open_files > td->nr_files || !td->open_files) + td->open_files = td->nr_files; } /* @@ -679,6 +777,20 @@ static char *to_kmg(unsigned int val) return buf; } +/* External engines are specified by "external:name.o") */ +static const char *get_engine_name(const char *str) +{ + char *p = strstr(str, ":"); + + if (!p) + return str; + + p++; + strip_blank_front(&p); + strip_blank_end(p); + return p; +} + /* * Adds a job to the list of things todo. Sanitizes the various options * to make sure we don't have conflicts, and initializes various @@ -686,11 +798,13 @@ static char *to_kmg(unsigned int val) */ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) { - const char *ddir_str[] = { "read", "write", "randread", "randwrite", - "rw", NULL, "randrw" }; + const char *ddir_str[] = { NULL, "read", "write", "rw", NULL, + "randread", "randwrite", "randrw" }; struct stat sb; - int numjobs, ddir, i; + int numjobs, i; struct fio_file *f; + const char *engine; + int fn_given; /* * the def_thread is just for options, it's not a real job @@ -698,13 +812,27 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (td == &def_thread) return 0; - assert(td->io_ops); + engine = get_engine_name(td->ioengine); + td->io_ops = load_ioengine(td, engine); + if (!td->io_ops) { + log_err("fio: failed to load engine %s\n", engine); + return 1; + } + + if (td->use_thread) + nr_thread++; + else + nr_process++; if (td->odirect) td->io_ops->flags |= FIO_RAWIO; + fn_given = (int) td->filename; + if (!td->filename) + td->filename = strdup(jobname); + td->filetype = FIO_TYPE_FILE; - if (td->filename && !lstat(td->filename, &sb)) { + if (!lstat(td->filename, &sb)) { if (S_ISBLK(sb.st_mode)) td->filetype = FIO_TYPE_BD; else if (S_ISCHR(sb.st_mode)) @@ -716,16 +844,16 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (td->filename) td->nr_uniq_files = 1; else - td->nr_uniq_files = td->nr_files; + td->nr_uniq_files = td->open_files; - if (td->filetype == FIO_TYPE_FILE || td->filename) { + 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); + td_verror(td, errno, "lstat"); return 1; } if (!S_ISDIR(sb.st_mode)) { @@ -735,20 +863,20 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) len = sprintf(tmp, "%s/", td->directory); } - td->files = malloc(sizeof(struct fio_file) * td->nr_files); + 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 (td->filename) + if (fn_given) sprintf(tmp + len, "%s", td->filename); else - sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i); + sprintf(tmp + len, "%s.%d.%d", td->filename, td->thread_number, i); f->file_name = strdup(tmp); } } else { - td->nr_files = 1; + td->open_files = td->nr_files = 1; td->files = malloc(sizeof(struct fio_file)); f = &td->files[0]; @@ -762,7 +890,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) f->file_offset = td->start_offset; } - fio_sem_init(&td->mutex, 0); + td->mutex = fio_sem_init(0); td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX; td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX; @@ -786,11 +914,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (!td->name) td->name = strdup(jobname); - ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2); - if (!terse_output) { if (!job_add_num) { - if (td->io_ops->flags & FIO_CPUIO) + if (!strcmp(td->io_ops->name, "cpuio")) fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle); else { char *c1, *c2, *c3, *c4; @@ -800,7 +926,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) c3 = to_kmg(td->min_bs[DDIR_WRITE]); c4 = to_kmg(td->max_bs[DDIR_WRITE]); - fprintf(f_out, "%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[ddir], c1, c2, c3, c4, td->io_ops->name, td->iodepth); + fprintf(f_out, "%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[td->td_ddir], c1, c2, c3, c4, td->io_ops->name, td->iodepth); free(c1); free(c2); @@ -841,21 +967,21 @@ err: */ int init_random_state(struct thread_data *td) { - unsigned long seeds[4]; + unsigned long seeds[5]; int fd, num_maps, blocks, i; struct fio_file *f; - if (td->io_ops->flags & FIO_CPUIO) + if (td->io_ops->flags & FIO_DISKLESSIO) return 0; fd = open("/dev/urandom", O_RDONLY); if (fd == -1) { - td_verror(td, errno); + td_verror(td, errno, "open"); return 1; } if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) { - td_verror(td, EIO); + td_verror(td, EIO, "read"); close(fd); return 1; } @@ -866,23 +992,30 @@ int init_random_state(struct thread_data *td) os_random_seed(seeds[1], &td->verify_state); os_random_seed(seeds[2], &td->rwmix_state); - if (td->sequential) + if (td->file_service_type == FIO_FSERVICE_RANDOM) + os_random_seed(seeds[3], &td->next_file_state); + + if (!td_random(td)) return 0; if (td->rand_repeatable) - seeds[3] = FIO_RANDSEED * td->thread_number; + seeds[4] = FIO_RANDSEED * td->thread_number; if (!td->norandommap) { for_each_file(td, f, i) { 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)); } } - os_random_seed(seeds[3], &td->random_state); + os_random_seed(seeds[4], &td->random_state); return 0; } @@ -916,65 +1049,10 @@ static int is_empty_or_comment(char *line) return 1; } -static int str_rw_cb(void *data, const char *mem) -{ - struct thread_data *td = data; - - if (!strncmp(mem, "read", 4) || !strncmp(mem, "0", 1)) { - td->ddir = DDIR_READ; - td->sequential = 1; - return 0; - } else if (!strncmp(mem, "randread", 8)) { - td->ddir = DDIR_READ; - td->sequential = 0; - return 0; - } else if (!strncmp(mem, "write", 5) || !strncmp(mem, "1", 1)) { - td->ddir = DDIR_WRITE; - td->sequential = 1; - return 0; - } else if (!strncmp(mem, "randwrite", 9)) { - td->ddir = DDIR_WRITE; - td->sequential = 0; - return 0; - } else if (!strncmp(mem, "rw", 2)) { - td->ddir = DDIR_READ; - td->iomix = 1; - td->sequential = 1; - return 0; - } else if (!strncmp(mem, "randrw", 6)) { - td->ddir = DDIR_READ; - td->iomix = 1; - td->sequential = 0; - return 0; - } - - log_err("fio: data direction: read, write, randread, randwrite, rw, randrw\n"); - return 1; -} - -static int str_verify_cb(void *data, const char *mem) -{ - struct thread_data *td = data; - - if (!strncmp(mem, "0", 1)) { - td->verify = VERIFY_NONE; - return 0; - } else if (!strncmp(mem, "md5", 3) || !strncmp(mem, "1", 1)) { - td->verify = VERIFY_MD5; - return 0; - } else if (!strncmp(mem, "crc32", 5)) { - td->verify = VERIFY_CRC32; - return 0; - } - - log_err("fio: verify types: md5, crc32\n"); - return 1; -} - /* * 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, ":"); @@ -991,62 +1069,15 @@ static int str_mem_cb(void *data, const char *mem) { struct thread_data *td = data; - if (!strncmp(mem, "malloc", 6)) { - td->mem_type = MEM_MALLOC; - return 0; - } else if (!strncmp(mem, "mmaphuge", 8)) { -#ifdef FIO_HAVE_HUGETLB - /* - * mmaphuge must be appended with the actual file - */ - td->mmapfile = get_mmap_file(mem); - if (!td->mmapfile) { + if (td->mem_type == MEM_MMAPHUGE || td->mem_type == MEM_MMAP) { + td->mmapfile = get_opt_postfix(mem); + if (td->mem_type == MEM_MMAPHUGE && !td->mmapfile) { log_err("fio: mmaphuge:/path/to/file\n"); return 1; } - - td->mem_type = MEM_MMAPHUGE; - return 0; -#else - log_err("fio: mmaphuge not available\n"); - return 1; -#endif - } else if (!strncmp(mem, "mmap", 4)) { - /* - * Check if the user wants file backed memory. It's ok - * if there's no file given, we'll just use anon mamp then. - */ - td->mmapfile = get_mmap_file(mem); - td->mem_type = MEM_MMAP; - return 0; - } else if (!strncmp(mem, "shmhuge", 7)) { -#ifdef FIO_HAVE_HUGETLB - td->mem_type = MEM_SHMHUGE; - return 0; -#else - log_err("fio: shmhuge not available\n"); - return 1; -#endif - } else if (!strncmp(mem, "shm", 3)) { - td->mem_type = MEM_SHM; - return 0; } - log_err("fio: mem type: malloc, shm, shmhuge, mmap, mmaphuge\n"); - return 1; -} - -static int str_ioengine_cb(void *data, const char *str) -{ - struct thread_data *td = data; - - td->io_ops = load_ioengine(td, str); - if (td->io_ops) - return 0; - - log_err("fio: ioengine= libaio, posixaio, sync, mmap, sgio, splice, cpu, null\n"); - log_err("fio: or specify path to dynamic ioengine module\n"); - return 1; + return 0; } static int str_lockmem_cb(void fio_unused *data, unsigned long *val) @@ -1087,6 +1118,18 @@ static int str_cpumask_cb(void *data, unsigned int *val) 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; +} + /* * This is our [ini] type file parser. */ @@ -1216,9 +1259,9 @@ static void usage(void) static int parse_cmd_line(int argc, char *argv[]) { struct thread_data *td = NULL; - int c, ini_idx = 0, lidx, ret; + int c, ini_idx = 0, lidx, ret, dont_add_job = 0; - while ((c = getopt_long(argc, argv, "", long_options, &lidx)) != -1) { + while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) { switch (c) { case 't': def_timeout = atoi(optarg); @@ -1270,11 +1313,8 @@ static int parse_cmd_line(int argc, char *argv[]) } ret = parse_cmd_option(opt, val, options, td); - if (ret) { - log_err("fio: job dropped\n"); - put_job(td); - td = NULL; - } + if (ret) + dont_add_job = 1; break; } default: @@ -1283,9 +1323,13 @@ static int parse_cmd_line(int argc, char *argv[]) } if (td) { - ret = add_job(td, td->name ?: "fio", 0); - if (ret) + if (dont_add_job) put_job(td); + else { + ret = add_job(td, td->name ?: "fio", 0); + if (ret) + put_job(td); + } } while (optind < argc) {