summaryrefslogtreecommitdiff
path: root/memory.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2006-12-21 09:50:00 +0100
committerJens Axboe <jens.axboe@oracle.com>2006-12-21 09:50:00 +0100
commit313cb206ffc6e50c089314d322ebf1c523f37531 (patch)
tree3d71b5c469357278782dc4e00d69da245a59b9be /memory.c
parentc51074e7f095ad74114d7e0981f2e6f514b0f758 (diff)
downloadfio-313cb206ffc6e50c089314d322ebf1c523f37531.tar.gz
fio-313cb206ffc6e50c089314d322ebf1c523f37531.tar.bz2
[PATCH] Allow mem=mmap to also use a file backing
We have the stuff in place for huge page backed memory, so it's little extra code to support io buffers inside mmap file backed memory. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'memory.c')
-rw-r--r--memory.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/memory.c b/memory.c
index 909baf7d..079c0760 100644
--- a/memory.c
+++ b/memory.c
@@ -84,27 +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) {
- 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) {
+ if (td->mmapfd < 0) {
td_verror(td, errno);
- perror("open huge file");
+ 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->hugefd, 0);
+ 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);
perror("mmap");
td->orig_buffer = NULL;
- if (td->hugefd)
- close(td->hugefd);
+ if (td->mmapfd) {
+ close(td->mmapfd);
+ unlink(td->mmapfile);
+ }
return 1;
}
@@ -124,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);