Author: njn
Date: 2007-10-10 06:00:19 +0100 (Wed, 10 Oct 2007)
New Revision: 6972
Log:
- Make --stacks=no the default, because it's slow.
- Handle --heap=no correctly. Add a test for it.
Added:
branches/MASSIF2/massif/tests/no-stack-no-heap.post.exp
branches/MASSIF2/massif/tests/no-stack-no-heap.stderr.exp
branches/MASSIF2/massif/tests/no-stack-no-heap.vgtest
Modified:
branches/MASSIF2/massif/ms_main.c
branches/MASSIF2/massif/tests/Makefile.am
Modified: branches/MASSIF2/massif/ms_main.c
===================================================================
--- branches/MASSIF2/massif/ms_main.c 2007-10-10 03:48:12 UTC (rev 6971)
+++ branches/MASSIF2/massif/ms_main.c 2007-10-10 05:00:19 UTC (rev 6972)
@@ -339,7 +339,7 @@
static Bool clo_heap = True;
static UInt clo_heap_admin = 8;
-static Bool clo_stacks = True;
+static Bool clo_stacks = False;
static UInt clo_depth = 8; // XXX: too low?
static UInt clo_threshold = 100; // 100 == 1%
static UInt clo_time_unit = TimeMS;
@@ -356,6 +356,7 @@
VG_BOOL_CLO(arg, "--heap", clo_heap)
else VG_BOOL_CLO(arg, "--stacks", clo_stacks)
+ // XXX: "--heap-admin= " is accepted!
else VG_NUM_CLO(arg, "--heap-admin", clo_heap_admin)
else VG_NUM_CLO(arg, "--depth", clo_depth)
@@ -381,8 +382,9 @@
{
VG_(printf)(
" --heap=no|yes profile heap blocks [yes]\n"
-" --heap-admin=<number> average admin bytes per heap block [8]\n"
-" --stacks=no|yes profile stack(s) [yes]\n"
+" --heap-admin=<number> average admin bytes per heap block;"
+" ignored if --heap=no [8]\n"
+" --stacks=no|yes profile stack(s) [no]\n"
" --depth=<number> depth of contexts [8]\n"
" --alloc-fn=<name> specify <fn> as an alloc function [empty]\n"
" --threshold=<n> significance threshold, in 100ths of a
percent\n"
@@ -1134,17 +1136,13 @@
tl_assert(!is_snapshot_in_use(snapshot));
tl_assert(have_started_executing_code);
- // Heap.
+ // Heap and heap admin.
if (clo_heap) {
snapshot->heap_szB = heap_szB;
if (is_detailed) {
snapshot->alloc_xpt = dup_XTree(alloc_xpt, /*parent*/NULL);
tl_assert(snapshot->alloc_xpt->curr_szB == heap_szB);
}
- }
-
- // Heap admin.
- if (clo_heap_admin > 0) {
snapshot->heap_admin_szB = clo_heap_admin * n_heap_blocks;
}
@@ -1231,7 +1229,8 @@
// Sanity check the size, then update our recorded peak.
SizeT snapshot_total_szB =
snapshot->heap_szB + snapshot->heap_admin_szB + snapshot->stacks_szB;
- tl_assert(snapshot_total_szB > peak_snapshot_total_szB);
+ tl_assert2(snapshot_total_szB > peak_snapshot_total_szB,
+ "%ld, %ld\n", snapshot_total_szB, peak_snapshot_total_szB);
peak_snapshot_total_szB = snapshot_total_szB;
// Find the old peak snapshot, if it exists, and mark it as normal.
@@ -1348,20 +1347,20 @@
hc->szB = szB;
hc->data = (Addr)p;
hc->where = NULL; // paranoia
+ VG_(HT_add_node)(malloc_list, hc);
- // Update heap stats
- update_heap_stats(hc->szB, /*n_heap_blocks_delta*/1);
+ if (clo_heap) {
+ // Update heap stats
+ update_heap_stats(hc->szB, /*n_heap_blocks_delta*/1);
- // Update XTree, if necessary
- if (clo_heap) {
+ // Update XTree
hc->where = get_XCon( tid, is_custom_alloc );
update_XCon(hc->where, szB);
+
+ // Maybe take a snapshot.
+ maybe_take_snapshot(Normal, " alloc");
}
- VG_(HT_add_node)(malloc_list, hc);
- // Maybe take a snapshot.
- maybe_take_snapshot(Normal, " alloc");
-
VERB(2, ">>>");
return p;
@@ -1386,15 +1385,18 @@
}
die_szB = hc->szB;
- // Maybe take a peak snapshot, since it's a deallocation.
- maybe_take_snapshot(Peak, "de-PEAK");
+ if (clo_heap) {
+ // Maybe take a peak snapshot, since it's a deallocation.
+ maybe_take_snapshot(Peak, "de-PEAK");
- // Update heap stats
- update_heap_stats(-die_szB, /*n_heap_blocks_delta*/-1);
+ // Update heap stats
+ update_heap_stats(-die_szB, /*n_heap_blocks_delta*/-1);
- // Update XTree, if necessary
- if (clo_heap) {
+ // Update XTree, if necessary
update_XCon(hc->where, -hc->szB);
+
+ // Maybe take a snapshot.
+ maybe_take_snapshot(Normal, "dealloc");
}
// Actually free the chunk, and the heap block (if necessary)
@@ -1402,9 +1404,6 @@
if (!custom_free)
VG_(cli_free)( p );
- // Maybe take a snapshot.
- maybe_take_snapshot(Normal, "dealloc");
-
VERB(2, ">>> (-%lu)", die_szB);
}
@@ -1430,14 +1429,17 @@
old_szB = hc->szB;
- // Maybe take a peak snapshot, if it's (effectively) a deallocation.
- if (new_szB < old_szB) {
- maybe_take_snapshot(Peak, "re-PEAK");
+ if (clo_heap) {
+ // Maybe take a peak snapshot, if it's (effectively) a deallocation.
+ if (new_szB < old_szB) {
+ maybe_take_snapshot(Peak, "re-PEAK");
+ }
+
+ // Update heap stats
+ update_heap_stats(new_szB - old_szB, /*n_heap_blocks_delta*/0);
}
- // Update heap stats
- update_heap_stats(new_szB - old_szB, /*n_heap_blocks_delta*/0);
-
+ // Actually do the allocation, if necessary.
if (new_szB <= old_szB) {
// new size is smaller or same; block not moved
p_new = p_old;
@@ -1475,7 +1477,9 @@
VG_(HT_add_node)(malloc_list, hc);
// Maybe take a snapshot.
- maybe_take_snapshot(Normal, "realloc");
+ if (clo_heap) {
+ maybe_take_snapshot(Normal, "realloc");
+ }
VERB(2, ">>> (%ld)", new_szB - old_szB);
Modified: branches/MASSIF2/massif/tests/Makefile.am
===================================================================
--- branches/MASSIF2/massif/tests/Makefile.am 2007-10-10 03:48:12 UTC (rev
6971)
+++ branches/MASSIF2/massif/tests/Makefile.am 2007-10-10 05:00:19 UTC (rev
6972)
@@ -18,6 +18,7 @@
custom_alloc.post.exp custom_alloc.stderr.exp custom_alloc.vgtest
ignoring.post.exp ignoring.stderr.exp ignoring.vgtest \
long-time.post.exp long-time.stderr.exp long-time.vgtest \
+ no-stack-no-heap.post.exp no-stack-no-heap.stderr.exp
no-stack-no-heap.vgtest \
null.post.exp null.stderr.exp null.vgtest \
one.post.exp one.stderr.exp one.vgtest \
params.post.exp params.stderr.exp params.vgtest \
Added: branches/MASSIF2/massif/tests/no-stack-no-heap.post.exp
===================================================================
--- branches/MASSIF2/massif/tests/no-stack-no-heap.post.exp
(rev 0)
+++ branches/MASSIF2/massif/tests/no-stack-no-heap.post.exp 2007-10-10
05:00:19 UTC (rev 6972)
@@ -0,0 +1,37 @@
+--------------------------------------------------------------------------------
+Command: ./basic
+Massif arguments: --stacks=no --heap=no --time-unit=B
+ms_print arguments: massif.out
+--------------------------------------------------------------------------------
+
+
+ B
+ 1^
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ 0 +----------------------------------------------------------------------->B
+ 0 1
+
+Number of snapshots: 1
+ Detailed snapshots: []
+--------------------------------------------------------------------------------
+ n time(B) total(B) useful-heap(B) admin-heap(B) stacks(B)
+--------------------------------------------------------------------------------
+ 0 0 0 0 0 0
Added: branches/MASSIF2/massif/tests/no-stack-no-heap.stderr.exp
===================================================================
--- branches/MASSIF2/massif/tests/no-stack-no-heap.stderr.exp
(rev 0)
+++ branches/MASSIF2/massif/tests/no-stack-no-heap.stderr.exp 2007-10-10
05:00:19 UTC (rev 6972)
@@ -0,0 +1,2 @@
+
+
Added: branches/MASSIF2/massif/tests/no-stack-no-heap.vgtest
===================================================================
--- branches/MASSIF2/massif/tests/no-stack-no-heap.vgtest
(rev 0)
+++ branches/MASSIF2/massif/tests/no-stack-no-heap.vgtest 2007-10-10
05:00:19 UTC (rev 6972)
@@ -0,0 +1,4 @@
+prog: basic
+vgopts: --stacks=no --heap=no --time-unit=B
+post: perl ../../massif/ms_print massif.out
+cleanup: rm massif.out
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Valgrind-developers mailing list
Valgrind-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/valgrind-developers
