Author: tim.bunce
Date: Tue Nov 18 15:01:27 2008
New Revision: 608
Modified:
trunk/NYTProf.xs
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/test07.rdt
trunk/t/test08.rdt
trunk/t/test09.rdt
trunk/t/test10.rdt
trunk/t/test11.rdt
trunk/t/test12.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:
Add total_sub_calls attribute to data model and html report summary line.
Modified: trunk/NYTProf.xs
==============================================================================
--- trunk/NYTProf.xs (original)
+++ trunk/NYTProf.xs Tue Nov 18 15:01:27 2008
@@ -2758,6 +2758,7 @@
NV total_stmts_duration = 0.0;
int total_stmts_measured = 0;
int total_stmts_discounted = 0;
+ int total_sub_calls = 0;
HV *profile_hv;
HV* profile_modes = newHV();
HV *live_pids_hv = newHV();
@@ -3247,6 +3248,7 @@
sv = *av_fetch(subinfo_av, 9, 1);
sv_setnv(sv, reci_time + (SvOK(sv) ? SvNV(sv) : 0.0));
+ total_sub_calls += count;
break;
}
@@ -3439,6 +3441,7 @@
store_attrib_sv(aTHX_ attr_hv, "total_stmts_measured",
newSVnv(total_stmts_measured));
store_attrib_sv(aTHX_ attr_hv, "total_stmts_discounted",
newSVnv(total_stmts_discounted));
store_attrib_sv(aTHX_ attr_hv, "total_stmts_duration",
newSVnv(total_stmts_duration));
+ store_attrib_sv(aTHX_ attr_hv, "total_sub_calls",
newSVnv(total_sub_calls));
if (1) {
int show_summary_stats = (trace_level >= 1);
Modified: trunk/bin/nytprofhtml
==============================================================================
--- trunk/bin/nytprofhtml (original)
+++ trunk/bin/nytprofhtml Tue Nov 18 15:01:27 2008
@@ -468,6 +468,8 @@
$summary .= sprintf " executing %d statements",
$profile->{attribute}{total_stmts_measured}
-$profile->{attribute}{total_stmts_discounted};
+ $summary .= sprintf " and %d subroutine calls",
+ $profile->{attribute}{total_sub_calls};
$summary .= sprintf " in %d source files",
@all_fileinfos - $eval_fileinfos;
$summary .= sprintf " and %d string evals",
@@ -476,14 +478,14 @@
# generate name-sorted select options for files, if there are many
if (keys %$stats > 30) {
- print OUT
- qq{<form name="jump"><select name="file"
onChange="location.href=document.jump.file.value;">\n};
+ print OUT qq{<div class="jump_to_file"><form name="jump">};
+ print OUT qq{<select name="file"
onChange="location.href=document.jump.file.value;">\n};
printf OUT qq{<option disabled="disabled">%s</option>\n}, "Jump to
file...";
foreach (sort keys %$stats) {
my $fid = $profile->resolve_fid($_) or warn "Can't find fid
for $_";
printf OUT qq{<option value="#f%s">%s</option>\n}, $fid, $_;
}
- print OUT "</select></form><br />\n";
+ print OUT "</select></form></div>\n";
}
# Show top subs across all files
@@ -898,6 +900,10 @@
color: white;
text-decoration: none;
font-size: 0.75em;
+}
+
+.jump_to_file {
+ margin-top: 20px;
}
.footer,
Modified: trunk/lib/Devel/NYTProf/Data.pm
==============================================================================
--- trunk/lib/Devel/NYTProf/Data.pm (original)
+++ trunk/lib/Devel/NYTProf/Data.pm Tue Nov 18 15:01:27 2008
@@ -498,8 +498,8 @@
for my $attr (qw(
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_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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
attribute xs_version 0
fid_block_time 1 4 [ 0 1 ]
fid_block_time 1 6 [ 0 410 ]
Modified: trunk/t/test07.rdt
==============================================================================
--- trunk/t/test07.rdt (original)
+++ trunk/t/test07.rdt Tue Nov 18 15:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
attribute xs_version 0
fid_block_time 1 1 [ 0 1 ]
fid_fileinfo 1 [ /.../test07.p 1 2 0 0 ]
Modified: trunk/t/test08.rdt
==============================================================================
--- trunk/t/test08.rdt (original)
+++ trunk/t/test08.rdt Tue Nov 18 15:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
attribute xs_version 0
fid_block_time 1 1 0 0
fid_block_time 1 1 1 1
Modified: trunk/t/test09.rdt
==============================================================================
--- trunk/t/test09.rdt (original)
+++ trunk/t/test09.rdt Tue Nov 18 15:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
attribute xs_version 0
fid_block_time 1 3 0 0
fid_block_time 1 3 1 0
Modified: trunk/t/test12.rdt
==============================================================================
--- trunk/t/test12.rdt (original)
+++ trunk/t/test12.rdt Tue Nov 18 15:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
attribute xs_version 0
fid_block_time 1 1 [ 0 1 ]
fid_block_time 2 1 [ 0 1 ]
Modified: trunk/t/test13.rdt
==============================================================================
--- trunk/t/test13.rdt (original)
+++ trunk/t/test13.rdt Tue Nov 18 15:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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:01:27 2008
@@ -10,6 +10,7 @@
attribute total_stmts_discounted 0
attribute total_stmts_duration 0
attribute total_stmts_measured 0
+attribute total_sub_calls 0
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]
-~----------~----~----~----~------~----~------~--~---
