X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=f1c0ea788ddf0db28fce608ea05ec3962c92237a;hp=bdf358204197b7ad1ed40bf6c2a749c2403c229c;hb=6525896154b56e1a62b8faa0e2759af6a34465e8;hpb=4b3b73f843c283b341ad16cd1eb4e7a12978de8e diff --git a/options.c b/options.c index bdf35820..f1c0ea78 100644 --- a/options.c +++ b/options.c @@ -329,7 +329,7 @@ static int str_cpumask_cb(void *data, unsigned long long *val) return 1; } - max_cpu = sysconf(_SC_NPROCESSORS_ONLN); + max_cpu = cpus_online(); for (i = 0; i < sizeof(int) * 8; i++) { if ((1 << i) & *val) { @@ -366,7 +366,7 @@ static int set_cpus_allowed(struct thread_data *td, os_cpu_mask_t *mask, strip_blank_front(&str); strip_blank_end(str); - max_cpu = sysconf(_SC_NPROCESSORS_ONLN); + max_cpu = cpus_online(); while ((cpu = strsep(&str, ",")) != NULL) { char *str2, *cpu2; @@ -482,6 +482,7 @@ static int str_sfr_cb(void *data, const char *str) static int check_dir(struct thread_data *td, char *fname) { +#if 0 char file[PATH_MAX], *dir; int elen = 0; @@ -494,7 +495,6 @@ static int check_dir(struct thread_data *td, char *fname) sprintf(file + elen, "%s", fname); dir = dirname(file); -#if 0 { struct stat sb; /* @@ -675,6 +675,11 @@ static int str_verify_pattern_cb(void *data, const char *input) } } td->o.verify_pattern_bytes = i; + /* + * VERIFY_META could already be set + */ + if (td->o.verify == VERIFY_NONE) + td->o.verify = VERIFY_PATTERN; return 0; } @@ -913,7 +918,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(ioengine), .help = "IO engine to use", - .def = "sync", + .def = FIO_PREFERRED_ENGINE, .posval = { { .ival = "sync", .help = "Use read/write", @@ -922,7 +927,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Use pread/pwrite", }, { .ival = "vsync", - .help = "Use readv/writev", + .help = "Use readv/writev", }, #ifdef FIO_HAVE_LIBAIO { .ival = "libaio", @@ -938,9 +943,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { { .ival = "solarisaio", .help = "Solaris native asynchronous IO", }, +#endif +#ifdef FIO_HAVE_WINDOWSAIO + { .ival = "windowsaio", + .help = "Windows native asynchronous IO" + }, #endif { .ival = "mmap", - .help = "Memory mapped IO", + .help = "Memory mapped IO" }, #ifdef FIO_HAVE_SPLICE { .ival = "splice", @@ -967,7 +977,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { }, #endif { .ival = "cpuio", - .help = "CPU cycler burner engine", + .help = "CPU cycle burner engine", }, #ifdef FIO_HAVE_GUASI { .ival = "guasi", @@ -988,7 +998,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .name = "iodepth", .type = FIO_OPT_INT, .off1 = td_var_offset(iodepth), - .help = "Amount of IO buffers to keep in flight", + .help = "Number of IO buffers to keep in flight", .minval = 1, .def = "1", }, @@ -1027,6 +1037,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { }, { .name = "fill_device", + .alias = "fill_fs", .type = FIO_OPT_BOOL, .off1 = td_var_offset(fill_device), .help = "Write until an ENOSPC error occurs", @@ -1104,6 +1115,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { .def = "1", .parent = "rw", }, + { + .name = "use_os_rand", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(use_os_rand), + .help = "Set to use OS random generator", + .def = "0", + .parent = "rw", + }, { .name = "norandommap", .type = FIO_OPT_STR_SET, @@ -1121,6 +1140,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { }, { .name = "nrfiles", + .alias = "nr_files", .type = FIO_OPT_INT, .off1 = td_var_offset(nr_files), .help = "Split job workload between this number of files", @@ -1158,12 +1178,37 @@ static struct fio_option options[FIO_MAX_OPTS] = { #ifdef FIO_HAVE_FALLOCATE { .name = "fallocate", - .type = FIO_OPT_BOOL, - .off1 = td_var_offset(fallocate), - .help = "Use fallocate() when laying out files", - .def = "1", - }, + .type = FIO_OPT_STR, + .off1 = td_var_offset(fallocate_mode), + .help = "Whether pre-allocation is performed when laying out files", + .def = "posix", + .posval = { + { .ival = "none", + .oval = FIO_FALLOCATE_NONE, + .help = "Do not pre-allocate space", + }, + { .ival = "posix", + .oval = FIO_FALLOCATE_POSIX, + .help = "Use posix_fallocate()", + }, +#ifdef FIO_HAVE_LINUX_FALLOCATE + { .ival = "keep", + .oval = FIO_FALLOCATE_KEEP_SIZE, + .help = "Use fallocate(..., FALLOC_FL_KEEP_SIZE, ...)", + }, #endif + /* Compatibility with former boolean values */ + { .ival = "0", + .oval = FIO_FALLOCATE_NONE, + .help = "Alias for 'none'", + }, + { .ival = "1", + .oval = FIO_FALLOCATE_POSIX, + .help = "Alias for 'posix'", + }, + }, + }, +#endif /* FIO_HAVE_FALLOCATE */ { .name = "fadvise_hint", .type = FIO_OPT_BOOL, @@ -1185,6 +1230,13 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Issue fdatasync for writes every given number of blocks", .def = "0", }, + { + .name = "write_barrier", + .type = FIO_OPT_INT, + .off1 = td_var_offset(barrier_blocks), + .help = "Make every Nth write a barrier write", + .def = "0", + }, #ifdef FIO_HAVE_SYNC_FILE_RANGE { .name = "sync_file_range", @@ -1453,6 +1505,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Exit on a single verify failure, don't continue", .parent = "verify", }, + { + .name = "verify_dump", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(verify_dump), + .def = "1", + .help = "Dump contents of good and bad blocks on failure", + .parent = "verify", + }, { .name = "verify_async", .type = FIO_OPT_INT, @@ -1682,7 +1742,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .type = FIO_OPT_INT, .off1 = td_var_offset(rate_iops_min[0]), .off2 = td_var_offset(rate_iops_min[1]), - .help = "Job must meet this rate or it will be shutdown", + .help = "Job must meet this rate or it will be shut down", .parent = "rate_iops", }, { @@ -1727,7 +1787,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .name = "create_fsync", .type = FIO_OPT_BOOL, .off1 = td_var_offset(create_fsync), - .help = "Fsync file after creation", + .help = "fsync file after creation", .def = "1", }, { @@ -1741,7 +1801,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .name = "pre_read", .type = FIO_OPT_BOOL, .off1 = td_var_offset(pre_read), - .help = "Preread files before starting official testing", + .help = "Pre-read files before starting official testing", .def = "0", }, { @@ -1892,7 +1952,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .name = "disable_slat", .type = FIO_OPT_BOOL, .off1 = td_var_offset(disable_slat), - .help = "Disable submissionn latency numbers", + .help = "Disable submission latency numbers", .parent = "gtod_reduce", .def = "0", }, @@ -1908,14 +1968,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { .name = "gtod_cpu", .type = FIO_OPT_INT, .cb = str_gtod_cpu_cb, - .help = "Setup dedicated gettimeofday() thread on this CPU", + .help = "Set up dedicated gettimeofday() thread on this CPU", .verify = gtod_cpu_verify, }, { .name = "continue_on_error", .type = FIO_OPT_BOOL, .off1 = td_var_offset(continue_on_error), - .help = "Continue on non-fatal errors during I/O", + .help = "Continue on non-fatal errors during IO", .def = "0", }, { @@ -2035,7 +2095,7 @@ void fio_keywords_init(void) sprintf(buf, "%llu", mb_memory); fio_keywords[1].replace = strdup(buf); - l = sysconf(_SC_NPROCESSORS_ONLN); + l = cpus_online(); sprintf(buf, "%lu", l); fio_keywords[2].replace = strdup(buf); }