X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=memory.c;h=f81c2dd44aabaf937dd5db3b88c10a0cd6a992ca;hp=ee5f895d2b0b0f88e6bd50a2a2a50149c45591fd;hb=cbe000462519f8d8bfeb119029177a5a3788296a;hpb=4b91ee8fd12c72bd76ce9f5ff9116626b48566a0

diff --git a/memory.c b/memory.c
index ee5f895d..f81c2dd4 100644
--- a/memory.c
+++ b/memory.c
@@ -5,58 +5,56 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#ifndef FIO_NO_HAVE_SHM_H
-#include <sys/shm.h>
-#endif
 #include <sys/mman.h>
 
 #include "fio.h"
+#ifndef FIO_NO_HAVE_SHM_H
+#include <sys/shm.h>
+#endif
 
-static void *pinned_mem;
-
-void fio_unpin_memory(void)
+void fio_unpin_memory(struct thread_data *td)
 {
-	if (pinned_mem) {
-		dprint(FD_MEM, "unpinning %llu bytes\n", mlock_size);
-		if (munlock(pinned_mem, mlock_size) < 0)
+	if (td->pinned_mem) {
+		dprint(FD_MEM, "unpinning %llu bytes\n", td->o.lockmem);
+		if (munlock(td->pinned_mem, td->o.lockmem) < 0)
 			perror("munlock");
-		munmap(pinned_mem, mlock_size);
-		pinned_mem = NULL;
+		munmap(td->pinned_mem, td->o.lockmem);
+		td->pinned_mem = NULL;
 	}
 }
 
-int fio_pin_memory(void)
+int fio_pin_memory(struct thread_data *td)
 {
 	unsigned long long phys_mem;
 
-	if (!mlock_size)
+	if (!td->o.lockmem)
 		return 0;
 
-	dprint(FD_MEM, "pinning %llu bytes\n", mlock_size);
+	dprint(FD_MEM, "pinning %llu bytes\n", td->o.lockmem);
 
 	/*
 	 * Don't allow mlock of more than real_mem-128MB
 	 */
 	phys_mem = os_phys_mem();
 	if (phys_mem) {
-		if ((mlock_size + 128 * 1024 * 1024) > phys_mem) {
-			mlock_size = phys_mem - 128 * 1024 * 1024;
+		if ((td->o.lockmem + 128 * 1024 * 1024) > phys_mem) {
+			td->o.lockmem = phys_mem - 128 * 1024 * 1024;
 			log_info("fio: limiting mlocked memory to %lluMB\n",
-							mlock_size >> 20);
+							td->o.lockmem >> 20);
 		}
 	}
 
-	pinned_mem = mmap(NULL, mlock_size, PROT_READ | PROT_WRITE,
+	td->pinned_mem = mmap(NULL, td->o.lockmem, PROT_READ | PROT_WRITE,
 				MAP_PRIVATE | OS_MAP_ANON, -1, 0);
-	if (pinned_mem == MAP_FAILED) {
+	if (td->pinned_mem == MAP_FAILED) {
 		perror("malloc locked mem");
-		pinned_mem = NULL;
+		td->pinned_mem = NULL;
 		return 1;
 	}
-	if (mlock(pinned_mem, mlock_size) < 0) {
+	if (mlock(td->pinned_mem, td->o.lockmem) < 0) {
 		perror("mlock");
-		munmap(pinned_mem, mlock_size);
-		pinned_mem = NULL;
+		munmap(td->pinned_mem, td->o.lockmem);
+		td->pinned_mem = NULL;
 		return 1;
 	}
 
@@ -121,19 +119,19 @@ static int alloc_mem_mmap(struct thread_data *td, size_t total_mem)
 {
 	int flags = 0;
 
-	td->mmapfd = 1;
+	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)
+		if (!td->o.mmapfile)
 			flags |= MAP_HUGETLB;
 		total_mem = (total_mem + mask) & ~mask;
 	}
 
-	if (td->mmapfile) {
-		td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644);
+	if (td->o.mmapfile) {
+		td->mmapfd = open(td->o.mmapfile, O_RDWR|O_CREAT, 0644);
 
 		if (td->mmapfd < 0) {
 			td_verror(td, errno, "open mmap file");
@@ -160,9 +158,10 @@ static int alloc_mem_mmap(struct thread_data *td, size_t total_mem)
 	if (td->orig_buffer == MAP_FAILED) {
 		td_verror(td, errno, "mmap");
 		td->orig_buffer = NULL;
-		if (td->mmapfd) {
+		if (td->mmapfd != 1 && td->mmapfd != -1) {
 			close(td->mmapfd);
-			unlink(td->mmapfile);
+			if (td->o.mmapfile)
+				unlink(td->o.mmapfile);
 		}
 
 		return 1;
@@ -176,10 +175,11 @@ static void free_mem_mmap(struct thread_data *td, size_t total_mem)
 	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);
-		unlink(td->mmapfile);
-		free(td->mmapfile);
+	if (td->o.mmapfile) {
+		if (td->mmapfd != -1)
+			close(td->mmapfd);
+		unlink(td->o.mmapfile);
+		free(td->o.mmapfile);
 	}
 }
 
@@ -211,7 +211,7 @@ 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->o.oatomic ||
 	    (td->io_ops->flags & FIO_MEMALIGN)) {
 		total_mem += page_mask;
 		if (td->o.mem_align && td->o.mem_align > page_size)
@@ -242,7 +242,7 @@ void free_io_mem(struct thread_data *td)
 	unsigned int total_mem;
 
 	total_mem = td->orig_buffer_size;
-	if (td->o.odirect)
+	if (td->o.odirect || td->o.oatomic)
 		total_mem += page_mask;
 
 	if (td->o.mem_type == MEM_MALLOC)