#define DEF_IO_ENGINE_NAME "sync"
#define DEF_SEQUENTIAL (1)
#define DEF_RAND_REPEAT (1)
-#define DEF_OVERWRITE (1)
+#define DEF_OVERWRITE (0)
#define DEF_INVALIDATE (1)
#define DEF_SYNCIO (0)
#define DEF_RANDSEED (0xb1899bedUL)
#define DEF_RWMIX_READ (50)
#define DEF_NICE (0)
#define DEF_NR_FILES (1)
-#define DEF_UNLINK (0)
+#define DEF_UNLINK (1)
#define DEF_WRITE_BW_LOG (0)
#define DEF_WRITE_LAT_LOG (0)
#define DEF_NO_RAND_MAP (0)
+#define DEF_HUGEPAGE_SIZE FIO_HUGE_PAGE
+#define DEF_THINKTIME_BLOCKS (1)
#define td_var_offset(var) ((size_t) &((struct thread_data *)0)->var)
{
.name = "thinktime",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(thinktime)
+ .off1 = td_var_offset(thinktime),
+ },
+ {
+ .name = "thinktime_blocks",
+ .type = FIO_OPT_INT,
+ .off1 = td_var_offset(thinktime_blocks),
},
{
.name = "rate",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(rate)
+ .off1 = td_var_offset(rate),
},
{
.name = "ratemin",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(ratemin)
+ .off1 = td_var_offset(ratemin),
},
{
.name = "ratecycle",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(ratecycle)
+ .off1 = td_var_offset(ratecycle),
},
{
.name = "startdelay",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(start_delay)
+ .off1 = td_var_offset(start_delay),
},
{
.name = "timeout",
.type = FIO_OPT_STR_VAL_TIME,
- .off1 = td_var_offset(timeout)
+ .off1 = td_var_offset(timeout),
},
{
.name = "invalidate",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(invalidate_cache)
+ .off1 = td_var_offset(invalidate_cache),
},
{
.name = "sync",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(sync_io)
+ .off1 = td_var_offset(sync_io),
},
{
.name = "bwavgtime",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(bw_avg_time)
+ .off1 = td_var_offset(bw_avg_time),
},
{
.name = "create_serialize",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(create_serialize)
+ .off1 = td_var_offset(create_serialize),
},
{
.name = "create_fsync",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(create_fsync)
+ .off1 = td_var_offset(create_fsync),
},
{
.name = "loops",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(loops)
+ .off1 = td_var_offset(loops),
},
{
.name = "numjobs",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(numjobs)
+ .off1 = td_var_offset(numjobs),
},
{
.name = "cpuload",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(cpuload)
+ .off1 = td_var_offset(cpuload),
},
{
.name = "cpuchunks",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(cpucycle)
+ .off1 = td_var_offset(cpucycle),
},
{
.name = "direct",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(odirect)
+ .off1 = td_var_offset(odirect),
},
{
.name = "overwrite",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(overwrite)
+ .off1 = td_var_offset(overwrite),
},
#ifdef FIO_HAVE_CPU_AFFINITY
{
{
.name = "end_fsync",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(end_fsync)
+ .off1 = td_var_offset(end_fsync),
},
{
.name = "unlink",
- .type = FIO_OPT_STR_SET,
+ .type = FIO_OPT_INT,
.off1 = td_var_offset(unlink),
},
{
.type = FIO_OPT_STR_SET,
.off1 = td_var_offset(bs_unaligned),
},
+ {
+ .name = "hugepage-size",
+ .type = FIO_OPT_STR_VAL,
+ .off1 = td_var_offset(hugepage_size),
+ },
{
.name = NULL,
},
static int def_timeout = DEF_TIMEOUT;
-static char fio_version_string[] = "fio 1.8";
+static char fio_version_string[] = "fio 1.10";
static char **ini_file;
static int max_jobs = MAX_JOBS;
struct thread_data def_thread;
struct thread_data *threads = NULL;
-int rate_quit = 0;
int exitall_on_terminate = 0;
int terse_output = 0;
unsigned long long mlock_size = 0;
}
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;
}
/*
static char *to_kmg(unsigned int val)
{
char *buf = malloc(32);
- char post[] = { 0, 'K', 'M', 'G', 'P', -1 };
+ char post[] = { 0, 'K', 'M', 'G', 'P', 0 };
char *p = post;
- while (*p != -1) {
+ do {
if (val & 1023)
break;
val >>= 10;
p++;
- }
+ } while (*p);
snprintf(buf, 31, "%u%c", val, *p);
return buf;
*/
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
{
- char *ddir_str[] = { "read", "write", "randread", "randwrite",
- "rw", NULL, "randrw" };
+ const char *ddir_str[] = { "read", "write", "randread", "randwrite",
+ "rw", NULL, "randrw" };
struct stat sb;
int numjobs, ddir, i;
struct fio_file *f;
if (td->odirect)
td->io_ops->flags |= FIO_RAWIO;
- fixup_options(td);
-
td->filetype = FIO_TYPE_FILE;
if (!stat(jobname, &sb)) {
if (S_ISBLK(sb.st_mode))
td->filetype = FIO_TYPE_CHAR;
}
+ fixup_options(td);
+
if (td->filename)
td->nr_uniq_files = 1;
else
if (td->filetype == FIO_TYPE_FILE || td->filename) {
char tmp[PATH_MAX];
int len = 0;
- int i;
if (td->directory && td->directory[0] != '\0')
- sprintf(tmp, "%s/", td->directory);
+ len = sprintf(tmp, "%s/", td->directory);
td->files = malloc(sizeof(struct fio_file) * td->nr_files);
else
sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i);
f->file_name = strdup(tmp);
+ fprintf(stderr, "%s\n", f->file_name);
}
} else {
td->nr_files = 1;
c3 = to_kmg(td->min_bs[DDIR_WRITE]);
c4 = to_kmg(td->max_bs[DDIR_WRITE]);
- fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%s-%s/%s-%s, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, c1, c2, c3, c4, td->rate, td->io_ops->name, td->iodepth);
+ fprintf(f_out, "%s: (g=%d): rw=%s, odir=%u, bs=%s-%s/%s-%s, rate=%u, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[ddir], td->odirect, c1, c2, c3, c4, td->rate, td->io_ops->name, td->iodepth);
free(c1);
free(c2);
td->sequential = 0;
return 0;
} else if (!strncmp(mem, "rw", 2)) {
- td->ddir = 0;
+ td->ddir = DDIR_READ;
td->iomix = 1;
td->sequential = 1;
return 0;
} else if (!strncmp(mem, "randrw", 6)) {
- td->ddir = 0;
+ td->ddir = DDIR_READ;
td->iomix = 1;
td->sequential = 0;
return 0;
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)
+{
+ char *p = strstr(str, ":");
+
+ if (!p)
+ return NULL;
+
+ p++;
+ strip_blank_front(&p);
+ strip_blank_end(p);
+ return strdup(p);
+}
+
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, "shm", 3)) {
- td->mem_type = MEM_SHM;
+ } 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) {
+ 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, mmap\n");
+ log_err("fio: mem type: malloc, shm, shmhuge, mmap, mmaphuge\n");
return 1;
}
if (td->io_ops)
return 0;
- log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice, cpu\n");
+ 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;
}
/*
* This is our [ini] type file parser.
*/
-int parse_jobs_ini(char *file, int stonewall_flag)
+static int parse_jobs_ini(char *file, int stonewall_flag)
{
unsigned int global;
struct thread_data *td;
def_thread.write_bw_log = write_bw_log;
def_thread.write_lat_log = write_lat_log;
def_thread.norandommap = DEF_NO_RAND_MAP;
+ def_thread.hugepage_size = DEF_HUGEPAGE_SIZE;
+ def_thread.thinktime_blocks = DEF_THINKTIME_BLOCKS;
#ifdef FIO_HAVE_DISK_UTIL
def_thread.do_disk_util = 1;
#endif
break;
}
default:
- printf("optarg <<%s>>\n", argv[optind]);
break;
}
}
projects / fio.git / blobdiff