Imported Upstream version 1.9.0+dfsg1

[rustc.git] / src / jemalloc / src / chunk_mmap.c

diff --git a/src/jemalloc/src/chunk_mmap.c b/src/jemalloc/src/chunk_mmap.c
index 7e02c10223ea93b4cb4a0a9cb07e2883e944a931..56b2ee422ab88f289d67339fed97ac21edf1a9a5 100644 (file)
--- a/src/jemalloc/src/chunk_mmap.c
+++ b/src/jemalloc/src/chunk_mmap.c
@@ -1,158 +1,21 @@
 #define        JEMALLOC_CHUNK_MMAP_C_
 #include "jemalloc/internal/jemalloc_internal.h"
 
-/******************************************************************************/
-/* Function prototypes for non-inline static functions. */
-
-static void    *pages_map(void *addr, size_t size);
-static void    pages_unmap(void *addr, size_t size);
-static void    *chunk_alloc_mmap_slow(size_t size, size_t alignment,
-    bool *zero);
-
 /******************************************************************************/
 
 static void *
-pages_map(void *addr, size_t size)
+chunk_alloc_mmap_slow(size_t size, size_t alignment, bool *zero, bool *commit)
 {
        void *ret;
-
-       assert(size != 0);
-
-#ifdef _WIN32
-       /*
-        * If VirtualAlloc can't allocate at the given address when one is
-        * given, it fails and returns NULL.
-        */
-       ret = VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE,
-           PAGE_READWRITE);
-#else
-       /*
-        * We don't use MAP_FIXED here, because it can cause the *replacement*
-        * of existing mappings, and we only want to create new mappings.
-        */
-       ret = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON,
-           -1, 0);
-       assert(ret != NULL);
-
-       if (ret == MAP_FAILED)
-               ret = NULL;
-       else if (addr != NULL && ret != addr) {
-               /*
-                * We succeeded in mapping memory, but not in the right place.
-                */
-               if (munmap(ret, size) == -1) {
-                       char buf[BUFERROR_BUF];
-
-                       buferror(get_errno(), buf, sizeof(buf));
-                       malloc_printf("<jemalloc: Error in munmap(): %s\n",
-                           buf);
-                       if (opt_abort)
-                               abort();
-               }
-               ret = NULL;
-       }
-#endif
-       assert(ret == NULL || (addr == NULL && ret != addr)
-           || (addr != NULL && ret == addr));
-       return (ret);
-}
-
-static void
-pages_unmap(void *addr, size_t size)
-{
-
-#ifdef _WIN32
-       if (VirtualFree(addr, 0, MEM_RELEASE) == 0)
-#else
-       if (munmap(addr, size) == -1)
-#endif
-       {
-               char buf[BUFERROR_BUF];
-
-               buferror(get_errno(), buf, sizeof(buf));
-               malloc_printf("<jemalloc>: Error in "
-#ifdef _WIN32
-                             "VirtualFree"
-#else
-                             "munmap"
-#endif
-                             "(): %s\n", buf);
-               if (opt_abort)
-                       abort();
-       }
-}
-
-static void *
-pages_trim(void *addr, size_t alloc_size, size_t leadsize, size_t size)
-{
-       void *ret = (void *)((uintptr_t)addr + leadsize);
-
-       assert(alloc_size >= leadsize + size);
-#ifdef _WIN32
-       {
-               void *new_addr;
-
-               pages_unmap(addr, alloc_size);
-               new_addr = pages_map(ret, size);
-               if (new_addr == ret)
-                       return (ret);
-               if (new_addr)
-                       pages_unmap(new_addr, size);
-               return (NULL);
-       }
-#else
-       {
-               size_t trailsize = alloc_size - leadsize - size;
-
-               if (leadsize != 0)
-                       pages_unmap(addr, leadsize);
-               if (trailsize != 0)
-                       pages_unmap((void *)((uintptr_t)ret + size), trailsize);
-               return (ret);
-       }
-#endif
-}
-
-bool
-pages_purge(void *addr, size_t length)
-{
-       bool unzeroed;
-
-#ifdef _WIN32
-       VirtualAlloc(addr, length, MEM_RESET, PAGE_READWRITE);
-       unzeroed = true;
-#elif defined(JEMALLOC_HAVE_MADVISE)
-#  ifdef JEMALLOC_PURGE_MADVISE_DONTNEED
-#    define JEMALLOC_MADV_PURGE MADV_DONTNEED
-#    define JEMALLOC_MADV_ZEROS true
-#  elif defined(JEMALLOC_PURGE_MADVISE_FREE)
-#    define JEMALLOC_MADV_PURGE MADV_FREE
-#    define JEMALLOC_MADV_ZEROS false
-#  else
-#    error "No madvise(2) flag defined for purging unused dirty pages."
-#  endif
-       int err = madvise(addr, length, JEMALLOC_MADV_PURGE);
-       unzeroed = (!JEMALLOC_MADV_ZEROS || err != 0);
-#  undef JEMALLOC_MADV_PURGE
-#  undef JEMALLOC_MADV_ZEROS
-#else
-       /* Last resort no-op. */
-       unzeroed = true;
-#endif
-       return (unzeroed);
-}
-
-static void *
-chunk_alloc_mmap_slow(size_t size, size_t alignment, bool *zero)
-{
-       void *ret, *pages;
-       size_t alloc_size, leadsize;
+       size_t alloc_size;
 
        alloc_size = size + alignment - PAGE;
        /* Beware size_t wrap-around. */
        if (alloc_size < size)
                return (NULL);
        do {
+               void *pages;
+               size_t leadsize;
                pages = pages_map(NULL, alloc_size);
                if (pages == NULL)
                        return (NULL);
@@ -163,11 +26,14 @@ chunk_alloc_mmap_slow(size_t size, size_t alignment, bool *zero)
 
        assert(ret != NULL);
        *zero = true;
+       if (!*commit)
+               *commit = pages_decommit(ret, size);
        return (ret);
 }
 
 void *
-chunk_alloc_mmap(size_t size, size_t alignment, bool *zero)
+chunk_alloc_mmap(void *new_addr, size_t size, size_t alignment, bool *zero,
+    bool *commit)
 {
        void *ret;
        size_t offset;
@@ -188,17 +54,20 @@ chunk_alloc_mmap(size_t size, size_t alignment, bool *zero)
        assert(alignment != 0);
        assert((alignment & chunksize_mask) == 0);
 
-       ret = pages_map(NULL, size);
-       if (ret == NULL)
-               return (NULL);
+       ret = pages_map(new_addr, size);
+       if (ret == NULL || ret == new_addr)
+               return (ret);
+       assert(new_addr == NULL);
        offset = ALIGNMENT_ADDR2OFFSET(ret, alignment);
        if (offset != 0) {
                pages_unmap(ret, size);
-               return (chunk_alloc_mmap_slow(size, alignment, zero));
+               return (chunk_alloc_mmap_slow(size, alignment, zero, commit));
        }
 
        assert(ret != NULL);
        *zero = true;
+       if (!*commit)
+               *commit = pages_decommit(ret, size);
        return (ret);
 }