Author: njn
Date: 2007-09-21 23:42:49 +0100 (Fri, 21 Sep 2007)
New Revision: 6892
Log:
- Don't forget to delete the tmp file.
- Clean up line reading.
Modified:
branches/MASSIF2/massif/ms_print
Modified: branches/MASSIF2/massif/ms_print
===================================================================
--- branches/MASSIF2/massif/ms_print 2007-09-21 07:09:33 UTC (rev 6891)
+++ branches/MASSIF2/massif/ms_print 2007-09-21 22:42:49 UTC (rev 6892)
@@ -146,13 +146,6 @@
return $1;
}
-sub get_equals_num_line($)
-{
- my ($fieldname) = @_;
- my $line = get_line();
- return equals_num_line($line, $fieldname);
-}
-
sub is_significant_XPt($$$)
{
my ($is_top_node, $xpt_szB, $total_szB) = @_;
@@ -312,14 +305,13 @@
#-------------------------------------------------------------------------
$line = get_line();
while (defined $line) {
- # XXX: equals_num_line vs get_equals_num_line is ugly
- my $snapshot_num = equals_num_line($line, "snapshot");
- my $time = get_equals_num_line("time");
- my $mem_total_B = get_equals_num_line("mem_total_B");
- my $mem_heap_B = get_equals_num_line("mem_heap_B");
- my $mem_heap_admin_B = get_equals_num_line("mem_heap_admin_B");
- my $mem_stacks_B = get_equals_num_line("mem_stacks_B");
- my $heap_tree = get_equals_num_line("heap_tree");
+ my $snapshot_num = equals_num_line($line, "snapshot");
+ my $time = equals_num_line(get_line(), "time");
+ my $mem_total_B = equals_num_line(get_line(), "mem_total_B");
+ my $mem_heap_B = equals_num_line(get_line(), "mem_heap_B");
+ my $mem_heap_admin_B = equals_num_line(get_line(), "mem_heap_admin_B");
+ my $mem_stacks_B = equals_num_line(get_line(), "mem_stacks_B");
+ my $heap_tree = equals_num_line(get_line(), "heap_tree");
# Print the snapshot data to $tmp_file.
printf(TMPFILE $column_format,
@@ -530,6 +522,7 @@
while (my $line = <TMPFILE>) {
print($line);
}
+ unlink($tmp_file);
}
#-----------------------------------------------------------------------------
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Valgrind-developers mailing list
Valgrind-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/valgrind-developers
