Add option priorities

[fio.git] / memory.c

diff --git a/memory.c b/memory.c
index 46eb852a63ed69d59d71972d777009eddbe11a19..899a9e50914dba216075557e59829bafeee46891 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -1,6 +1,9 @@
 /*
  * Memory helpers
  */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <sys/shm.h>
 #include <sys/mman.h>
@@ -12,6 +15,7 @@ static void *pinned_mem;
 void fio_unpin_memory(void)
 {
        if (pinned_mem) {
+               dprint(FD_MEM, "unpinning %llu bytes\n", mlock_size);
                if (munlock(pinned_mem, mlock_size) < 0)
                        perror("munlock");
                munmap(pinned_mem, mlock_size);
@@ -26,6 +30,8 @@ int fio_pin_memory(void)
        if (!mlock_size)
                return 0;
 
+       dprint(FD_MEM, "pinning %llu bytes\n", mlock_size);
+
        /*
         * Don't allow mlock of more than real_mem-128MB
         */
@@ -33,11 +39,13 @@ int fio_pin_memory(void)
        if (phys_mem) {
                if ((mlock_size + 128 * 1024 * 1024) > phys_mem) {
                        mlock_size = phys_mem - 128 * 1024 * 1024;
-                       log_info("fio: limiting mlocked memory to %lluMiB\n", mlock_size >> 20);
+                       log_info("fio: limiting mlocked memory to %lluMiB\n",
+                                                       mlock_size >> 20);
                }
        }
 
-       pinned_mem = mmap(NULL, mlock_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | OS_MAP_ANON, 0, 0);
+       pinned_mem = mmap(NULL, mlock_size, PROT_READ | PROT_WRITE,
+                               MAP_PRIVATE | OS_MAP_ANON, -1, 0);
        if (pinned_mem == MAP_FAILED) {
                perror("malloc locked mem");
                pinned_mem = NULL;
@@ -61,23 +69,30 @@ static int alloc_mem_shm(struct thread_data *td)
                flags |= SHM_HUGETLB;
 
        td->shm_id = shmget(IPC_PRIVATE, td->orig_buffer_size, flags);
+       dprint(FD_MEM, "shmget %zu, %d\n", td->orig_buffer_size, td->shm_id);
        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 (td->o.mem_type == MEM_SHMHUGE) {
-                       if (errno == EINVAL)
-                               log_err("fio: check that you have free huge pages and that hugepage-size is correct.\n");
-                       else if (errno == ENOSYS)
-                               log_err("fio: your system does not appear to support huge pages.\n");
-                       else if (errno == ENOMEM)
-                               log_err("fio: no huge pages available, do you need to alocate some? See HOWTO.\n");
+                       if (errno == EINVAL) {
+                               log_err("fio: check that you have free huge"
+                                       " pages and that hugepage-size is"
+                                       " correct.\n");
+                       } else if (errno == ENOSYS) {
+                               log_err("fio: your system does not appear to"
+                                       " support huge pages.\n");
+                       } else if (errno == ENOMEM) {
+                               log_err("fio: no huge pages available, do you"
+                                       " need to alocate some? See HOWTO.\n");
+                       }
                }
-               
+
                return 1;
        }
 
        td->orig_buffer = shmat(td->shm_id, NULL, 0);
+       dprint(FD_MEM, "shmat %d, %p\n", td->shm_id, td->orig_buffer);
        if (td->orig_buffer == (void *) -1) {
                td_verror(td, errno, "shmat");
                td->orig_buffer = NULL;
@@ -91,7 +106,7 @@ static int alloc_mem_mmap(struct thread_data *td)
 {
        int flags = MAP_PRIVATE;
 
-       td->mmapfd = 0;
+       td->mmapfd = 1;
 
        if (td->mmapfile) {
                td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644);
@@ -109,7 +124,10 @@ static int alloc_mem_mmap(struct thread_data *td)
        } else
                flags |= OS_MAP_ANON;
 
-       td->orig_buffer = mmap(NULL, td->orig_buffer_size, PROT_READ | PROT_WRITE, flags, td->mmapfd, 0);
+       td->orig_buffer = mmap(NULL, td->orig_buffer_size,
+                               PROT_READ | PROT_WRITE, flags, td->mmapfd, 0);
+       dprint(FD_MEM, "mmap %zu/%d %p\n", td->orig_buffer_size, td->mmapfd,
+                                                       td->orig_buffer);
        if (td->orig_buffer == MAP_FAILED) {
                td_verror(td, errno, "mmap");
                td->orig_buffer = NULL;
@@ -117,7 +135,7 @@ static int alloc_mem_mmap(struct thread_data *td)
                        close(td->mmapfd);
                        unlink(td->mmapfile);
                }
-                       
+
                return 1;
        }
 
@@ -126,7 +144,13 @@ static int alloc_mem_mmap(struct thread_data *td)
 
 static int alloc_mem_malloc(struct thread_data *td)
 {
-       td->orig_buffer = malloc(td->orig_buffer_size);
+       unsigned int bsize = td->orig_buffer_size;
+
+       if (td->o.odirect)
+               bsize += page_mask;
+
+       td->orig_buffer = malloc(bsize);
+       dprint(FD_MEM, "malloc %u %p\n", bsize, td->orig_buffer);
        if (td->orig_buffer)
                return 0;
 
@@ -140,6 +164,9 @@ int allocate_io_mem(struct thread_data *td)
 {
        int ret = 0;
 
+       if (td->io_ops->flags & FIO_NOIO)
+               return 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)
@@ -159,15 +186,20 @@ int allocate_io_mem(struct thread_data *td)
 
 void free_io_mem(struct thread_data *td)
 {
-       if (td->o.mem_type == MEM_MALLOC)
+       if (td->o.mem_type == MEM_MALLOC) {
+               dprint(FD_MEM, "free mem %p\n", td->orig_buffer);
                free(td->orig_buffer);
-       else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE) {
+       } else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE) {
                struct shmid_ds sbuf;
 
+               dprint(FD_MEM, "shmdt/ctl %d %p\n", td->shm_id,
+                                                       td->orig_buffer);
                shmdt(td->orig_buffer);
                shmctl(td->shm_id, IPC_RMID, &sbuf);
        } else if (td->o.mem_type == MEM_MMAP ||
                   td->o.mem_type == MEM_MMAPHUGE) {
+               dprint(FD_MEM, "munmap %zu %p\n", td->orig_buffer_size,
+                                                       td->orig_buffer);
                munmap(td->orig_buffer, td->orig_buffer_size);
                if (td->mmapfile) {
                        close(td->mmapfd);