static int add_job(struct thread_data *td, const char *jobname, int prioclass,
int prio)
{
- char *ddir_str[] = { "read", "write", "randread", "randwrite" };
+ char *ddir_str[] = { "read", "write", "randread", "randwrite",
+ "rw", NULL, "randrw" };
struct stat sb;
int numjobs, ddir;
if (td->filetype == FIO_TYPE_FILE) {
if (td->directory[0] != '\0')
- sprintf(td->file_name, "%s/%s.%d", td->directory, jobname, td->thread_number);
+ sprintf(td->file_name, "%s/%s.%d", td->directory, jobname, td->jobnum);
else
- sprintf(td->file_name, "%s.%d", jobname, td->thread_number);
+ sprintf(td->file_name, "%s.%d", jobname, td->jobnum);
} else
strcpy(td->file_name, jobname);
td->min_bs = td->bs;
if (td->max_bs == -1U)
td->max_bs = td->bs;
- if (td_read(td))
+ if (td_read(td) && !td_rw(td))
td->verify = 0;
if (td->stonewall && td->thread_number > 1)
if (write_bw_log)
setup_log(&td->bw_log);
- ddir = td->ddir + (!td->sequential << 1);
+ ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
printf("Client%d (g=%d): rw=%s, prio=%d/%d, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->thread_number, td->groupid, ddir_str[ddir], prioclass, prio, td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
/*
td_new->numjobs = 1;
td_new->stonewall = 0;
+ td_new->jobnum = numjobs;
if (add_job(td_new, jobname, prioclass, prio))
goto err;
td->ddir = DDIR_WRITE;
td->sequential = 0;
return 0;
+ } else if (!strncmp(mem, "rw", 2)) {
+ td->ddir = 0;
+ td->iomix = 1;
+ td->sequential = 1;
+ return 0;
+ } else if (!strncmp(mem, "randrw", 6)) {
+ td->ddir = 0;
+ td->iomix = 1;
+ td->sequential = 0;
+ return 0;
}
fprintf(stderr, "bad data direction: %s\n", mem);
* fill globals
*/
def_thread.ddir = DDIR_READ;
+ def_thread.iomix = 0;
def_thread.bs = DEF_BS;
def_thread.min_bs = -1;
def_thread.max_bs = -1;
return 0;
}
+static void usage(char *name)
+{
+ printf("%s\n", fio_version_string);
+ printf("\t-s IO is sequential\n");
+ printf("\t-b Block size in KiB for each IO\n");
+ printf("\t-t Runtime in seconds\n");
+ printf("\t-R Exit all threads on failure to meet rate goal\n");
+ printf("\t-o Use O_DIRECT\n");
+ printf("\t-l Generate per-job latency logs\n");
+ printf("\t-w Generate per-job bandwidth logs\n");
+ printf("\t-f Job file (Required)\n");
+ printf("\t-v Print version info and exit\n");
+}
+
static void parse_cmd_line(int argc, char *argv[])
{
int c;
- while ((c = getopt(argc, argv, "s:b:t:r:R:o:f:lwv")) != EOF) {
+ while ((c = getopt(argc, argv, "s:b:t:r:R:o:f:lwvh")) != EOF) {
switch (c) {
case 's':
def_thread.sequential = !!atoi(optarg);
case 'w':
write_bw_log = 1;
break;
+ case 'h':
+ usage(argv[0]);
+ exit(0);
case 'v':
printf("%s\n", fio_version_string);
exit(0);
if (!ini_file) {
printf("Need job file\n");
+ usage(argv[0]);
return 1;
}