}
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
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
+ char *hugefile;
+
+ /*
+ * mmaphuge must be appended with the actual file
+ */
+ hugefile = strstr(mem, ":");
+ if (!hugefile) {
+ log_err("fio: mmaphuge:/path/to/file\n");
+ return 1;
+ }
+
+ hugefile++;
+ strip_blank_front(&hugefile);
+ strip_blank_end(hugefile);
+ td->hugefile = strdup(hugefile);
+ td->mem_type = MEM_MMAPHUGE;
return 0;
+#else
+ log_err("fio: mmaphuge not available\n");
+ return 1;
+#endif
} else if (!strncmp(mem, "mmap", 4)) {
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;
}