database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix regression on pushbuild 1. The cygwin perl is ancient there, and Net::Ping does not have port_number method (port_number was introduced around 2007). The fix is to check if port_number is present. Otherwise, fallback to the slow connect().

Browse Source
This commit is contained in:
Vladislav Vaintroub
2009-05-08 01:10:53 +02:00
parent 92637e32d2
commit 2ba1012fdf
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mysql-test/lib/mtr_process.pl
View File

@ -24,7 +24,22 @@ use Errno;
use My::Platform; use My::Platform;
use if IS_WINDOWS, "Net::Ping"; use if IS_WINDOWS, "Net::Ping";
# Ancient perl might not have port_number method for Net::Ping.
# Check it and use fallback to connect() if it is not present.
BEGIN
{
my $use_netping= 0;
if (IS_WINDOWS)
{
my $ping = Net::Ping->new();
if ($ping->can("port_number"))
{
$use_netping= 1;
}
}
eval 'sub USE_NETPING { $use_netping }';
}
sub sleep_until_file_created ($$$); sub sleep_until_file_created ($$$);
sub mtr_ping_port ($); sub mtr_ping_port ($);
@ -33,22 +48,21 @@ sub mtr_ping_port ($) {
mtr_verbose("mtr_ping_port: $port"); mtr_verbose("mtr_ping_port: $port");
if (IS_WINDOWS) if (IS_WINDOWS && USE_NETPING)
{ {
# Under Windows, connect to a port that is not open is slow # Under Windows, connect to a port that is not open is slow
# It takes ~1sec. Net::Ping with small timeout is much faster. # It takes ~1sec. Net::Ping with small timeout is much faster.
my $ping = Net::Ping->new(); my $ping = Net::Ping->new();
$ping->port_number($port); $ping->port_number($port);
if ($ping->ping("localhost",0.1)) if ($ping->ping("localhost",0.1))
{ {
mtr_verbose("USED"); mtr_verbose("USED");
return 1; return 1;
} }
else else
{ {
mtr_verbose("FREE"); mtr_verbose("FREE");
return 0; return 0;
} }
} }