[COMMITTED] malloc: Consistently apply trim_threshold to all heaps.

Carlos O'Donell carlos@redhat.com
Wed Oct 28 06:00:00 GMT 2015


On 10/08/2015 04:00 AM, Andreas Schwab wrote:
> "Carlos O'Donell" <carlos@redhat.com> writes:
> 
>> diff --git a/malloc/arena.c b/malloc/arena.c
>> index b44e307..cb45a04 100644
>> --- a/malloc/arena.c
>> +++ b/malloc/arena.c
>> @@ -696,14 +696,20 @@ heap_trim (heap_info *heap, size_t pad)
>>      }
>>  
>>    /* Uses similar logic for per-thread arenas as the main arena with systrim
>> -     by preserving the top pad and at least a page.  */
>> +     and _int_free by preserving the top pad and rounding down to the nearest
>> +     page.  */
>>    top_size = chunksize (top_chunk);
>> +  if ((unsigned long)(top_size) <
>> +      (unsigned long)(mp_.trim_threshold))
> 
> Line break before the operator, not after.  Also, the parens are useless
> and confusing.

I'll fix that shortly. Thanks. Sorry for being sloppy.

c.



More information about the Libc-alpha mailing list