Skip to content
This repository was archived by the owner on Jun 1, 2023. It is now read-only.

Commit e0ad83c

Browse files
committed
Time-HiRes: Update to 1.9744_01
upstream: - add more potential clock constants, like CLOCK_MONOTONIC_FAST (available in FreeBSD), and not all potentially found clock constants were properly exported to be available from Perl, see your system's clock_gettime() documentation for the available ones - correct declared minimum Perl version (should be 5.6, was declared as 5.8 since 1.9727_03): blead af94b3a - fix the fix for 'do file' to load hints in Makefile.PL: blead 3172fdb merged with our cperl test fixes. See https://github.com/rurban/Time-HiRes/tree/cperl
1 parent d23f5d4 commit e0ad83c

File tree

8 files changed

+97
-41
lines changed

8 files changed

+97
-41
lines changed

Porting/Maintainers.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,7 @@ package Maintainers;
15081508
},
15091509

15101510
'Time::HiRes' => {
1511-
'DISTRIBUTION' => 'JHI/Time-HiRes-1.9742.tar.gz',
1511+
'DISTRIBUTION' => 'JHI/Time-HiRes-1.9744.tar.gz',
15121512
'FILES' => q[dist/Time-HiRes],
15131513
# for overly slow smokers. See https://github.com/rurban/Time-HiRes
15141514
'CUSTOMIZED' => [ qw( HiRes.xs t/alarm.t t/clock.t t/itimer.t

dist/Module-CoreList/lib/Module/CoreList.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14997,6 +14997,7 @@ our %delta = (
1499714997
'SelectSaver' => '1.02_01',
1499814998
'threads' => '2.16_01',
1499914999
'threads::shared' => '1.57',
15000+
'Time::HiRes' => '1.9744_01',
1500015001
'VMS::Studio' => '2.41_01',
1500115002
},
1500215003
removed => {

dist/Time-HiRes/Changes

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
Revision history for the Perl extension Time::HiRes.
22

3+
1.9744 [2017-07-27]
4+
- add more potential clock constants, like CLOCK_MONOTONIC_FAST
5+
(available in FreeBSD), and not all potentially found clock
6+
constants were properly exported to be available from Perl,
7+
see your system's clock_gettime() documentation for the available ones
8+
9+
1.9743 [2017-07-20]
10+
- correct declared minimum Perl version (should be 5.6, was declared
11+
as 5.8 since 1.9727_03): blead af94b3ac
12+
- fix the fix for 'do file' to load hints in Makefile.PL: blead 3172fdbc
13+
314
1.9742 [2017-04-16]
415
- prefer 3-argument open: blead 1ae6ead9
516
- fix dist/Time-HiRes/t/*.t that assumed '.' in @INC: blead 465db51d

dist/Time-HiRes/HiRes.pm

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,48 @@ require DynaLoader;
99
our @ISA = qw(Exporter DynaLoader);
1010

1111
our @EXPORT = qw( );
12+
# More or less this same list is in Makefile.PL. Should unify.
1213
our @EXPORT_OK = qw (usleep sleep ualarm alarm gettimeofday time tv_interval
1314
getitimer setitimer nanosleep clock_gettime clock_getres
1415
clock clock_nanosleep
15-
CLOCK_BOOTTIME CLOCK_HIGHRES
16-
CLOCK_MONOTONIC CLOCK_MONOTONIC_COARSE
17-
CLOCK_MONOTONIC_PRECISE CLOCK_MONOTONIC_RAW
16+
CLOCKS_PER_SEC
17+
CLOCK_BOOTTIME
18+
CLOCK_HIGHRES
19+
CLOCK_MONOTONIC
20+
CLOCK_MONOTONIC_COARSE
21+
CLOCK_MONOTONIC_FAST
22+
CLOCK_MONOTONIC_PRECISE
23+
CLOCK_MONOTONIC_RAW
1824
CLOCK_PROCESS_CPUTIME_ID
19-
CLOCK_REALTIME CLOCK_REALTIME_COARSE
20-
CLOCK_REALTIME_FAST CLOCK_REALTIME_PRECISE
21-
CLOCK_SECOND CLOCK_SOFTTIME CLOCK_THREAD_CPUTIME_ID
22-
CLOCK_TIMEOFDAY CLOCKS_PER_SEC
23-
ITIMER_REAL ITIMER_VIRTUAL ITIMER_PROF ITIMER_REALPROF
25+
CLOCK_PROF
26+
CLOCK_REALTIME
27+
CLOCK_REALTIME_COARSE
28+
CLOCK_REALTIME_FAST
29+
CLOCK_REALTIME_PRECISE
30+
CLOCK_REALTIME_RAW
31+
CLOCK_SECOND
32+
CLOCK_SOFTTIME
33+
CLOCK_THREAD_CPUTIME_ID
34+
CLOCK_TIMEOFDAY
35+
CLOCK_UPTIME
36+
CLOCK_UPTIME_COARSE
37+
CLOCK_UPTIME_FAST
38+
CLOCK_UPTIME_PRECISE
39+
CLOCK_UPTIME_RAW
40+
CLOCK_VIRTUAL
41+
ITIMER_PROF
42+
ITIMER_REAL
43+
ITIMER_REALPROF
44+
ITIMER_VIRTUAL
2445
TIMER_ABSTIME
2546
d_usleep d_ualarm d_gettimeofday d_getitimer d_setitimer
2647
d_nanosleep d_clock_gettime d_clock_getres d_hires_utime
2748
d_clock d_clock_nanosleep
2849
stat lstat utime
2950
);
3051

31-
our $VERSION = '1.9742_01';
52+
53+
our $VERSION = '1.9744_01';
3254
our $XS_VERSION = $VERSION;
3355
$VERSION = eval $VERSION;
3456

dist/Time-HiRes/Makefile.PL

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -417,11 +417,11 @@ sub DEFINE {
417417
}
418418

419419
sub init {
420-
my $hints = File::Spec->catfile(".", "hints", "$^O.pl");
420+
my $hints = File::Spec->catfile("hints", "$^O.pl");
421421
if (-f $hints) {
422422
print "Using hints $hints...\n";
423423
local $self;
424-
do $hints;
424+
do "./$hints";
425425
if (exists $self->{LIBS}) {
426426
$LIBS = $self->{LIBS};
427427
print "Extra libraries: @$LIBS...\n";
@@ -609,7 +609,7 @@ EOD
609609
} elsif (defined $SYSCALL_H && has_clock_xxx_syscall('gettime')) {
610610
$has_clock_gettime++;
611611
$DEFINE .= ' -DTIME_HIRES_CLOCK_GETTIME -DTIME_HIRES_CLOCK_GETTIME_SYSCALL';
612-
} elsif ($^O eq 'darwin') { # no CLOCK_REALTIME
612+
} elsif ($^O eq 'darwin') {
613613
$has_clock_gettime_emulation++;
614614
$has_clock_gettime++;
615615
$DEFINE .= ' -DTIME_HIRES_CLOCK_GETTIME -DTIME_HIRES_CLOCK_GETTIME_EMULATION';
@@ -936,7 +936,7 @@ sub doMakefile {
936936
}
937937

938938
if ($ExtUtils::MakeMaker::VERSION >= 6.48) {
939-
push @makefileopts, (MIN_PERL_VERSION => '5.008',);
939+
push @makefileopts, (MIN_PERL_VERSION => '5.006',);
940940
}
941941

942942
if ($ExtUtils::MakeMaker::VERSION >= 6.31) {
@@ -948,31 +948,38 @@ sub doMakefile {
948948

949949
sub doConstants {
950950
if (eval {require ExtUtils::Constant; 1}) {
951+
# More or less this same list is in HiRes.pm. Should unify.
951952
my @names = qw(
952-
CLOCKS_PER_SEC
953-
CLOCK_BOOTTIME
954-
CLOCK_HIGHRES
955-
CLOCK_MONOTONIC
956-
CLOCK_MONOTONIC_COARSE
957-
CLOCK_MONOTONIC_PRECISE
958-
CLOCK_MONOTONIC_RAW
959-
CLOCK_PROCESS_CPUTIME_ID
960-
CLOCK_REALTIME
961-
CLOCK_REALTIME_COARSE
962-
CLOCK_REALTIME_FAST
963-
CLOCK_REALTIME_PRECISE
964-
CLOCK_SECOND
965-
CLOCK_SOFTTIME
966-
CLOCK_THREAD_CPUTIME_ID
967-
CLOCK_TIMEOFDAY
968-
CLOCK_UPTIME
969-
CLOCK_UPTIME_FAST
970-
CLOCK_UPTIME_PRECISE
971-
ITIMER_PROF
972-
ITIMER_REAL
973-
ITIMER_REALPROF
974-
ITIMER_VIRTUAL
975-
TIMER_ABSTIME
953+
CLOCKS_PER_SEC
954+
CLOCK_BOOTTIME
955+
CLOCK_HIGHRES
956+
CLOCK_MONOTONIC
957+
CLOCK_MONOTONIC_COARSE
958+
CLOCK_MONOTONIC_FAST
959+
CLOCK_MONOTONIC_PRECISE
960+
CLOCK_MONOTONIC_RAW
961+
CLOCK_PROF
962+
CLOCK_PROCESS_CPUTIME_ID
963+
CLOCK_REALTIME
964+
CLOCK_REALTIME_COARSE
965+
CLOCK_REALTIME_FAST
966+
CLOCK_REALTIME_PRECISE
967+
CLOCK_REALTIME_RAW
968+
CLOCK_SECOND
969+
CLOCK_SOFTTIME
970+
CLOCK_THREAD_CPUTIME_ID
971+
CLOCK_TIMEOFDAY
972+
CLOCK_UPTIME
973+
CLOCK_UPTIME_COARSE
974+
CLOCK_UPTIME_FAST
975+
CLOCK_UPTIME_PRECISE
976+
CLOCK_UPTIME_RAW
977+
CLOCK_VIRTUAL
978+
ITIMER_PROF
979+
ITIMER_REAL
980+
ITIMER_REALPROF
981+
ITIMER_VIRTUAL
982+
TIMER_ABSTIME
976983
);
977984
foreach (qw (d_usleep d_ualarm d_gettimeofday d_getitimer d_setitimer
978985
d_nanosleep d_clock_gettime d_clock_getres

dist/Time-HiRes/t/nanosleep.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SKIP: {
3838
ok(1, "skip nanosleep test on overly slow smoker. slept $d secs, not 0.5 secs");
3939
} else {
4040
ok ($d > 0.4 && $d < 0.9, "slept $d secs of 0.5 secs") or diag "slept $d secs $f to $f2";
41-
}
41+
}
4242
}
4343

4444
1;

pod/perlcdelta.pod

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,21 @@ Keep our modglobal fix in global destruction from 2.12_01.
250250
Fix Clang macro backward compatibility per patch by Andy Grundman.
251251
RT #131124 Memory allocation fix.
252252

253+
=item L<Time::HiRes> 1.9744_01
254+
255+
upstream:
256+
257+
add more potential clock constants, like CLOCK_MONOTONIC_FAST
258+
(available in FreeBSD), and not all potentially found clock constants
259+
were properly exported to be available from Perl, see your system's
260+
clock_gettime() documentation for the available ones
261+
262+
correct declared minimum Perl version (should be 5.6, was declared as
263+
5.8 since 1.9727_03): blead af94b3ac
264+
265+
merged with our cperl test fixes.
266+
See L<https://github.com/rurban/Time-HiRes/tree/cperl>
267+
253268
=item L<VMS::Studio> 2.41_01
254269

255270
Bump version

t/porting/customized.dat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Math::BigRat cpan/Math-BigRat/t/bigfltpm.inc 8000c7057453138ff48cf4cba61f0f4a1db
9999
Math::BigRat cpan/Math-BigRat/t/bigfltrt.t 5508d55216c52caf26aa2e6478691c50b7856e7d
100100
Math::BigRat cpan/Math-BigRat/t/bigratpm.t cfd770aabeaf6b742fd942143e816db42db04fba
101101
Memoize cpan/Memoize/t/expmod_t.t 9386100cd9c95a0e8a4e001bba3aa52eec114d21
102-
Module::CoreList dist/Module-CoreList/lib/Module/CoreList.pm a71be7059bc3e4359f0ec70443d1881542b96271
102+
Module::CoreList dist/Module-CoreList/lib/Module/CoreList.pm cae7832d4b965963cf157e575aaf5f69907bbfc3
103103
Module::CoreList dist/Module-CoreList/lib/Module/CoreList/Utils.pm aaf6dc4c3bf487271e7104e5ce5e0bc66f711e00
104104
Module::Metadata cpan/Module-Metadata/t/lib/GeneratePackage.pm 502ffbe2609947430e6aa1a3df8064b3fef3e086
105105
Net::Domain cpan/libnet/lib/Net/Cmd.pm 70a007c38833667ad47ea8059c37c1b7d1c77b6c
@@ -124,7 +124,7 @@ Time::HiRes dist/Time-HiRes/HiRes.xs 0fda2e23eade1f3de981a9264596fcf11ebbaca4
124124
Time::HiRes dist/Time-HiRes/t/alarm.t 1f19ec4a487abfc4725a6abfa44f1cf1d8cd8086
125125
Time::HiRes dist/Time-HiRes/t/clock.t acb2497e55facb882c41154805e917d1dbe5377c
126126
Time::HiRes dist/Time-HiRes/t/itimer.t 659db22bc635177b130e0478aef1fd5e1edf0b6d
127-
Time::HiRes dist/Time-HiRes/t/nanosleep.t d7b7a510d0f7c99fb8e647a961f1efb09cc033ca
127+
Time::HiRes dist/Time-HiRes/t/nanosleep.t 91ff108217547361a527f5438a36c9e09faf7400
128128
Time::HiRes dist/Time-HiRes/t/usleep.t 573121cfdb26195ed22071e38d50dcdde3c49a66
129129
Time::HiRes dist/Time-HiRes/t/utime.t fc7bd0876a9d18c8a0fb104fc63c46489bd5ea7c
130130
Time::HiRes dist/Time-HiRes/typemap 4c0a40c7cd8dbde34c3122e8cf71b8a420bc64a4

0 commit comments

Comments
 (0)