Fix --showcmd bug

[fio.git] / memory.c

diff --git a/memory.c b/memory.c
index 909baf7d51f19b15f1553679eeb5c7d5f9535e7a..f67dd6d9ffa09a61030fed8378f8ce9d2a523d15 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -6,7 +6,6 @@
 #include <sys/mman.h>
 
 #include "fio.h"
-#include "os.h"
 
 static void *pinned_mem;
 
@@ -34,7 +33,7 @@ int fio_pin_memory(void)
        if (phys_mem) {
                if ((mlock_size + 128 * 1024 * 1024) > phys_mem) {
                        mlock_size = phys_mem - 128 * 1024 * 1024;
-                       fprintf(f_out, "fio: limiting mlocked memory to %lluMiB\n", mlock_size >> 20);
+                       log_info("fio: limiting mlocked memory to %lluMiB\n", mlock_size >> 20);
                }
        }
 
@@ -54,83 +53,120 @@ int fio_pin_memory(void)
        return 0;
 }
 
-/*
- * Setup the buffer area we need for io.
- */
-int allocate_io_mem(struct thread_data *td)
+static int alloc_mem_shm(struct thread_data *td)
 {
-       if (td->mem_type == MEM_MALLOC)
-               td->orig_buffer = malloc(td->orig_buffer_size);
-       else if (td->mem_type == MEM_SHM || td->mem_type == MEM_SHMHUGE) {
-               int flags = IPC_CREAT | SHM_R | SHM_W;
-
-               if (td->mem_type == MEM_SHMHUGE)
-                       flags |= SHM_HUGETLB;
-
-               td->shm_id = shmget(IPC_PRIVATE, td->orig_buffer_size, flags);
-               if (td->shm_id < 0) {
-                       td_verror(td, errno);
-                       perror("shmget");
-                       return 1;
-               }
+       int flags = IPC_CREAT | SHM_R | SHM_W;
+
+       if (td->o.mem_type == MEM_SHMHUGE)
+               flags |= SHM_HUGETLB;
+
+       td->shm_id = shmget(IPC_PRIVATE, td->orig_buffer_size, flags);
+       if (td->shm_id < 0) {
+               td_verror(td, errno, "shmget");
+               if (geteuid() != 0 && errno == ENOMEM)
+                       log_err("fio: you may need to run this job as root\n");
+               if (errno == EINVAL && td->o.mem_type == MEM_SHMHUGE)
+                       log_err("fio: check that you have free huge pages and that hugepage-size is correct.\n");
+               
+               return 1;
+       }
+
+       td->orig_buffer = shmat(td->shm_id, NULL, 0);
+       if (td->orig_buffer == (void *) -1) {
+               td_verror(td, errno, "shmat");
+               td->orig_buffer = NULL;
+               return 1;
+       }
+
+       return 0;
+}
+
+static int alloc_mem_mmap(struct thread_data *td)
+{
+       int flags = MAP_PRIVATE;
+
+       td->mmapfd = 0;
+
+       if (td->mmapfile) {
+               td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644);
 
-               td->orig_buffer = shmat(td->shm_id, NULL, 0);
-               if (td->orig_buffer == (void *) -1) {
-                       td_verror(td, errno);
-                       perror("shmat");
+               if (td->mmapfd < 0) {
+                       td_verror(td, errno, "open mmap file");
                        td->orig_buffer = NULL;
                        return 1;
                }
-       } else if (td->mem_type == MEM_MMAP || td->mem_type == MEM_MMAPHUGE) {
-               int flags = MAP_PRIVATE;
-
-               td->hugefd = 0;
-
-               if (td->mem_type == MEM_MMAPHUGE) {
-                       td->hugefd = open(td->hugefile, O_RDWR|O_CREAT, 0644);
-
-                       if (td->hugefd < 0) {
-                               td_verror(td, errno);
-                               perror("open huge file");
-                               td->orig_buffer = NULL;
-                               return 1;
-                       }
-               } else
-                       flags |= OS_MAP_ANON;
-
-               td->orig_buffer = mmap(NULL, td->orig_buffer_size, PROT_READ | PROT_WRITE, flags, td->hugefd, 0);
-               if (td->orig_buffer == MAP_FAILED) {
-                       td_verror(td, errno);
-                       perror("mmap");
+               if (ftruncate(td->mmapfd, td->orig_buffer_size) < 0) {
+                       td_verror(td, errno, "truncate mmap file");
                        td->orig_buffer = NULL;
-                       if (td->hugefd)
-                               close(td->hugefd);
-                               
                        return 1;
                }
+       } else
+               flags |= OS_MAP_ANON;
+
+       td->orig_buffer = mmap(NULL, td->orig_buffer_size, PROT_READ | PROT_WRITE, flags, td->mmapfd, 0);
+       if (td->orig_buffer == MAP_FAILED) {
+               td_verror(td, errno, "mmap");
+               td->orig_buffer = NULL;
+               if (td->mmapfd) {
+                       close(td->mmapfd);
+                       unlink(td->mmapfile);
+               }
+                       
+               return 1;
        }
 
        return 0;
 }
 
+static int alloc_mem_malloc(struct thread_data *td)
+{
+       td->orig_buffer = malloc(td->orig_buffer_size);
+       if (td->orig_buffer)
+               return 0;
+
+       return 1;
+}
+
+/*
+ * Setup the buffer area we need for io.
+ */
+int allocate_io_mem(struct thread_data *td)
+{
+       int ret = 0;
+
+       if (td->o.mem_type == MEM_MALLOC)
+               ret = alloc_mem_malloc(td);
+       else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE)
+               ret = alloc_mem_shm(td);
+       else if (td->o.mem_type == MEM_MMAP || td->o.mem_type == MEM_MMAPHUGE)
+               ret = alloc_mem_mmap(td);
+       else {
+               log_err("fio: bad mem type: %d\n", td->o.mem_type);
+               ret = 1;
+       }
+
+       return ret;
+}
+
 void free_io_mem(struct thread_data *td)
 {
-       if (td->mem_type == MEM_MALLOC)
+       if (td->o.mem_type == MEM_MALLOC)
                free(td->orig_buffer);
-       else if (td->mem_type == MEM_SHM || td->mem_type == MEM_SHMHUGE) {
+       else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE) {
                struct shmid_ds sbuf;
 
                shmdt(td->orig_buffer);
                shmctl(td->shm_id, IPC_RMID, &sbuf);
-       } else if (td->mem_type == MEM_MMAP || td->mem_type == MEM_MMAPHUGE) {
+       } else if (td->o.mem_type == MEM_MMAP ||
+                  td->o.mem_type == MEM_MMAPHUGE) {
                munmap(td->orig_buffer, td->orig_buffer_size);
-               if (td->mem_type == MEM_MMAPHUGE) {
-                       close(td->hugefd);
-                       unlink(td->hugefile);
-                       free(td->hugefile);
+               if (td->mmapfile) {
+                       close(td->mmapfd);
+                       unlink(td->mmapfile);
+                       free(td->mmapfile);
                }
        } else
-               log_err("Bad memory type %u\n", td->mem_type);
+               log_err("Bad memory type %u\n", td->o.mem_type);
 
        td->orig_buffer = NULL;
 }