Fixup json bandwidth output

[fio.git] / memory.c

diff --git a/memory.c b/memory.c
index 9b49d3986fc78584743cc4e047cd11cdfdd7e4ac..443d71d4bbda3de4c2771c055c77abdd49442954 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -5,10 +5,12 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <sys/shm.h>
 #include <sys/mman.h>
 
 #include "fio.h"
+#ifndef FIO_NO_HAVE_SHM_H
+#include <sys/shm.h>
+#endif
 
 static void *pinned_mem;
 
@@ -63,16 +65,20 @@ int fio_pin_memory(void)
 
 static int alloc_mem_shm(struct thread_data *td, unsigned int total_mem)
 {
-       int flags = IPC_CREAT | SHM_R | SHM_W;
+       int flags = IPC_CREAT | S_IRUSR | S_IWUSR;
+
+       if (td->o.mem_type == MEM_SHMHUGE) {
+               unsigned long mask = td->o.hugepage_size - 1;
 
-       if (td->o.mem_type == MEM_SHMHUGE)
                flags |= SHM_HUGETLB;
+               total_mem = (total_mem + mask) & ~mask;
+       }
 
        td->shm_id = shmget(IPC_PRIVATE, total_mem, flags);
        dprint(FD_MEM, "shmget %u, %d\n", total_mem, td->shm_id);
        if (td->shm_id < 0) {
                td_verror(td, errno, "shmget");
-               if (geteuid() != 0 && errno == ENOMEM)
+               if (geteuid() != 0 && (errno == ENOMEM || errno == EPERM))
                        log_err("fio: you may need to run this job as root\n");
                if (td->o.mem_type == MEM_SHMHUGE) {
                        if (errno == EINVAL) {
@@ -111,12 +117,21 @@ static void free_mem_shm(struct thread_data *td)
        shmctl(td->shm_id, IPC_RMID, &sbuf);
 }
 
-static int alloc_mem_mmap(struct thread_data *td, unsigned int total_mem)
+static int alloc_mem_mmap(struct thread_data *td, size_t total_mem)
 {
-       int flags = MAP_PRIVATE;
+       int flags = 0;
 
        td->mmapfd = 1;
 
+       if (td->o.mem_type == MEM_MMAPHUGE) {
+               unsigned long mask = td->o.hugepage_size - 1;
+
+               /* TODO: make sure the file is a real hugetlbfs file */
+               if (!td->mmapfile)
+                       flags |= MAP_HUGETLB;
+               total_mem = (total_mem + mask) & ~mask;
+       }
+
        if (td->mmapfile) {
                td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644);
 
@@ -125,18 +140,23 @@ static int alloc_mem_mmap(struct thread_data *td, unsigned int total_mem)
                        td->orig_buffer = NULL;
                        return 1;
                }
-               if (ftruncate(td->mmapfd, total_mem) < 0) {
+               if (td->o.mem_type != MEM_MMAPHUGE &&
+                   ftruncate(td->mmapfd, total_mem) < 0) {
                        td_verror(td, errno, "truncate mmap file");
                        td->orig_buffer = NULL;
                        return 1;
                }
+               if (td->o.mem_type == MEM_MMAPHUGE)
+                       flags |= MAP_SHARED;
+               else
+                       flags |= MAP_PRIVATE;
        } else
-               flags |= OS_MAP_ANON;
+               flags |= OS_MAP_ANON | MAP_PRIVATE;
 
        td->orig_buffer = mmap(NULL, total_mem, PROT_READ | PROT_WRITE, flags,
                                td->mmapfd, 0);
-       dprint(FD_MEM, "mmap %u/%d %p\n", total_mem, td->mmapfd,
-                                               td->orig_buffer);
+       dprint(FD_MEM, "mmap %llu/%d %p\n", (unsigned long long) total_mem,
+                                               td->mmapfd, td->orig_buffer);
        if (td->orig_buffer == MAP_FAILED) {
                td_verror(td, errno, "mmap");
                td->orig_buffer = NULL;
@@ -151,9 +171,10 @@ static int alloc_mem_mmap(struct thread_data *td, unsigned int total_mem)
        return 0;
 }
 
-static void free_mem_mmap(struct thread_data *td, unsigned int total_mem)
+static void free_mem_mmap(struct thread_data *td, size_t total_mem)
 {
-       dprint(FD_MEM, "munmap %u %p\n", total_mem, td->orig_buffer);
+       dprint(FD_MEM, "munmap %llu %p\n", (unsigned long long) total_mem,
+                                               td->orig_buffer);
        munmap(td->orig_buffer, td->orig_buffer_size);
        if (td->mmapfile) {
                close(td->mmapfd);
@@ -162,10 +183,11 @@ static void free_mem_mmap(struct thread_data *td, unsigned int total_mem)
        }
 }
 
-static int alloc_mem_malloc(struct thread_data *td, unsigned int total_mem)
+static int alloc_mem_malloc(struct thread_data *td, size_t total_mem)
 {
        td->orig_buffer = malloc(total_mem);
-       dprint(FD_MEM, "malloc %u %p\n", total_mem, td->orig_buffer);
+       dprint(FD_MEM, "malloc %llu %p\n", (unsigned long long) total_mem,
+                                                       td->orig_buffer);
 
        return td->orig_buffer == NULL;
 }
@@ -177,11 +199,11 @@ static void free_mem_malloc(struct thread_data *td)
 }
 
 /*
- * Setup the buffer area we need for io.
+ * Set up the buffer area we need for io.
  */
 int allocate_io_mem(struct thread_data *td)
 {
-       unsigned int total_mem;
+       size_t total_mem;
        int ret = 0;
 
        if (td->io_ops->flags & FIO_NOIO)
@@ -189,12 +211,15 @@ int allocate_io_mem(struct thread_data *td)
 
        total_mem = td->orig_buffer_size;
 
-       if (td->o.odirect || td->o.mem_align) {
+       if (td->o.odirect || td->o.mem_align ||
+           (td->io_ops->flags & FIO_MEMALIGN)) {
                total_mem += page_mask;
                if (td->o.mem_align && td->o.mem_align > page_size)
                        total_mem += td->o.mem_align - page_size;
        }
 
+       dprint(FD_MEM, "Alloc %llu for buffers\n", (unsigned long long) total_mem);
+
        if (td->o.mem_type == MEM_MALLOC)
                ret = alloc_mem_malloc(td, total_mem);
        else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE)