Commit e40ed0e8 authored by Sergei Golubchik's avatar Sergei Golubchik

fix incorrect merge

parent 06219c2a
......@@ -614,11 +614,7 @@ sub main {
else
{
my $sys_info= My::SysInfo->new();
$opt_parallel= $sys_info->num_cpus() +
int($sys_info->min_bogomips()/500) - 4;
for my $limit (2000, 1500, 1000, 500){
$opt_parallel-- if ($sys_info->min_bogomips() < $limit);
}
$opt_parallel= $sys_info->num_cpus()+int($sys_info->min_bogomips()/500)-4;
}
my $max_par= $ENV{MTR_MAX_PARALLEL} || 8;
$opt_parallel= $max_par if ($opt_parallel > $max_par);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment