Commit 271dc9c5 authored by Yang Tse's avatar Yang Tse
Browse files

use Time::HiRes whenever available, independently of perl version

parent 7bede918

tests/ftpserver.pl

+5 −2
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ require "getpart.pm"; 
require "ftp.pm";



BEGIN {

    if($] >= 5.007003) {

    # sub second timestamping needs Time::HiRes

    eval {

        no warnings "all";

        require Time::HiRes;

        import  Time::HiRes qw( gettimeofday );

    }
@@ -141,7 +143,8 @@ sub getlogfilename { 
#

sub logmsg {

    my $now;

    if($] >= 5.007003) {

    # sub second timestamping needs Time::HiRes

    if($Time::HiRes::VERSION) {

        my ($seconds, $usec) = gettimeofday();

        my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =

            localtime($seconds);

tests/runtests.pl

+7 −6
Original line number Diff line number Diff line
@@ -58,8 +58,9 @@ 


BEGIN {

    @INC=(@INC, $ENV{'srcdir'}, ".");

    # run time statistics needs perl 5.7 or newer

    if($] >= 5.007003) {

    # run time statistics needs Time::HiRes

    eval {

        no warnings "all";

        require Time::HiRes;

        import  Time::HiRes qw( time );

    }
@@ -3080,8 +3081,8 @@ while(@ARGV) { 
        $keepoutfiles=1;

    }

    elsif($ARGV[0] eq "-r") {

        # run time statistics needs perl 5.7 or newer

        if($] >= 5.007003) {

        # run time statistics needs Time::HiRes

        if($Time::HiRes::VERSION) {

            keys(%timeprepini) = 1000;

            keys(%timesrvrini) = 1000;

            keys(%timesrvrend) = 1000;
@@ -3094,8 +3095,8 @@ while(@ARGV) { 
        }

    }

    elsif($ARGV[0] eq "-rf") {

        # run time statistics needs perl 5.7 or newer

        if($] >= 5.007003) {

        # run time statistics needs Time::HiRes

        if($Time::HiRes::VERSION) {

            keys(%timeprepini) = 1000;

            keys(%timesrvrini) = 1000;

            keys(%timesrvrend) = 1000;