malloc: Remove arena_mem variable

The computed value is never used.  The accesses were data races.

diff --git a/ChangeLog b/ChangeLog
index fef67b4e62cb37dd38a50b739186316ace459b18..52bf5c70c08f01b2300845172987b9c816521384 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-19  Florian Weimer  <fweimer@redhat.com>
+
+       * malloc/malloc.c (sysmalloc): Do not update arena_max.
+       * malloc/arena.c (arena_max): Remove.
+       (heap_trim, _int_new_arena): Do not update arena_max.
+
 2016-02-19  Florian Weimer  <fweimer@redhat.com>
 
        * resolv/res_init.c (res_ninit): Update comment.

diff --git a/malloc/arena.c b/malloc/arena.c
index 1edb4d4d35041b552975178c374e728ce7429ef7..54cf0865ea4d0fea152d0abb9b1a4fd93b8e26f9 100644 (file)
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -91,9 +91,6 @@ static mstate free_list;
    acquired.  */
 static mutex_t list_lock = _LIBC_LOCK_INITIALIZER;
 
-/* Mapped memory in non-main arenas (reliable only for NO_THREADS). */
-static unsigned long arena_mem;
-
 /* Already initialized? */
 int __malloc_initialized = -1;
 
@@ -705,7 +702,6 @@ heap_trim (heap_info *heap, size_t pad)
       if (new_size + (HEAP_MAX_SIZE - prev_heap->size) < pad + MINSIZE + pagesz)
         break;
       ar_ptr->system_mem -= heap->size;
-      arena_mem -= heap->size;
       LIBC_PROBE (memory_heap_free, 2, heap, heap->size);
       delete_heap (heap);
       heap = prev_heap;
@@ -743,7 +739,6 @@ heap_trim (heap_info *heap, size_t pad)
     return 0;
 
   ar_ptr->system_mem -= extra;
-  arena_mem -= extra;
 
   /* Success. Adjust top accordingly. */
   set_head (top_chunk, (top_size - extra) | PREV_INUSE);
@@ -793,7 +788,6 @@ _int_new_arena (size_t size)
   a->attached_threads = 1;
   /*a->next = NULL;*/
   a->system_mem = a->max_system_mem = h->size;
-  arena_mem += h->size;
 
   /* Set up the top chunk, with proper alignment. */
   ptr = (char *) (a + 1);

diff --git a/malloc/malloc.c b/malloc/malloc.c
index d20d5955db4d814b73a5b1829d1bc7874c94024d..86e2a03452058ac2d2cd44333be6720d6d54a42a 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2410,7 +2410,6 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
           && grow_heap (old_heap, MINSIZE + nb - old_size) == 0)
         {
           av->system_mem += old_heap->size - old_heap_size;
-          arena_mem += old_heap->size - old_heap_size;
           set_head (old_top, (((char *) old_heap + old_heap->size) - (char *) old_top)
                     | PREV_INUSE);
         }
@@ -2420,7 +2419,6 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
           heap->ar_ptr = av;
           heap->prev = old_heap;
           av->system_mem += heap->size;
-          arena_mem += heap->size;
           /* Set up the new top.  */
           top (av) = chunk_at_offset (heap, sizeof (*heap));
           set_head (top (av), (heap->size - sizeof (*heap)) | PREV_INUSE);