This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED] Drop unused first argument from arena_get2
- From: "Siddhesh Poyarekar" <siddhesh at redhat dot com>
- To: libc-alpha at sourceware dot org
- Date: Mon, 24 Aug 2015 14:37:16 +0530
- Subject: [COMMITTED] Drop unused first argument from arena_get2
- Authentication-results: sourceware.org; auth=none
The arena pointer in the first argument to arena_get2 was used in the
old days before per-thread arenas. They're unused now and hence can
be dropped.
Committed since the generated code remains identical as verified by using
objdump and ignoring differences in labels such as __malloc_info.part.9 to
__malloc_info.part.8.
ChangeLog:
* malloc/arena.c (arena_get2): Drop unused argument.
(arena_lock): Adjust.
(arena_get_retry): Likewise.
---
ChangeLog | 6 ++++++
malloc/arena.c | 8 +++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2797de4..1b5b03e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-24 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * malloc/arena.c (arena_get2): Drop unused argument.
+ (arena_lock): Adjust.
+ (arena_get_retry): Likewise.
+
2015-08-24 Andreas Schwab <schwab@suse.de>
* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_IPC64):
diff --git a/malloc/arena.c b/malloc/arena.c
index 21ecc5a1..cfec94d 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -102,7 +102,7 @@ int __malloc_initialized = -1;
if (ptr && !arena_is_corrupt (ptr)) \
(void) mutex_lock (&ptr->mutex); \
else \
- ptr = arena_get2 (ptr, (size), NULL); \
+ ptr = arena_get2 ((size), NULL); \
} while (0)
/* find the heap and corresponding arena for a given ptr */
@@ -849,7 +849,7 @@ out:
static mstate
internal_function
-arena_get2 (mstate a_tsd, size_t size, mstate avoid_arena)
+arena_get2 (size_t size, mstate avoid_arena)
{
mstate a;
@@ -914,10 +914,8 @@ arena_get_retry (mstate ar_ptr, size_t bytes)
}
else
{
- /* Grab ar_ptr->next prior to releasing its lock. */
- mstate prev = ar_ptr->next ? ar_ptr : 0;
(void) mutex_unlock (&ar_ptr->mutex);
- ar_ptr = arena_get2 (prev, bytes, ar_ptr);
+ ar_ptr = arena_get2 (bytes, ar_ptr);
}
return ar_ptr;
--
2.4.3