Skip to content

Commit

Permalink
Merge branch 'jn/gitweb-time-hires-comes-with-5.8'
Browse files Browse the repository at this point in the history
* jn/gitweb-time-hires-comes-with-5.8:
  gitweb: Time::HiRes is in core for Perl 5.8
  • Loading branch information
Junio C Hamano committed Dec 8, 2010
2 parents 3d90c79 + 3962f1d commit 4af004a
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions gitweb/gitweb.perl
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
use Fcntl ':mode';
use File::Find qw();
use File::Basename qw(basename);
use Time::HiRes qw(gettimeofday tv_interval);
binmode STDOUT, ':utf8';

our $t0;
if (eval { require Time::HiRes; 1; }) {
$t0 = [Time::HiRes::gettimeofday()];
}
our $t0 = [ gettimeofday() ];
our $number_of_git_cmds = 0;

BEGIN {
Expand Down Expand Up @@ -1078,7 +1076,7 @@ sub dispatch {
}

sub reset_timer {
our $t0 = [Time::HiRes::gettimeofday()]
our $t0 = [ gettimeofday() ]
if defined $t0;
our $number_of_git_cmds = 0;
}
Expand Down Expand Up @@ -3651,7 +3649,7 @@ sub git_footer_html {
print "<div id=\"generating_info\">\n";
print 'This page took '.
'<span id="generating_time" class="time_span">'.
Time::HiRes::tv_interval($t0, [Time::HiRes::gettimeofday()]).
tv_interval($t0, [ gettimeofday() ]).
' seconds </span>'.
' and '.
'<span id="generating_cmd">'.
Expand Down Expand Up @@ -5517,7 +5515,7 @@ sub git_blame_common {
print 'END';
if (defined $t0 && gitweb_check_feature('timed')) {
print ' '.
Time::HiRes::tv_interval($t0, [Time::HiRes::gettimeofday()]).
tv_interval($t0, [ gettimeofday() ]).
' '.$number_of_git_cmds;
}
print "\n";
Expand Down

0 comments on commit 4af004a

Please sign in to comment.