shm: have os remove shared memory if fio dies unexpectedly

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index 14e4013de83cac82d09a1eafe013c18797b08970..bc038f4febac88d68167f30e09d212942bbce582 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -15,12 +15,11 @@
 #include "../verify.h"
 
 /*
- * Limits us to 1GB of mapped files in total
+ * Limits us to 1GiB of mapped files in total
  */
 #define MMAP_TOTAL_SZ  (1 * 1024 * 1024 * 1024UL)
 
 static unsigned long mmap_map_size;
-static unsigned long mmap_map_mask;
 
 struct fio_mmap_data {
        void *mmap_ptr;
@@ -68,11 +67,10 @@ static int fio_mmap_file(struct thread_data *td, struct fio_file *f,
        }
 
 #ifdef FIO_MADV_FREE
-       if (f->filetype == FIO_TYPE_BD)
+       if (f->filetype == FIO_TYPE_BLOCK)
                (void) posix_madvise(fmd->mmap_ptr, fmd->mmap_sz, FIO_MADV_FREE);
 #endif
 
-
 err:
        if (td->error && fmd->mmap_ptr)
                munmap(fmd->mmap_ptr, length);
@@ -208,26 +206,15 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 static int fio_mmapio_init(struct thread_data *td)
 {
        struct thread_options *o = &td->o;
-       unsigned long shift, mask;
 
-       if ((td->o.rw_min_bs & page_mask) &&
+       if ((o->rw_min_bs & page_mask) &&
            (o->odirect || o->fsync_blocks || o->fdatasync_blocks)) {
                log_err("fio: mmap options dictate a minimum block size of "
                        "%llu bytes\n", (unsigned long long) page_size);
                return 1;
        }
 
-       mmap_map_size = MMAP_TOTAL_SZ / td->o.nr_files;
-       mask = mmap_map_size;
-       shift = 0;
-       do {
-               mask >>= 1;
-               if (!mask)
-                       break;
-               shift++;
-       } while (1);
-
-       mmap_map_mask = 1UL << shift;
+       mmap_map_size = MMAP_TOTAL_SZ / o->nr_files;
        return 0;
 }