X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=memory.c;h=d9cfe9bae2c0b35f24ec3e301ef74d459b4d8407;hp=5f3c4fa56c3d54b7bfe5a797a67776e1027d7cd3;hb=e1161c325f7866bae879e686d1c673ca32ab09ae;hpb=d0bdaf49eb3f4faa941d02274f2bd875a187e7d7

diff --git a/memory.c b/memory.c
index 5f3c4fa5..d9cfe9ba 100644
--- a/memory.c
+++ b/memory.c
@@ -69,14 +69,14 @@ int allocate_io_mem(struct thread_data *td)
 
 		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;
@@ -84,30 +84,29 @@ int allocate_io_mem(struct thread_data *td)
 	} else if (td->mem_type == MEM_MMAP || td->mem_type == MEM_MMAPHUGE) {
 		int flags = MAP_PRIVATE;
 
-		td->hugefd = 0;
+		td->mmapfd = 0;
 
-		if (td->mem_type == MEM_MMAPHUGE) {
-			fprintf(stderr, "file=%s\n", td->hugefile);
-			td->hugefd = open(td->hugefile, O_RDWR|O_CREAT, 0644);
+		if (td->mmapfile) {
+			td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644);
 
-			if (td->hugefd < 0) {
-				td_verror(td, errno);
-				perror("open huge file");
+			if (td->mmapfd < 0) {
+				td_verror(td, errno, "open");
+				perror("open mmap file");
 				td->orig_buffer = NULL;
 				return 1;
 			}
 		} else
 			flags |= OS_MAP_ANON;
 
-		fprintf(stderr, "mmaping %lu\n", (unsigned long) td->orig_buffer_size);
-		td->orig_buffer = mmap(NULL, td->orig_buffer_size, PROT_READ | PROT_WRITE, flags, td->hugefd, 0);
-		fprintf(stderr, "mmaped %p\n", td->orig_buffer);
+		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->hugefd)
-				close(td->hugefd);
+			if (td->mmapfd) {
+				close(td->mmapfd);
+				unlink(td->mmapfile);
+			}
 				
 			return 1;
 		}
@@ -127,10 +126,10 @@ void free_io_mem(struct thread_data *td)
 		shmctl(td->shm_id, IPC_RMID, &sbuf);
 	} else if (td->mem_type == MEM_MMAP || td->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);