[PATCH] Fix hugetlb problems

[fio.git] / init.c

diff --git a/init.c b/init.c
index 346c465a3d9d9a7bb6d5a0311bd6575b8b9a7fd8..7d7c9d63f40b3c5e54d1408accda38c328e24d72 100644 (file)
--- a/init.c
+++ b/init.c
@@ -29,7 +29,7 @@
 #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)
@@ -48,7 +48,7 @@
 #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)
@@ -827,15 +827,23 @@ static int str_mem_cb(void *data, const char *mem)
        if (!strncmp(mem, "malloc", 6)) {
                td->mem_type = MEM_MALLOC;
                return 0;
-       } else if (!strncmp(mem, "shm", 3)) {
-               td->mem_type = MEM_SHM;
-               return 0;
        } 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, mmap, shmhuge\n");
        return 1;
 }