romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 23:43:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests: try to make sleeping portable by avoiding select

Browse source 
select does not support just waiting on Windows:
https://perldoc.perl.org/perlport.html#select

Reviewed-By: Daniel Stenberg
Closes #5035
This commit is contained in:
Marc Hoersken 2020-03-04 11:44:49 +01:00
parent 1eecb0e022
commit 9aaca09044
No known key found for this signature in database
GPG key ID: 61E03CBED7BC859E
3 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

33
tests/ftp.pm
View file

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@ -20,6 +20,14 @@
#
###########################################################################
BEGIN {
# portable sleeping needs Time::HiRes
eval {
no warnings "all";
require Time::HiRes;
}
}
use strict;
use warnings;
@ -29,6 +37,27 @@ use serverhelp qw(
datasockf_pidfilename
);
#######################################################################
# portable_sleep uses Time::HiRes::sleep if available and falls back
# to the classic approach of using select(undef, undef, undef, ...).
# even though that one is not portable due to being implemented using
# select on Windows: https://perldoc.perl.org/perlport.html#select
# On Windows it also just uses full-second sleep for waits >1 second.
#
sub portable_sleep {
my ($seconds) = @_;
if($Time::HiRes::VERSION) {
Time::HiRes::sleep($seconds);
}
elsif ($seconds > 1 && ($^O eq 'MSWin32' || $^O eq 'msys')) {
sleep($seconds);
}
else {
select(undef, undef, undef, $seconds);
}
}
#######################################################################
# pidfromfile returns the pid stored in the given pidfile. The value
# of the returned pid will never be a negative value. It will be zero
@ -216,7 +245,7 @@ sub killpid {
}
}
last if(not scalar(@signalled));
select(undef, undef, undef, 0.05);
portable_sleep(0.05);
}
}