summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xPorting/Maintainers.pl2
-rw-r--r--cpan/Time-HiRes/Changes9
-rw-r--r--cpan/Time-HiRes/HiRes.pm6
-rw-r--r--cpan/Time-HiRes/HiRes.xs19
-rw-r--r--cpan/Time-HiRes/t/itimer.t1
-rw-r--r--cpan/Time-HiRes/t/stat.t14
-rw-r--r--pod/perldelta.pod6
7 files changed, 45 insertions, 12 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 667f56b922..d6b513fc41 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1897,7 +1897,7 @@ use File::Glob qw(:case);
'Time::HiRes' => {
'MAINTAINER' => 'zefram',
- 'DISTRIBUTION' => 'ZEFRAM/Time-HiRes-1.9724.tar.gz',
+ 'DISTRIBUTION' => 'ZEFRAM/Time-HiRes-1.9725.tar.gz',
'FILES' => q[cpan/Time-HiRes],
'UPSTREAM' => 'cpan',
},
diff --git a/cpan/Time-HiRes/Changes b/cpan/Time-HiRes/Changes
index 206fa75485..d5a283100a 100644
--- a/cpan/Time-HiRes/Changes
+++ b/cpan/Time-HiRes/Changes
@@ -1,5 +1,14 @@
Revision history for the Perl extension Time::HiRes.
+1.9725 [2012-02-01]
+ - Correct stack discipline in stat(), which was screwing up list
+ operations in expressions containing calls to it [rt.cpan.org
+ #72926].
+ - Add missing OUTPUT sections to the XS code [rt.cpan.org #70930].
+ - Skip itimer tests on GNU/Hurd, which has the API but lacks
+ the implementation [rt.cpan.org #72754].
+ - Fix a doubled word in the documentation [rt.cpan.org #72763].
+
1.9724 [2011-06-09]
- Correct XS parameter list, and therefore prototype, for
unimplemented-on-this-platform version of clock_nanosleep()
diff --git a/cpan/Time-HiRes/HiRes.pm b/cpan/Time-HiRes/HiRes.pm
index 30f954a2ce..5223ba99e9 100644
--- a/cpan/Time-HiRes/HiRes.pm
+++ b/cpan/Time-HiRes/HiRes.pm
@@ -23,7 +23,7 @@ our @EXPORT_OK = qw (usleep sleep ualarm alarm gettimeofday time tv_interval
stat
);
-our $VERSION = '1.9724';
+our $VERSION = '1.9725';
our $XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
@@ -276,7 +276,7 @@ if an error occurred.
B<NOTE 1>: With some combinations of operating systems and Perl
releases C<SIGALRM> restarts C<select()>, instead of interrupting it.
This means that an C<alarm()> followed by a C<select()> may together
-take the sum of the times specified for the the C<alarm()> and the
+take the sum of the times specified for the C<alarm()> and the
C<select()>, not just the time of the C<alarm()>.
Note that the interaction between alarms and sleeps is unspecified.
@@ -586,7 +586,7 @@ Copyright (c) 1996-2002 Douglas E. Wegscheid. All rights reserved.
Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Jarkko Hietaniemi.
All rights reserved.
-Copyright (C) 2011 Andrew Main (Zefram) <zefram@fysh.org>
+Copyright (C) 2011, 2012 Andrew Main (Zefram) <zefram@fysh.org>
This program is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
diff --git a/cpan/Time-HiRes/HiRes.xs b/cpan/Time-HiRes/HiRes.xs
index 32ac768861..64e63d6b13 100644
--- a/cpan/Time-HiRes/HiRes.xs
+++ b/cpan/Time-HiRes/HiRes.xs
@@ -5,7 +5,7 @@
* Copyright (c) 2002-2010 Jarkko Hietaniemi.
* All rights reserved.
*
- * Copyright (C) 2011 Andrew Main (Zefram) <zefram@fysh.org>
+ * Copyright (C) 2011, 2012 Andrew Main (Zefram) <zefram@fysh.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the same terms as Perl itself.
@@ -849,6 +849,8 @@ nanosleep(nsec)
CODE:
croak("Time::HiRes::nanosleep(): unimplemented in this platform");
RETVAL = 0.0;
+ OUTPUT:
+ RETVAL
#endif /* #if defined(TIME_HIRES_NANOSLEEP) */
@@ -897,6 +899,8 @@ usleep(useconds)
CODE:
croak("Time::HiRes::usleep(): unimplemented in this platform");
RETVAL = 0.0;
+ OUTPUT:
+ RETVAL
#endif /* #if defined(HAS_USLEEP) && defined(HAS_GETTIMEOFDAY) */
@@ -969,6 +973,8 @@ ualarm(useconds,interval=0)
CODE:
croak("Time::HiRes::ualarm(): unimplemented in this platform");
RETVAL = -1;
+ OUTPUT:
+ RETVAL
NV
alarm(seconds,interval=0)
@@ -977,6 +983,8 @@ alarm(seconds,interval=0)
CODE:
croak("Time::HiRes::alarm(): unimplemented in this platform");
RETVAL = 0.0;
+ OUTPUT:
+ RETVAL
#endif /* #ifdef HAS_UALARM */
@@ -1132,6 +1140,8 @@ clock_gettime(clock_id = 0)
CODE:
croak("Time::HiRes::clock_gettime(): unimplemented in this platform");
RETVAL = 0.0;
+ OUTPUT:
+ RETVAL
#endif /* #if defined(TIME_HIRES_CLOCK_GETTIME) */
@@ -1162,6 +1172,8 @@ clock_getres(clock_id = 0)
CODE:
croak("Time::HiRes::clock_getres(): unimplemented in this platform");
RETVAL = 0.0;
+ OUTPUT:
+ RETVAL
#endif /* #if defined(TIME_HIRES_CLOCK_GETRES) */
@@ -1200,6 +1212,8 @@ clock_nanosleep(clock_id, nsec, flags = 0)
CODE:
croak("Time::HiRes::clock_nanosleep(): unimplemented in this platform");
RETVAL = 0.0;
+ OUTPUT:
+ RETVAL
#endif /* #if defined(TIME_HIRES_CLOCK_NANOSLEEP) && defined(TIMER_ABSTIME) */
@@ -1223,6 +1237,8 @@ clock()
CODE:
croak("Time::HiRes::clock(): unimplemented in this platform");
RETVAL = 0.0;
+ OUTPUT:
+ RETVAL
#endif /* #if defined(TIME_HIRES_CLOCK) && defined(CLOCKS_PER_SEC) */
@@ -1230,7 +1246,6 @@ void
stat(...)
PROTOTYPE: ;$
PPCODE:
- PUSHMARK(SP);
XPUSHs(sv_2mortal(newSVsv(items == 1 ? ST(0) : DEFSV)));
PUTBACK;
ENTER;
diff --git a/cpan/Time-HiRes/t/itimer.t b/cpan/Time-HiRes/t/itimer.t
index 7877f6364d..a9ef80d0a4 100644
--- a/cpan/Time-HiRes/t/itimer.t
+++ b/cpan/Time-HiRes/t/itimer.t
@@ -18,6 +18,7 @@ BEGIN {
&& $Config{sig_name} =~ m/\bVTALRM\b/
&& $^O ne 'nto' # nto: QNX 6 has the API but no implementation
&& $^O ne 'haiku' # haiku: has the API but no implementation
+ && $^O ne 'gnu' # GNU/Hurd: has the API but no implementation
) {
require Test::More;
Test::More::plan(skip_all => "no itimer");
diff --git a/cpan/Time-HiRes/t/stat.t b/cpan/Time-HiRes/t/stat.t
index 406fdc31ca..4b81561f40 100644
--- a/cpan/Time-HiRes/t/stat.t
+++ b/cpan/Time-HiRes/t/stat.t
@@ -13,12 +13,11 @@ BEGIN {
}
}
-use Test::More 0.82 tests => 1;
+use Test::More 0.82 tests => 16;
use t::Watchdog;
my $limit = 0.25; # 25% is acceptable slosh for testing timers
-my @stat;
my @atime;
my @mtime;
for (1..5) {
@@ -26,14 +25,17 @@ for (1..5) {
open(X, ">$$");
print X $$;
close(X);
- @stat = Time::HiRes::stat($$);
- push @mtime, $stat[9];
+ my($a, $stat, $b) = ("a", [Time::HiRes::stat($$)], "b");
+ is $a, "a";
+ is $b, "b";
+ is ref($stat), "ARRAY";
+ push @mtime, $stat->[9];
Time::HiRes::sleep(rand(0.1) + 0.1);
open(X, "<$$");
<X>;
close(X);
- @stat = Time::HiRes::stat($$);
- push @atime, $stat[8];
+ $stat = [Time::HiRes::stat($$)];
+ push @atime, $stat->[8];
}
1 while unlink $$;
note "mtime = @mtime";
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 98441151f0..24e1914363 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -178,6 +178,12 @@ L<Pod::Parser> has been upgraded from version 1.37 to version 1.51.
=item *
+L<Time::HiRes> has been upgraded from version 1.9724 to version 1.9725.
+
+There is an important bugfix for C<Time::HiRes::stat()>.
+
+=item *
+
L<Unicode::UCD> has been upgraded from version 0.39 to 0.40.
The only change is to fix a formatting error in the Pod.