Index: lib/Devel/NYTProf/Reader.pm =================================================================== --- lib/Devel/NYTProf/Reader.pm (revision 587) +++ lib/Devel/NYTProf/Reader.pm (working copy) @@ -230,7 +230,7 @@ my ($self, $fname, $content) = @_; open(OUT, '>', "$self->{output_dir}/$fname") or confess "Unable to open $self->{output_dir}/$fname for writing; $!\n"; - print OUT @$content; + print OUT $content; close OUT; } Index: bin/nytprofhtml =================================================================== --- bin/nytprofhtml (revision 587) +++ bin/nytprofhtml (working copy) @@ -105,23 +105,33 @@ subtitle => $subhead, mode => qq/-$level/ ) - . qq{
+ . qq{ +

- - -\n -\n
File!~FILENAME~!
Statements Executed!~TOTAL_CALLS~! -
Total Time!~TOTAL_TIME~! -seconds

+ + + + + + + + + + + + + +
File!~FILENAME~!
Statements Executed!~TOTAL_CALLS~!
Total Time!~TOTAL_TIME~! seconds
+
}; } ); $reporter->set_param( 'taintmsg', - "
WARNING!
\n -
The source file used to generate this report was modified -after the profiler database was generated. The database might be out of sync, you should regenerate it. This page might not make any sense!

\n" + qq{
WARNING!
\n +
The source file used to generate this report was modified +after the profiler database was generated. The database might be out of sync, you should regenerate it. This page might not make any sense!

\n} ); @@ -162,7 +172,7 @@ my $sub_links; my $sortby_desc = ($sortby eq 'excl_time') ? "exclusive time" : "inclusive time"; - $sub_links .= qq{ + $sub_links .= qq{
@@ -170,7 +180,7 @@ - + }; @@ -212,7 +222,7 @@ $href, $subr, $sub->is_xsub ? " (xsub)" : "" ); - $sub_links .= "\n"; + $sub_links .= "\n"; } $sub_links .= "
${qualifier}Subroutines — ordered by $sortby_desc
CallsF Exclusive
Time		 Inclusive
Time		SubroutineSubroutine
\n"; @@ -226,8 +236,8 @@ my $sub_links = subroutine_table($profile, $filestr, undef, undef); - return qq{$sub_links
- + return qq{$sub_links
+
\n }; @@ -267,7 +277,7 @@ $linesrc =~ s//>/g; $linesrc =~ s/\t/ /g; - $linesrc =~ s/\n/
/g; # for xsub pseudo-sub declarations + $linesrc =~ s{\n}{
}g; # for xsub pseudo-sub declarations my @prologue; @@ -365,7 +375,7 @@ $reporter->set_param('suffix', '.html'); # output a css file too (optional, but good for pretty pages) -$reporter->_output_additional('style.css', []); +$reporter->_output_additional('style.css', get_css()); # generate the files $reporter->report(); @@ -394,7 +404,7 @@ print OUT get_html_header(); print OUT get_header(profile => $profile, title => "Performance Profile Subroutine Index"); - print OUT qq{

}; + print OUT qq{

}; # Show top subs across all files print OUT subroutine_table($profile, 0, 0, $sortby); @@ -419,19 +429,19 @@ print OUT get_html_header(); print OUT get_header(profile => $profile, title => "Performance Profile Index"); print OUT qq{ -

+

}; # generate name-sorted select options for files, if there are many if (keys %$stats > 30) { print OUT qq{

\n"; + print OUT "
\n"; } # Show top subs across all files @@ -540,10 +550,10 @@ # generate time-sorted sections for files print OUT qq{ -
LineStmts.Exclusive
Time		Avg.Code
+
}; - print OUT "" + print OUT qq{} . ""; my $inc_path_regex = get_abs_paths_alternation_regex([$profile->inc], qr/^|\[/); @@ -553,7 +563,7 @@ foreach my $filestats (sort { $b->{'time'} <=> $a->{'time'} } values %$stats) { print OUT qq{}; - print OUT ""; + print OUT qq{}; print OUT determine_severity('time', $filestats->{'time'}, $dev_time); print OUT determine_severity('time/call', $filestats->{'time/call'}, $dev_avgt); @@ -578,7 +588,7 @@ } if ($add_totals) { my $stats_fmt = - qq{}; + qq{}; print OUT sprintf $stats_fmt, fmt_float($allCalls), fmt_float($allTimes), '', "Total"; print OUT sprintf $stats_fmt, int(fmt_float($allCalls / keys %$stats)), fmt_float($allTimes / keys %$stats), '', "Average" @@ -621,7 +631,7 @@ else { $class = 'c0'; } - return ""; + return qq{}; } # Delete the previous database/directory if it exists @@ -740,7 +750,7 @@ $back_link
$head1 - $head2 + $head2
$right1 @@ -800,8 +810,8 @@
\n}; } -# The data handle contains the entire CSS file. -__DATA__ +sub get_css { + return <<'EOD'; /* Stylesheet for Devel::NYTProf::Reader HTML reports */ /* You may modify this file to alter the appearance of your coverage @@ -844,7 +854,7 @@ border-collapse: collapse; border-spacing: 0px; margin-top: 20px; - margin-botom: 20px; + margin-bottom: 20px; } tr { text-align : center; @@ -862,15 +872,14 @@ caption { background-color: #dddddd; text-align: left; - text-wrap: none; white-space: pre; padding: 0.4em; } -.table_footer { color: grey; } +.table_footer { color: gray; } .table_footer > a:link, -.table_footer > a:visited, -{ color: grey; +.table_footer > a:visited +{ color: gray; text-decoration: none; } @@ -886,7 +895,7 @@ padding-right: 0; border-right: hidden; font-family: monospace; - color: grey; + color: gray; } td.sub_sub { @@ -968,7 +977,7 @@ /* summary of calls into and out of a sub */ .calls { display: block; - color: grey; + color: gray; padding-top: 5px; padding-bottom: 5px; text-decoration: none; @@ -977,12 +986,14 @@ background-color: #e8e8e8; color: black; } -.calls a { color: grey; text-decoration: none; } +.calls a { color: gray; text-decoration: none; } .calls:hover a { color: black; text-decoration: underline; } .calls:hover a:hover { color: red; } /* give a little headroom to the summary of calls into a sub */ .calls .calls_in { margin-top: 5px; } +EOD +} __END__
Source Code Files — ordered by exclusive time then name
StmtsExclusive
Time
StmtsExclusive
Time		Avg.ReportsSource File
$filestats->{calls}$filestats->{calls}
%s%s%s%s
%s%s%s%s
$val$val