One step closer to group reporting

[fio.git] / memory.c

diff --git a/memory.c b/memory.c
index 39dc250c52ba052800eeea1ed9815282b427a006..d9cfe9bae2c0b35f24ec3e301ef74d459b4d8407 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -61,27 +61,53 @@ int allocate_io_mem(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->shm_id = shmget(IPC_PRIVATE, td->orig_buffer_size, IPC_CREAT | 0600);
+       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);
+                       td_verror(td, errno, "shmget");
                        perror("shmget");
                        return 1;
                }
 
                td->orig_buffer = shmat(td->shm_id, NULL, 0);
                if (td->orig_buffer == (void *) -1) {
-                       td_verror(td, errno);
+                       td_verror(td, errno, "shmat");
                        perror("shmat");
                        td->orig_buffer = NULL;
                        return 1;
                }
-       } else if (td->mem_type == MEM_MMAP) {
-               td->orig_buffer = mmap(NULL, td->orig_buffer_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | OS_MAP_ANON, 0, 0);
+       } else if (td->mem_type == MEM_MMAP || td->mem_type == MEM_MMAPHUGE) {
+               int flags = MAP_PRIVATE;
+
+               td->mmapfd = 0;
+
+               if (td->mmapfile) {
+                       td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644);
+
+                       if (td->mmapfd < 0) {
+                               td_verror(td, errno, "open");
+                               perror("open mmap 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->mmapfd, 0);
                if (td->orig_buffer == MAP_FAILED) {
-                       td_verror(td, errno);
+                       td_verror(td, errno, "mmap");
                        perror("mmap");
                        td->orig_buffer = NULL;
+                       if (td->mmapfd) {
+                               close(td->mmapfd);
+                               unlink(td->mmapfile);
+                       }
+                               
                        return 1;
                }
        }
@@ -93,14 +119,19 @@ void free_io_mem(struct thread_data *td)
 {
        if (td->mem_type == MEM_MALLOC)
                free(td->orig_buffer);
-       else if (td->mem_type == MEM_SHM) {
+       else if (td->mem_type == MEM_SHM || td->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)
+       } else if (td->mem_type == MEM_MMAP || td->mem_type == MEM_MMAPHUGE) {
                munmap(td->orig_buffer, td->orig_buffer_size);
-       else
+               if (td->mmapfile) {
+                       close(td->mmapfd);
+                       unlink(td->mmapfile);
+                       free(td->mmapfile);
+               }
+       } else
                log_err("Bad memory type %u\n", td->mem_type);
 
        td->orig_buffer = NULL;