picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Drop unused first argument from arena_get2

Browse source 
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.

ChangeLog:

	* malloc/arena.c (arena_get2): Drop unused argument.
	(arena_lock): Adjust.
	(arena_get_retry): Likewise.
This commit is contained in:
Siddhesh Poyarekar 2015-08-24 14:32:07 +05:30
parent be481652f2
commit 92a9b22d70
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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):

8
malloc/arena.c
View file

@ -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;