mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

* malloc/memusage.c (update_data): Fix handling of wrapping back

Browse Source 
to the beginning of the buffer.
This commit is contained in:
Ulrich Drepper 2009-02-06 18:24:23 +00:00
parent 2191e7ffa2
commit c3ab42a82d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2009-02-06 Ulrich Drepper <drepper@redhat.com> 2009-02-06 Ulrich Drepper <drepper@redhat.com>
* malloc/memusage.c (update_data): Fix handling of wrapping back
to the beginning of the buffer.
[BZ #9823] [BZ #9823]
* stdio-common/psignal.c (psignal): Fix test for empty string. * stdio-common/psignal.c (psignal): Fix test for empty string.

8
malloc/memusage.c
View File

@ -1,5 +1,5 @@
/* Profile heap and stack memory usage of running program. /* Profile heap and stack memory usage of running program.
Copyright (C) 1998-2002, 2004, 2005, 2006 Free Software Foundation, Inc. Copyright (C) 1998-2002, 2004-2006, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@ -18,6 +18,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#include <assert.h>
#include <atomic.h> #include <atomic.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <errno.h> #include <errno.h>
@ -168,10 +169,11 @@ update_data (struct header *result, size_t len, size_t old_len)
this fails because of another thread increasing the this fails because of another thread increasing the
counter it does not matter since that thread will take counter it does not matter since that thread will take
care of the correction. */ care of the correction. */
unsigned int reset = idx - 2 * buffer_size; uatomic32_t reset = idx % (2 * buffer_size);
catomic_compare_and_exchange_val_acq (&buffer_size, reset, idx); catomic_compare_and_exchange_val_acq (&buffer_cnt, reset, idx);
idx = reset; idx = reset;
} }
assert (idx < 2 * DEFAULT_BUFFER_SIZE);
buffer[idx].heap = current_heap; buffer[idx].heap = current_heap;
buffer[idx].stack = current_stack; buffer[idx].stack = current_stack;