#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 td_var_offset(var) ((size_t) &((struct thread_data *)0)->var)
.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.9";
+static char fio_version_string[] = "fio 1.10";
static char **ini_file;
static int max_jobs = MAX_JOBS;
}
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;
}
/*
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
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, "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)) {
return 0;
}
- log_err("fio: mem type: malloc, shm, mmap, shmhuge\n");
+ log_err("fio: mem type: malloc, shm, shmhuge, mmap, mmaphuge\n");
return 1;
}
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;
#ifdef FIO_HAVE_DISK_UTIL
def_thread.do_disk_util = 1;
#endif
break;
}
default:
- printf("optarg <<%s>>\n", argv[optind]);
break;
}
}