lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

Correctly implement M_MXFAST.

Browse Source 
* malloc/malloc.c (struct malloc_state): Replace max_fast with flags
	fields.
	(global_max_fast): New variable.
	(set_max_fast): Change to not require arena parameter and to modify
	global_max_fast.  Change all callers.
	(get_max_fast): New macro.  Use this instead of directly accessing
	now removed max_fast arena member.
	(have_fastchunks): Use flags instead of max_fast.
	(clear_fastchunks): Likewise.
	(set_fastchunks): Likewise.
	(contiguous): Likewise.
	(noncontiguous): Likewise.
	(set_noncontiguous): Likewise.
	(set_contiguous): Likewise.
	(malloc_init_state): Explicitly set FASTCHUNKS_BIT.  Call set_max_fast
	only for main arena.
	* malloc/hooks.c (public_sET_STATe): Adjust set_max_fast use.
This commit is contained in:
Ulrich Drepper
2005-10-12 20:18:07 +00:00
parent 30047d19ee
commit 9bf248c6c6
3 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@@ -1,3 +1,24 @@
2005-10-12 Ulrich Drepper <drepper@redhat.com>
Correctly implement M_MXFAST.
* malloc/malloc.c (struct malloc_state): Replace max_fast with flags
fields.
(global_max_fast): New variable.
(set_max_fast): Change to not require arena parameter and to modify
global_max_fast. Change all callers.
(get_max_fast): New macro. Use this instead of directly accessing
now removed max_fast arena member.
(have_fastchunks): Use flags instead of max_fast.
(clear_fastchunks): Likewise.
(set_fastchunks): Likewise.
(contiguous): Likewise.
(noncontiguous): Likewise.
(set_noncontiguous): Likewise.
(set_contiguous): Likewise.
(malloc_init_state): Explicitly set FASTCHUNKS_BIT. Call set_max_fast
only for main arena.
* malloc/hooks.c (public_sET_STATe): Adjust set_max_fast use.
2005-10-10 Daniel Jacobowitz <dan@codesourcery.com> 2005-10-10 Daniel Jacobowitz <dan@codesourcery.com>
* sysdeps/generic/bits/byteswap.h (__bswap_constant_16): New macro. * sysdeps/generic/bits/byteswap.h (__bswap_constant_16): New macro.

2
malloc/hooks.c
View File

@@ -584,7 +584,7 @@ public_sET_STATe(Void_t* msptr)
(void)mutex_lock(&main_arena.mutex); (void)mutex_lock(&main_arena.mutex);
/* There are no fastchunks. */ /* There are no fastchunks. */
clear_fastchunks(&main_arena); clear_fastchunks(&main_arena);
set_max_fast(&main_arena, DEFAULT_MXFAST); set_max_fast(DEFAULT_MXFAST);
for (i=0; i<NFASTBINS; ++i) for (i=0; i<NFASTBINS; ++i)
main_arena.fastbins[i] = 0; main_arena.fastbins[i] = 0;
for (i=0; i<BINMAPSIZE; ++i) for (i=0; i<BINMAPSIZE; ++i)

51
malloc/malloc.c
View File

@@ -2157,9 +2157,9 @@ typedef struct malloc_chunk* mfastbinptr;
#define FASTCHUNKS_BIT (1U) #define FASTCHUNKS_BIT (1U)
#define have_fastchunks(M) (((M)->max_fast & FASTCHUNKS_BIT) == 0) #define have_fastchunks(M) (((M)->flags & FASTCHUNKS_BIT) == 0)
#define clear_fastchunks(M) ((M)->max_fast |= FASTCHUNKS_BIT) #define clear_fastchunks(M) ((M)->flags |= FASTCHUNKS_BIT)
#define set_fastchunks(M) ((M)->max_fast &= ~FASTCHUNKS_BIT) #define set_fastchunks(M) ((M)->flags &= ~FASTCHUNKS_BIT)
/* /*
NONCONTIGUOUS_BIT indicates that MORECORE does not return contiguous NONCONTIGUOUS_BIT indicates that MORECORE does not return contiguous
@@ -2172,10 +2172,10 @@ typedef struct malloc_chunk* mfastbinptr;
#define NONCONTIGUOUS_BIT (2U) #define NONCONTIGUOUS_BIT (2U)
#define contiguous(M) (((M)->max_fast & NONCONTIGUOUS_BIT) == 0) #define contiguous(M) (((M)->flags & NONCONTIGUOUS_BIT) == 0)
#define noncontiguous(M) (((M)->max_fast & NONCONTIGUOUS_BIT) != 0) #define noncontiguous(M) (((M)->flags & NONCONTIGUOUS_BIT) != 0)
#define set_noncontiguous(M) ((M)->max_fast |= NONCONTIGUOUS_BIT) #define set_noncontiguous(M) ((M)->flags |= NONCONTIGUOUS_BIT)
#define set_contiguous(M) ((M)->max_fast &= ~NONCONTIGUOUS_BIT) #define set_contiguous(M) ((M)->flags &= ~NONCONTIGUOUS_BIT)
/* /*
Set value of max_fast. Set value of max_fast.
@@ -2184,10 +2184,9 @@ typedef struct malloc_chunk* mfastbinptr;
Setting the value clears fastchunk bit but preserves noncontiguous bit. Setting the value clears fastchunk bit but preserves noncontiguous bit.
*/ */
#define set_max_fast(M, s) \ #define set_max_fast(s) \
(M)->max_fast = (((s) == 0)? SMALLBIN_WIDTH: request2size(s)) | \ global_max_fast = ((s) == 0)? SMALLBIN_WIDTH: request2size(s)
FASTCHUNKS_BIT | \ #define get_max_fast() global_max_fast
((M)->max_fast & NONCONTIGUOUS_BIT)
/* /*
@@ -2197,16 +2196,15 @@ typedef struct malloc_chunk* mfastbinptr;
struct malloc_state { struct malloc_state {
/* Serialize access. */ /* Serialize access. */
mutex_t mutex; mutex_t mutex;
// Should we have padding to move the mutex to its own cache line?
/* Flags (formerly in max_fast). */
int flags;
#if THREAD_STATS #if THREAD_STATS
/* Statistics for locking. Only used if THREAD_STATS is defined. */ /* Statistics for locking. Only used if THREAD_STATS is defined. */
long stat_lock_direct, stat_lock_loop, stat_lock_wait; long stat_lock_direct, stat_lock_loop, stat_lock_wait;
#endif #endif
/* The maximum chunk size to be eligible for fastbin */
INTERNAL_SIZE_T max_fast; /* low 2 bits used as flags */
/* Fastbins */ /* Fastbins */
mfastbinptr fastbins[NFASTBINS]; mfastbinptr fastbins[NFASTBINS];
@@ -2267,6 +2265,10 @@ static struct malloc_state main_arena;
static struct malloc_par mp_; static struct malloc_par mp_;
/* Maximum size of memory handled in fastbins. */
static INTERNAL_SIZE_T global_max_fast;
/* /*
Initialize a malloc_state struct. Initialize a malloc_state struct.
@@ -2296,8 +2298,9 @@ static void malloc_init_state(av) mstate av;
if (av != &main_arena) if (av != &main_arena)
#endif #endif
set_noncontiguous(av); set_noncontiguous(av);
if (av == &main_arena)
set_max_fast(av, DEFAULT_MXFAST); set_max_fast(DEFAULT_MXFAST);
av->flags |= FASTCHUNKS_BIT;
av->top = initial_top(av); av->top = initial_top(av);
} }
@@ -2639,9 +2642,9 @@ static void do_check_malloc_state(mstate av)
/* properties of fastbins */ /* properties of fastbins */
/* max_fast is in allowed range */ /* max_fast is in allowed range */
assert((av->max_fast & ~1) <= request2size(MAX_FAST_SIZE)); assert((get_max_fast () & ~1) <= request2size(MAX_FAST_SIZE));
max_fast_bin = fastbin_index(av->max_fast); max_fast_bin = fastbin_index(get_max_fast ());
for (i = 0; i < NFASTBINS; ++i) { for (i = 0; i < NFASTBINS; ++i) {
p = av->fastbins[i]; p = av->fastbins[i];
@@ -3871,7 +3874,7 @@ _int_malloc(mstate av, size_t bytes)
can try it without checking, which saves some time on this fast path. can try it without checking, which saves some time on this fast path.
*/ */
if ((unsigned long)(nb) <= (unsigned long)(av->max_fast)) { if ((unsigned long)(nb) <= (unsigned long)(get_max_fast ())) {
long int idx = fastbin_index(nb); long int idx = fastbin_index(nb);
fb = &(av->fastbins[idx]); fb = &(av->fastbins[idx]);
if ( (victim = *fb) != 0) { if ( (victim = *fb) != 0) {
@@ -4283,7 +4286,7 @@ _int_free(mstate av, Void_t* mem)
and used quickly in malloc. and used quickly in malloc.
*/ */
if ((unsigned long)(size) <= (unsigned long)(av->max_fast) if ((unsigned long)(size) <= (unsigned long)(get_max_fast ())
#if TRIM_FASTBINS #if TRIM_FASTBINS
/* /*
@@ -4499,7 +4502,7 @@ static void malloc_consolidate(av) mstate av;
yet been initialized, in which case do so below yet been initialized, in which case do so below
*/ */
if (av->max_fast != 0) { if (get_max_fast () != 0) {
clear_fastchunks(av); clear_fastchunks(av);
unsorted_bin = unsorted_chunks(av); unsorted_bin = unsorted_chunks(av);
@@ -4512,7 +4515,7 @@ static void malloc_consolidate(av) mstate av;
reused anyway. reused anyway.
*/ */
maxfb = &(av->fastbins[fastbin_index(av->max_fast)]); maxfb = &(av->fastbins[fastbin_index(get_max_fast ())]);
fb = &(av->fastbins[0]); fb = &(av->fastbins[0]);
do { do {
if ( (p = *fb) != 0) { if ( (p = *fb) != 0) {
@@ -5376,7 +5379,7 @@ int mALLOPt(param_number, value) int param_number; int value;
switch(param_number) { switch(param_number) {
case M_MXFAST: case M_MXFAST:
if (value >= 0 && value <= MAX_FAST_SIZE) { if (value >= 0 && value <= MAX_FAST_SIZE) {
set_max_fast(av, value); set_max_fast(value);
} }
else else
res = 0; res = 0;