Spelling fix. Reported by Debian´s lintian.

[fio.git] / memory.c

diff --git a/memory.c b/memory.c
index 76da8a86269e859889366c283281815e9ffac1dc..af4d5ef8ee371701f02806369a3581ecfdc42628 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -63,6 +63,7 @@ int fio_pin_memory(struct thread_data *td)
 
 static int alloc_mem_shm(struct thread_data *td, unsigned int total_mem)
 {
+#ifndef CONFIG_NO_SHM
        int flags = IPC_CREAT | S_IRUSR | S_IWUSR;
 
        if (td->o.mem_type == MEM_SHMHUGE) {
@@ -88,7 +89,7 @@ static int alloc_mem_shm(struct thread_data *td, unsigned int total_mem)
                                        " support huge pages.\n");
                        } else if (errno == ENOMEM) {
                                log_err("fio: no huge pages available, do you"
-                                       " need to alocate some? See HOWTO.\n");
+                                       " need to allocate some? See HOWTO.\n");
                        }
                }
 
@@ -104,15 +105,21 @@ static int alloc_mem_shm(struct thread_data *td, unsigned int total_mem)
        }
 
        return 0;
+#else
+       log_err("fio: shm not supported\n");
+       return 1;
+#endif
 }
 
 static void free_mem_shm(struct thread_data *td)
 {
+#ifndef CONFIG_NO_SHM
        struct shmid_ds sbuf;
 
        dprint(FD_MEM, "shmdt/ctl %d %p\n", td->shm_id, td->orig_buffer);
        shmdt(td->orig_buffer);
        shmctl(td->shm_id, IPC_RMID, &sbuf);
+#endif
 }
 
 static int alloc_mem_mmap(struct thread_data *td, size_t total_mem)
@@ -139,12 +146,14 @@ static int alloc_mem_mmap(struct thread_data *td, size_t total_mem)
                        return 1;
                }
                if (td->o.mem_type != MEM_MMAPHUGE &&
+                   td->o.mem_type != MEM_MMAPSHARED &&
                    ftruncate(td->mmapfd, total_mem) < 0) {
                        td_verror(td, errno, "truncate mmap file");
                        td->orig_buffer = NULL;
                        return 1;
                }
-               if (td->o.mem_type == MEM_MMAPHUGE)
+               if (td->o.mem_type == MEM_MMAPHUGE ||
+                   td->o.mem_type == MEM_MMAPSHARED)
                        flags |= MAP_SHARED;
                else
                        flags |= MAP_PRIVATE;
@@ -158,7 +167,7 @@ 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 != 1) {
+               if (td->mmapfd != 1 && td->mmapfd != -1) {
                        close(td->mmapfd);
                        if (td->o.mmapfile)
                                unlink(td->o.mmapfile);
@@ -220,11 +229,22 @@ int allocate_io_mem(struct thread_data *td)
 
        dprint(FD_MEM, "Alloc %llu for buffers\n", (unsigned long long) total_mem);
 
-       if (td->o.mem_type == MEM_MALLOC)
+       /*
+        * If the IO engine has hooks to allocate/free memory, use those. But
+        * error out if the user explicitly asked for something else.
+        */
+       if (td->io_ops->iomem_alloc) {
+               if (fio_option_is_set(&td->o, mem_type)) {
+                       log_err("fio: option 'mem/iomem' conflicts with specified IO engine\n");
+                       ret = 1;
+               } else
+                       ret = td->io_ops->iomem_alloc(td, total_mem);
+       } else if (td->o.mem_type == MEM_MALLOC)
                ret = alloc_mem_malloc(td, total_mem);
        else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE)
                ret = alloc_mem_shm(td, total_mem);
-       else if (td->o.mem_type == MEM_MMAP || td->o.mem_type == MEM_MMAPHUGE)
+       else if (td->o.mem_type == MEM_MMAP || td->o.mem_type == MEM_MMAPHUGE ||
+                td->o.mem_type == MEM_MMAPSHARED)
                ret = alloc_mem_mmap(td, total_mem);
        else {
                log_err("fio: bad mem type: %d\n", td->o.mem_type);
@@ -245,11 +265,15 @@ void free_io_mem(struct thread_data *td)
        if (td->o.odirect || td->o.oatomic)
                total_mem += page_mask;
 
-       if (td->o.mem_type == MEM_MALLOC)
+       if (td->io_ops->iomem_alloc) {
+               if (td->io_ops->iomem_free)
+                       td->io_ops->iomem_free(td);
+       } else if (td->o.mem_type == MEM_MALLOC)
                free_mem_malloc(td);
        else if (td->o.mem_type == MEM_SHM || td->o.mem_type == MEM_SHMHUGE)
                free_mem_shm(td);
-       else if (td->o.mem_type == MEM_MMAP || td->o.mem_type == MEM_MMAPHUGE)
+       else if (td->o.mem_type == MEM_MMAP || td->o.mem_type == MEM_MMAPHUGE ||
+                td->o.mem_type == MEM_MMAPSHARED)
                free_mem_mmap(td, total_mem);
        else
                log_err("Bad memory type %u\n", td->o.mem_type);