database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Windows, mtr - correctly determine CPU count, for --parallel=auto

Browse Source
This commit is contained in:
Vladislav Vaintroub
2018-02-14 16:52:18 +00:00
parent c6e35276f1
commit 46496b1a8c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/mysql-test-run.pl
View File

@ -431,16 +431,21 @@ sub main {
my $num_tests= @$tests; my $num_tests= @$tests;
if ( $opt_parallel eq "auto" ) { if ( $opt_parallel eq "auto" ) {
# Try to find a suitable value for number of workers # Try to find a suitable value for number of workers
my $sys_info= My::SysInfo->new(); if (IS_WINDOWS)
{
$opt_parallel= $sys_info->num_cpus(); $opt_parallel= $ENV{NUMBER_OF_PROCESSORS} || 1;
for my $limit (2000, 1500, 1000, 500){ }
$opt_parallel-- if ($sys_info->min_bogomips() < $limit); else
{
my $sys_info= My::SysInfo->new();
$opt_parallel= $sys_info->num_cpus();
for my $limit (2000, 1500, 1000, 500){
$opt_parallel-- if ($sys_info->min_bogomips() < $limit);
}
} }
my $max_par= $ENV{MTR_MAX_PARALLEL} || 8; my $max_par= $ENV{MTR_MAX_PARALLEL} || 8;
$opt_parallel= $max_par if ($opt_parallel > $max_par); $opt_parallel= $max_par if ($opt_parallel > $max_par);
$opt_parallel= $num_tests if ($opt_parallel > $num_tests); $opt_parallel= $num_tests if ($opt_parallel > $num_tests);
$opt_parallel= 1 if (IS_WINDOWS and $sys_info->isvm());
$opt_parallel= 1 if ($opt_parallel < 1); $opt_parallel= 1 if ($opt_parallel < 1);
mtr_report("Using parallel: $opt_parallel"); mtr_report("Using parallel: $opt_parallel");
} }