commit 1fe1137576a1b7faf2d9bede121cc6faeceb50ff
author Elliott Hughes <enh@google.com> Tue Apr 02 17:41:14 2013 -0700
committer Elliott Hughes <enh@google.com> Tue Apr 02 17:48:35 2013 -0700
tree 34343cb7437772a9542d01b6b0b04da0b44a1593
parent 309e107f01e13bbe90ba31f2eee5d526ff676222

Stop using unreasonable numbers of map entries.

(cherry-pick of 4ace92c62ada583b220836d76de2cfcb78d4d48d.)

Bug: 8460659
Change-Id: I1a9dc30cbf6a7a2c68cb3d8000921e9178eedb85

libc/bionic/dlmalloc.c

diff --git a/libc/bionic/dlmalloc.c b/libc/bionic/dlmalloc.c
index 87f772b..cf09aac 100644
--- a/libc/bionic/dlmalloc.c
+++ b/libc/bionic/dlmalloc.c
@@ -33,10 +33,6 @@
 #define CORRUPTION_ERROR_ACTION(m) __bionic_heap_corruption_error(__FUNCTION__)
 #define USAGE_ERROR_ACTION(m,p) __bionic_heap_usage_error(__FUNCTION__, p)
 
-// We use ashmem to name the anonymous private regions created by dlmalloc.
-static void* __bionic_named_anonymous_mmap(size_t length);
-#define MMAP(s) __bionic_named_anonymous_mmap(s)
-
 // Ugly inclusion of C file so that bionic specific #defines configure dlmalloc.
 #include "../upstream-dlmalloc/malloc.c"
 
@@ -53,31 +49,3 @@
   // So that we can get a memory dump around the specific address.
   *((int**) 0xdeadbaad) = (int*) address;
 }
-
-static int __ashmem_create_region(const char* name, size_t size) {
-  int fd = open("/dev/ashmem", O_RDWR);
-  if (fd == -1) {
-    return fd;
-  }
-  int rc = ioctl(fd, ASHMEM_SET_NAME, name);
-  if (rc < 0) {
-    close(fd);
-    return rc;
-  }
-  rc = ioctl(fd, ASHMEM_SET_SIZE, size);
-  if (rc < 0) {
-    close(fd);
-    return rc;
-  }
-  return fd;
-}
-
-static void* __bionic_named_anonymous_mmap(size_t length) {
-  int fd = __ashmem_create_region("libc malloc", length);
-  if (fd < 0) {
-    return MAP_FAILED;
-  }
-  void* result = mmap(NULL, length, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
-  close (fd);
-  return result;
-}