Author: tim.bunce
Date: Tue Nov 18 15:39:53 2008
New Revision: 609
Modified:
trunk/bin/nytprofhtml
trunk/lib/Devel/NYTProf/Data.pm
trunk/t/test01.rdt
trunk/t/test02.rdt
trunk/t/test03.rdt
trunk/t/test05.rdt
trunk/t/test06.rdt
trunk/t/test09.rdt
trunk/t/test10.rdt
trunk/t/test11.rdt
trunk/t/test13.rdt
trunk/t/test14.rdt
trunk/t/test20-streval.rdt
trunk/t/test30-fork.0.rdt
trunk/t/test30-fork.1.rdt
trunk/t/test40pmc.rdt
trunk/t/test50-disable.rdt
trunk/t/test60-subname.rdt
trunk/t/test80-recurs.rdt
Log:
Don't normalize to zero total_sub_calls in test results.
Calculate totals of statements and time in file table from the actual
values shown
and add a note about statements and time spent in string evals (because
we're
not including them properly at the moment).
Modified: trunk/bin/nytprofhtml
==============================================================================
--- trunk/bin/nytprofhtml (original)
+++ trunk/bin/nytprofhtml Tue Nov 18 15:39:53 2008
@@ -606,14 +606,20 @@
my $allCalls = $profile->{attribute}{total_stmts_measured}
- $profile->{attribute}{total_stmts_discounted};
+ my ($t_stmt_exec, $t_stmt_time) = (0,0);
foreach my $filestats (sort { $b->{'time'} <=> $a->{'time'} }
values %$stats) {
print OUT qq{<tr class="index">};
+
print OUT determine_severity($filestats->{'calls'}, undef, 0,
sprintf("%.1f%%", $filestats->{'calls'}/$allCalls*100)
);
+ $t_stmt_exec += $filestats->{'calls'};
+
print OUT determine_severity($filestats->{'time'}, $dev_time,
1,
sprintf("%.1f%%", $filestats->{'time'}/$allTimes*100)
);
+ $t_stmt_time += $filestats->{'time'};
+
print OUT determine_severity($filestats->{'time/call'}, $dev_avgt,
1);
my $rep_links = join ' • ', map {
@@ -634,14 +640,24 @@
if ($add_totals) {
my $stats_fmt =
qq{<tr class="index"><td class="n">%s</td><td
class="n">%s</td><td class="n">%s</td><td colspan="2" style="font-style:
italic">%s</td></tr>};
- print OUT sprintf $stats_fmt, fmt_float($allCalls),
fmt_time($allTimes), '', "Total";
- print OUT sprintf $stats_fmt, int(fmt_float($allCalls /
keys %$stats)),
- fmt_time($allTimes / keys %$stats), '', "Average"
+ my $t_notes = "";
+ if ($t_stmt_exec != $allCalls or $t_stmt_time ne $allTimes) {
+ my $eval_fileinfos = grep { $_->eval_line }
$profile->all_fileinfos;
+ $t_notes = sprintf "(%d string evals account for a further %d
statements and %s)</i>",
+ $eval_fileinfos, $allCalls - $t_stmt_exec,
fmt_time($allTimes - $t_stmt_time);
+ }
+ print OUT sprintf $stats_fmt, fmt_float($t_stmt_exec),
fmt_time($t_stmt_time), '',
+ "Total $t_notes";
+
+ print OUT sprintf $stats_fmt, int(fmt_float($t_stmt_exec /
keys %$stats)),
+ fmt_time($t_stmt_time / keys %$stats), '', "Average"
if %$stats; # avoid divide by zero
+
print OUT sprintf $stats_fmt, '', fmt_time($dev_time->[1]),
fmt_time($dev_avgt->[1]),
"Median";
print OUT sprintf $stats_fmt, '', fmt_float($dev_time->[0]),
fmt_float($dev_avgt->[0]),
- "Deviation";
+ "Deviation"
+ if $dev_time->[0] or $dev_avgt->[0];
}
print OUT '</table>';
Modified: trunk/lib/Devel/NYTProf/Data.pm
==============================================================================
--- trunk/lib/Devel/NYTProf/Data.pm (original)
+++ trunk/lib/Devel/NYTProf/Data.pm Tue Nov 18 15:39:53 2008
@@ -499,7 +499,6 @@
basetime xs_version perl_version clock_id ticks_per_sec nv_size
profiler_duration profiler_end_time profiler_start_time
total_stmts_duration total_stmts_measured total_stmts_discounted
- total_sub_calls
)) {
$self->{attribute}{$attr} = 0;
}
Modified: trunk/t/test01.rdt
==============================================================================
--- trunk/t/test01.rdt (original)
+++ trunk/t/test01.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 7
attribute xs_version 0
fid_block_time 1 2 [ 0 4 ]
fid_block_time 1 7 [ 0 4 ]
Modified: trunk/t/test02.rdt
==============================================================================
--- trunk/t/test02.rdt (original)
+++ trunk/t/test02.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 10
attribute xs_version 0
fid_block_time 1 2 [ 0 4 ]
fid_block_time 1 7 [ 0 7 ]
Modified: trunk/t/test03.rdt
==============================================================================
--- trunk/t/test03.rdt (original)
+++ trunk/t/test03.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 4
attribute xs_version 0
fid_block_time 1 2 [ 0 2 ]
fid_block_time 1 8 [ 0 2 ]
Modified: trunk/t/test05.rdt
==============================================================================
--- trunk/t/test05.rdt (original)
+++ trunk/t/test05.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 6
attribute xs_version 0
fid_block_time 1 5 [ 0 2 ]
fid_block_time 1 9 [ 0 2 ]
Modified: trunk/t/test06.rdt
==============================================================================
--- trunk/t/test06.rdt (original)
+++ trunk/t/test06.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 413
attribute xs_version 0
fid_block_time 1 4 [ 0 1 ]
fid_block_time 1 6 [ 0 410 ]
Modified: trunk/t/test09.rdt
==============================================================================
--- trunk/t/test09.rdt (original)
+++ trunk/t/test09.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 5
attribute xs_version 0
fid_block_time 1 2 0 0
fid_block_time 1 2 1 2
Modified: trunk/t/test10.rdt
==============================================================================
--- trunk/t/test10.rdt (original)
+++ trunk/t/test10.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 1
attribute xs_version 0
fid_block_time 1 1 0 0
fid_block_time 1 1 1 1
Modified: trunk/t/test11.rdt
==============================================================================
--- trunk/t/test11.rdt (original)
+++ trunk/t/test11.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 2
attribute xs_version 0
fid_block_time 1 3 0 0
fid_block_time 1 3 1 0
Modified: trunk/t/test13.rdt
==============================================================================
--- trunk/t/test13.rdt (original)
+++ trunk/t/test13.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 5
attribute xs_version 0
fid_block_time 1 4 [ 0 3 ]
fid_block_time 1 8 [ 0 1 ]
Modified: trunk/t/test14.rdt
==============================================================================
--- trunk/t/test14.rdt (original)
+++ trunk/t/test14.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 2
attribute xs_version 0
fid_block_time 1 17 [ 0 1 ]
fid_block_time 1 18 [ 0 1 ]
Modified: trunk/t/test20-streval.rdt
==============================================================================
--- trunk/t/test20-streval.rdt (original)
+++ trunk/t/test20-streval.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 4
attribute xs_version 0
fid_block_time 1 3 [ 0 4 ]
fid_block_time 1 5 [ 0 1 ]
Modified: trunk/t/test30-fork.0.rdt
==============================================================================
--- trunk/t/test30-fork.0.rdt (original)
+++ trunk/t/test30-fork.0.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 5
attribute xs_version 0
fid_block_time 1 2 [ 0 2 ]
fid_block_time 1 7 [ 0 3 ]
Modified: trunk/t/test30-fork.1.rdt
==============================================================================
--- trunk/t/test30-fork.1.rdt (original)
+++ trunk/t/test30-fork.1.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 3
attribute xs_version 0
fid_block_time 1 7 [ 0 2 ]
fid_block_time 1 11 [ 0 2 ]
Modified: trunk/t/test40pmc.rdt
==============================================================================
--- trunk/t/test40pmc.rdt (original)
+++ trunk/t/test40pmc.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 1
attribute xs_version 0
fid_block_time 1 4 [ 0 1 ]
fid_block_time 2 6 [ 0 1 ]
Modified: trunk/t/test50-disable.rdt
==============================================================================
--- trunk/t/test50-disable.rdt (original)
+++ trunk/t/test50-disable.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 2
attribute xs_version 0
fid_block_time 1 1 [ 0 1 ]
fid_block_time 1 2 [ 0 1 ]
Modified: trunk/t/test60-subname.rdt
==============================================================================
--- trunk/t/test60-subname.rdt (original)
+++ trunk/t/test60-subname.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 7
attribute xs_version 0
fid_block_time 1 5 [ 0 1 ]
fid_block_time 1 9 [ 0 1 ]
Modified: trunk/t/test80-recurs.rdt
==============================================================================
--- trunk/t/test80-recurs.rdt (original)
+++ trunk/t/test80-recurs.rdt Tue Nov 18 15:39:53 2008
@@ -10,7 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
-attribute total_sub_calls 0
+attribute total_sub_calls 2
attribute xs_version 0
fid_block_time 1 2 [ 0 6 ]
fid_block_time 1 7 [ 0 1 ]
--~--~---------~--~----~------------~-------~--~----~
You've received this message because you are subscribed to
the Devel::NYTProf Development User group.
Group hosted at: http://groups.google.com/group/develnytprof-dev
Project hosted at: http://perl-devel-nytprof.googlecode.com
CPAN distribution: http://search.cpan.org/dist/Devel-NYTProf
To post, email: [email protected]
To unsubscribe, email: [EMAIL PROTECTED]
-~----------~----~----~----~------~----~------~--~---
