|
From: Nicholas N. <nj...@cs...> - 2005-02-10 02:10:21
|
CVS commit by nethercote:
Fixed assertion failure: previously, the stack size of the first and last
censuses was non-zero. Now it is, so handle it. Massif's regtests are now
working again.
Tweaked the test cases a little, too.
BUGS:98288
M +1 -1 coregrind/x86/signal.c 1.14
M +2 -2 massif/ms_main.c 1.23
M +5 -2 massif/tests/filter_stderr 1.2
M +2 -2 massif/tests/toobig-allocs.stderr.exp 1.2
M +2 -2 massif/tests/true_html.stderr.exp 1.2
M +2 -2 massif/tests/true_text.stderr.exp 1.2
--- valgrind/coregrind/x86/signal.c #1.13:1.14
@@ -502,5 +502,5 @@ static Addr build_rt_sigframe(ThreadStat
/* SIGILL defines addr to be the faulting address */
if (sigNo == VKI_SIGILL && siginfo->si_code > 0)
- frame->sigInfo._sifields._sigfault._addr = tst->arch.m_eip;
+ frame->sigInfo._sifields._sigfault._addr = (void*)tst->arch.m_eip;
synth_ucontext(tst->tid, siginfo, mask, &frame->uContext, &frame->fpstate);
--- valgrind/massif/ms_main.c #1.22:1.23
@@ -1768,7 +1768,7 @@ print_summary(ULong total_ST, ULong heap
// Stack(s) ----------------------------------------------------------
if (clo_stacks) {
- sk_assert(0 != total_ST);
VG_(message)(Vg_UserMsg, "stack(s): %s",
- make_perc(stack_ST, total_ST) );
+ ( 0 == stack_ST ? (Char*)"0%"
+ : make_perc(stack_ST, total_ST) ) );
}
--- valgrind/massif/tests/filter_stderr #1.1:1.2
@@ -5,5 +5,8 @@
$dir/../../tests/filter_stderr_basic |
-# Remove numbers from all lines
-sed "s/\([a-zA-Z(): ]*\)[ 0-9\.,()+rdw]*\(%\|ms.B\)$/\1/"
+# Remove numbers from all lines (and "(n/a)" strings)
+sed "s/\(Total spacetime: \).*$/\1/" |
+sed "s/\(heap: \).*$/\1/" |
+sed "s/\(heap admin: \).*$/\1/" |
+sed "s/\(stack(s): \).*$/\1/"
--- valgrind/massif/tests/toobig-allocs.stderr.exp #1.1:1.2
@@ -4,5 +4,5 @@
Total spacetime:
-heap:
-heap admin:
+heap:
+heap admin:
stack(s):
--- valgrind/massif/tests/true_html.stderr.exp #1.1:1.2
@@ -2,5 +2,5 @@
Total spacetime:
-heap:
-heap admin:
+heap:
+heap admin:
stack(s):
--- valgrind/massif/tests/true_text.stderr.exp #1.1:1.2
@@ -2,5 +2,5 @@
Total spacetime:
-heap:
-heap admin:
+heap:
+heap admin:
stack(s):
|