X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=1c62c5ad10af97a2ed1c610323ceccfddde89646;hp=9fc8ff740fd85013f57e94c217addc4b6a28214b;hb=e132cbae2cf26736af86fede134c14d41dae4a5a;hpb=48946b4c03a31750c76175046a9d590686d80023 diff --git a/init.c b/init.c index 9fc8ff74..1c62c5ad 100644 --- a/init.c +++ b/init.c @@ -82,13 +82,31 @@ static struct fio_option options[] = { .help = "IO direction", .def = "read", .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 }, + { .ival = "read", + .oval = TD_DDIR_READ, + .help = "Sequential read", }, + { .ival = "write", + .oval = TD_DDIR_WRITE, + .help = "Sequential write", + }, + { .ival = "randread", + .oval = TD_DDIR_RANDREAD, + .help = "Random read", + }, + { .ival = "randwrite", + .oval = TD_DDIR_RANDWRITE, + .help = "Random write", + }, + { .ival = "rw", + .oval = TD_DDIR_RW, + .help = "Sequential read and write mix", + }, + { .ival = "randrw", + .oval = TD_DDIR_RANDRW, + .help = "Random read and write mix" + }, + }, }, { .name = "ioengine", @@ -97,27 +115,50 @@ static struct fio_option options[] = { .help = "IO engine to use", .def = "sync", .posval = { - { .ival = "sync", }, + { .ival = "sync", + .help = "Use read/write", + }, #ifdef FIO_HAVE_LIBAIO - { .ival = "libaio", }, + { .ival = "libaio", + .help = "Linux native asynchronous IO", + }, #endif #ifdef FIO_HAVE_POSIXAIO - { .ival = "posixaio", }, + { .ival = "posixaio", + .help = "POSIX asynchronous IO", + }, #endif - { .ival = "mmap", }, + { .ival = "mmap", + .help = "Memory mapped IO", + }, #ifdef FIO_HAVE_SPLICE - { .ival = "splice", }, + { .ival = "splice", + .help = "splice/vmsplice based IO", + }, #endif #ifdef FIO_HAVE_SGIO - { .ival = "sg", }, + { .ival = "sg", + .help = "SCSI generic v3 IO", + }, #endif - { .ival = "null", }, { .ival = "net", }, + { .ival = "null", + .help = "Testing engine (no data transfer)", + }, + { .ival = "net", + .help = "Network IO", + }, #ifdef FIO_HAVE_SYSLET - { .ival = "syslet-rw", }, + { .ival = "syslet-rw", + .help = "syslet enabled async pread/pwrite IO", + }, #endif - { .ival = "cpuio", }, - { .ival = "external", }, + { .ival = "cpuio", + .help = "CPU cycler burner engine", + }, + { .ival = "external", + .help = "Load external engine (append name)", }, + }, }, { .name = "iodepth", @@ -208,9 +249,15 @@ static struct fio_option options[] = { .help = "How to select which file to service next", .def = "roundrobin", .posval = { - { .ival = "random", .oval = FIO_FSERVICE_RANDOM }, - { .ival = "roundrobin", .oval = FIO_FSERVICE_RR }, + { .ival = "random", + .oval = FIO_FSERVICE_RANDOM, + .help = "Choose a file at random", }, + { .ival = "roundrobin", + .oval = FIO_FSERVICE_RR, + .help = "Round robin select files", + }, + }, }, { .name = "fsync", @@ -278,28 +325,52 @@ static struct fio_option options[] = { .help = "Backing type for IO buffers", .def = "malloc", .posval = { - { .ival = "malloc", .oval = MEM_MALLOC }, - { .ival = "shm", .oval = MEM_SHM }, + { .ival = "malloc", + .oval = MEM_MALLOC, + .help = "Use malloc(3) for IO buffers", + }, + { .ival = "shm", + .oval = MEM_SHM, + .help = "Use shared memory segments for IO buffers", + }, #ifdef FIO_HAVE_HUGETLB - { .ival = "shmhuge", .oval = MEM_SHMHUGE }, + { .ival = "shmhuge", + .oval = MEM_SHMHUGE, + .help = "Like shm, but use huge pages", + }, #endif - { .ival = "mmap", .oval = MEM_MMAP }, + { .ival = "mmap", + .oval = MEM_MMAP, + .help = "Use mmap(2) (file or anon) for IO buffers", + }, #ifdef FIO_HAVE_HUGETLB - { .ival = "mmaphuge", .oval = MEM_MMAPHUGE }, -#endif + { .ival = "mmaphuge", + .oval = MEM_MMAPHUGE, + .help = "Like mmap, but use huge pages", }, +#endif + }, }, { .name = "verify", .type = FIO_OPT_STR, .off1 = td_var_offset(verify), - .help = "Verify sum function", + .help = "Verify data written", .def = "0", .posval = { - { .ival = "0", .oval = VERIFY_NONE }, - { .ival = "crc32", .oval = VERIFY_CRC32 }, - { .ival = "md5", .oval = VERIFY_MD5 }, + { .ival = "0", + .oval = VERIFY_NONE, + .help = "Don't do IO verification", + }, + { .ival = "crc32", + .oval = VERIFY_CRC32, + .help = "Use crc32 checksums for verification", + }, + { .ival = "md5", + .oval = VERIFY_MD5, + .help = "Use md5 checksums for verification", }, + }, }, { .name = "write_iolog", @@ -809,6 +880,19 @@ static const char *get_engine_name(const char *str) return p; } +static int exists_and_not_file(const char *filename) +{ + struct stat sb; + + if (lstat(filename, &sb) == -1) + return 0; + + if (S_ISREG(sb.st_mode)) + return 0; + + return 1; +} + /* * Adds a job to the list of things todo. Sanitizes the various options * to make sure we don't have conflicts, and initializes various @@ -822,7 +906,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) struct fio_file *f; const char *engine; char fname[PATH_MAX]; - int numjobs; + int numjobs, file_alloced; /* * the def_thread is just for options, it's not a real job @@ -845,14 +929,15 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (td->odirect) td->io_ops->flags |= FIO_RAWIO; + file_alloced = 0; if (!td->filename && !td->files_index) { - td->filename = strdup(jobname); + file_alloced = 1; - if (td->nr_files == 1) - add_file(td, td->filename); + if (td->nr_files == 1 && exists_and_not_file(jobname)) + add_file(td, jobname); else { for (i = 0; i < td->nr_files; i++) { - sprintf(fname, "%s.%d.%d", td->filename, td->thread_number, i); + sprintf(fname, "%s.%d.%d", jobname, td->thread_number, i); add_file(td, fname); } } @@ -930,6 +1015,13 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) td_new->numjobs = 1; td_new->stonewall = 0; + + if (file_alloced) { + td_new->filename = NULL; + td_new->files_index = 0; + td_new->files = NULL; + } + job_add_num = numjobs - 1; if (add_job(td_new, jobname, job_add_num))