1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From c3ab42a82de7506c17749e78a171ce07ced95dd5 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 6 Feb 2009 18:24:23 +0000
Subject: [PATCH 1/3] * malloc/memusage.c (update_data): Fix handling of wrapping back
to the beginning of the buffer.
---
malloc/memusage.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/malloc/memusage.c b/malloc/memusage.c
index d11e9e6..6c67a8c 100644
--- a/malloc/memusage.c
+++ b/malloc/memusage.c
@@ -1,5 +1,5 @@
/* 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.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -18,6 +18,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <assert.h>
#include <atomic.h>
#include <dlfcn.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
counter it does not matter since that thread will take
care of the correction. */
- unsigned int reset = idx - 2 * buffer_size;
- catomic_compare_and_exchange_val_acq (&buffer_size, reset, idx);
+ uatomic32_t reset = idx % (2 * buffer_size);
+ catomic_compare_and_exchange_val_acq (&buffer_cnt, reset, idx);
idx = reset;
}
+ assert (idx < 2 * DEFAULT_BUFFER_SIZE);
buffer[idx].heap = current_heap;
buffer[idx].stack = current_stack;
--
1.6.3.3
|
