Upgrade to Time-HiRes-1.9712

p4raw-id: //depot/perl@33266

diff --git a/ext/Time/HiRes/HiRes.pm b/ext/Time/HiRes/HiRes.pm
index 307ad94..ce7b336 100644 (file)
--- a/ext/Time/HiRes/HiRes.pm
+++ b/ext/Time/HiRes/HiRes.pm
@@ -23,7 +23,7 @@ require DynaLoader;
                 stat
                );
        
-$VERSION = '1.9711';
+$VERSION = '1.9712';
 $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 

diff --git a/ext/Time/HiRes/Makefile.PL b/ext/Time/HiRes/Makefile.PL
index a332e4b..28ca521 100644 (file)
--- a/ext/Time/HiRes/Makefile.PL
+++ b/ext/Time/HiRes/Makefile.PL
@@ -851,19 +851,20 @@ sub main {
        print  <<EOM;
 Now you may issue '$make'.  Do not forget also '$make test'.
 EOM
-       if ((exists $ENV{LC_ALL}   && $ENV{LC_ALL}   =~ /utf-?8/i) ||
-           (exists $ENV{LC_CTYPE} && $ENV{LC_CTYPE} =~ /utf-?8/i) ||
-           (exists $ENV{LANG}     && $ENV{LANG}     =~ /utf-?8/i)) {
+       if ($] == 5.008 &&
+          ((exists $ENV{LC_ALL}   && $ENV{LC_ALL}   =~ /utf-?8/i) ||
+           (exists $ENV{LC_CTYPE} && $ENV{LC_CTYPE} =~ /utf-?8/i) ||
+           (exists $ENV{LANG}     && $ENV{LANG}     =~ /utf-?8/i))) {
             print <<EOM;
 
 NOTE: if you get an error like this (the Makefile line number may vary):
 Makefile:91: *** missing separator
 then set the environment variable LC_ALL to "C" and retry
 from scratch (re-run perl "Makefile.PL").
-(And consider upgrading your Perl.)
+(And consider upgrading your Perl to, say, at least Perl 5.8.8.)
 (You got this message because you seem to have
  an UTF-8 locale active in your shell environment, this used
- to cause broken Makefiles to be created from Makefile.PLs.)
+ to cause broken Makefiles to be created from Makefile.PLs)
 EOM
         }
     }

diff --git a/ext/Time/HiRes/t/HiRes.t b/ext/Time/HiRes/t/HiRes.t
index 9410e7d..3bc1c0f 100644 (file)
--- a/ext/Time/HiRes/t/HiRes.t
+++ b/ext/Time/HiRes/t/HiRes.t
@@ -271,19 +271,6 @@ unless (   defined &Time::HiRes::gettimeofday
        # Perl's deferred signals may be too wimpy to break through
        # a restartable select(), so use POSIX::sigaction if available.
 
-       sub tick {
-           $i--;
-           my $ival = Time::HiRes::tv_interval ($r);
-           print "# Tick! $i $ival\n";
-           my $exp = 0.3 * (5 - $i);
-           # This test is more sensitive, so impose a softer limit.
-           if (abs($ival/$exp - 1) > 4*$limit) {
-               my $ratio = abs($ival/$exp);
-               $not = "tick: $exp sleep took $ival ratio $ratio";
-               $i = 0;
-           }
-       }
-
        POSIX::sigaction(&POSIX::SIGALRM,
                         POSIX::SigAction->new("tick"),
                         $oldaction)
@@ -315,7 +302,7 @@ unless (   defined &Time::HiRes::gettimeofday
            }
            my $exp = 0.3 * (5 - $i);
            # This test is more sensitive, so impose a softer limit.
-           if (abs($ival/$exp - 1) > 3*$limit) {
+           if (abs($ival/$exp - 1) > 4*$limit) {
                my $ratio = abs($ival/$exp);
                $not = "while: $exp sleep took $ival ratio $ratio";
                last;
@@ -324,6 +311,19 @@ unless (   defined &Time::HiRes::gettimeofday
        }
     }
 
+    sub tick {
+       $i--;
+       my $ival = Time::HiRes::tv_interval ($r);
+       print "# Tick! $i $ival\n";
+       my $exp = 0.3 * (5 - $i);
+       # This test is more sensitive, so impose a softer limit.
+       if (abs($ival/$exp - 1) > 4*$limit) {
+           my $ratio = abs($ival/$exp);
+           $not = "tick: $exp sleep took $ival ratio $ratio";
+           $i = 0;
+       }
+    }
+
     if ($use_sigaction) {
        POSIX::sigaction(&POSIX::SIGALRM, $oldaction);
     } else {