qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check malloc arana limit atomically

This commit is contained in:
Andreas Schwab 2011-11-09 17:14:39 +01:00
parent 5f078c3286
commit 77cdc054e0
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2011-11-10 Andreas Schwab <schwab@redhat.com>
* malloc/arena.c (_int_new_arena): Don't increment narenas.
(reused_arena): Don't check arena limit.
(arena_get2): Atomically check arena limit.
2011-11-08 Ulrich Drepper <drepper@gmail.com> 2011-11-08 Ulrich Drepper <drepper@gmail.com>
* locale/findlocale.c (_nl_find_locale): Use __strcasecmp_l. * locale/findlocale.c (_nl_find_locale): Use __strcasecmp_l.

65
malloc/arena.c
View File

@ -747,8 +747,6 @@ _int_new_arena(size_t size)
main_arena.next = a; main_arena.next = a;
#ifdef PER_THREAD #ifdef PER_THREAD
++narenas;
(void)mutex_unlock(&list_lock); (void)mutex_unlock(&list_lock);
#endif #endif
@ -786,30 +784,6 @@ get_free_list (void)
static mstate static mstate
reused_arena (void) reused_arena (void)
{ {
if (narenas <= mp_.arena_test)
return NULL;
static int narenas_limit;
if (narenas_limit == 0)
{
if (mp_.arena_max != 0)
narenas_limit = mp_.arena_max;
else
{
int n = __get_nprocs ();
if (n >= 1)
narenas_limit = NARENAS_FROM_NCORES (n);
else
/* We have no information about the system. Assume two
cores. */
narenas_limit = NARENAS_FROM_NCORES (2);
}
}
if (narenas < narenas_limit)
return NULL;
mstate result; mstate result;
static mstate next_to_use; static mstate next_to_use;
if (next_to_use == NULL) if (next_to_use == NULL)
@ -844,10 +818,41 @@ arena_get2(mstate a_tsd, size_t size)
mstate a; mstate a;
#ifdef PER_THREAD #ifdef PER_THREAD
if ((a = get_free_list ()) == NULL static size_t narenas_limit;
&& (a = reused_arena ()) == NULL)
/* Nothing immediately available, so generate a new arena. */ a = get_free_list ();
a = _int_new_arena(size); if (a == NULL)
{
/* Nothing immediately available, so generate a new arena. */
if (narenas_limit == 0)
{
if (mp_.arena_max != 0)
narenas_limit = mp_.arena_max;
else
{
int n = __get_nprocs ();
if (n >= 1)
narenas_limit = NARENAS_FROM_NCORES (n);
else
/* We have no information about the system. Assume two
cores. */
narenas_limit = NARENAS_FROM_NCORES (2);
}
}
repeat:;
size_t n = narenas;
if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
{
if (catomic_compare_and_exchange_bool_acq(&narenas, n + 1, n))
goto repeat;
a = _int_new_arena (size);
if (__builtin_expect (a != NULL, 1))
return a;
catomic_decrement(&narenas);
}
a = reused_arena ();
}
#else #else
if(!a_tsd) if(!a_tsd)
a = a_tsd = &main_arena; a = a_tsd = &main_arena;