Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce --threads=max option value to automatically detect the number of CPU cores #1723

Merged
merged 3 commits into from
Sep 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 20 additions & 3 deletions src/Command/RunCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,20 @@
use Infection\Logger\GitHub\NoFilesInDiffToMutate;
use Infection\Metrics\MinMsiCheckFailed;
use Infection\Process\Runner\InitialTestsFailed;
use Infection\Resource\Processor\CpuCoresCountProvider;
use Infection\TestFramework\Coverage\XmlReport\NoLineExecutedInDiffLinesMode;
use Infection\TestFramework\TestFrameworkTypes;
use InvalidArgumentException;
use function is_numeric;
use function max;
use const PHP_SAPI;
use Psr\Log\LoggerInterface;
use function sprintf;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use function trim;
use Webmozart\Assert\Assert;

/**
* @internal
Expand Down Expand Up @@ -177,7 +181,7 @@ protected function configure(): void
self::OPTION_THREADS,
'j',
InputOption::VALUE_REQUIRED,
'Number of threads to use by the runner when executing the mutations',
'Number of threads to use by the runner when executing the mutations. Use "max" to auto calculate it.',
Container::DEFAULT_THREAD_COUNT
)
->addOption(
Expand Down Expand Up @@ -478,8 +482,7 @@ private function createContainer(IO $io, LoggerInterface $logger): Container
? Container::DEFAULT_TEST_FRAMEWORK_EXTRA_OPTIONS
: $testFrameworkExtraOptions,
$filter,
// TODO: more validation here?
(int) $input->getOption(self::OPTION_THREADS),
$this->getThreadCount($input),
// To keep in sync with Container::DEFAULT_DRY_RUN
(bool) $input->getOption(self::OPTION_DRY_RUN),
$gitDiffFilter,
Expand Down Expand Up @@ -643,4 +646,18 @@ private function getUseGitHubLogger(InputInterface $input): ?bool
self::OPTION_LOGGER_GITHUB
));
}

private function getThreadCount(InputInterface $input): int
{
$threads = $input->getOption(self::OPTION_THREADS);

if (is_numeric($threads)) {
return (int) $threads;
}

Assert::same($threads, 'max', sprintf('The value of option `--threads` must be of type integer or string "max". String "%s" provided.', $threads));

// we subtract 1 here to not use all the available cores by Infection
return max(1, CpuCoresCountProvider::provide() - 1);
}
}
99 changes: 99 additions & 0 deletions src/Resource/Processor/CpuCoresCountProvider.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?php
/**
* This code is licensed under the BSD 3-Clause License.
*
* Copyright (c) 2017, Maks Rafalko
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* * Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

declare(strict_types=1);

namespace Infection\Resource\Processor;

use function defined;
use function extension_loaded;
use const FILTER_VALIDATE_INT;
use function filter_var;
use function function_exists;
use function is_int;
use function is_readable;
use function Safe\file_get_contents;
use function Safe\shell_exec;
use function substr_count;
use function trim;

/**
* @internal
*/
final class CpuCoresCountProvider
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think of CpuInfo::getCount() as a name instead?

{
/**
* Copied and adapter from Psalm project: https://github.com/vimeo/psalm/blob/4.x/src/Psalm/Internal/Analyzer/ProjectAnalyzer.php#L1454
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any chance Psalm is willing to extract it to a dedicated package? Otherwise provided they would be interested in a package, I'd be happy to provide one

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be interesting as some sort of tiny "system information" HAL package which could be reused across the ecosystem indeed. 👍

*/
public static function provide(): int
{
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be worth caching the result? Although I don't expect it to be called twice, you also don't expect the system to change the number of CPU cores available within the same process and it's only a int value

return 1;
}

if (!extension_loaded('pcntl') || !function_exists('shell_exec')) {
return 1;
}

// for Linux
$hasNproc = trim(@shell_exec('command -v nproc'));

if ($hasNproc !== '') {
$nproc = trim(shell_exec('nproc'));
$cpuCount = filter_var($nproc, FILTER_VALIDATE_INT);

if (is_int($cpuCount)) {
return $cpuCount;
}
}

// for MacOS
$ncpu = trim(shell_exec('sysctl -n hw.ncpu'));
maks-rafalko marked this conversation as resolved.
Show resolved Hide resolved
$cpuCount = filter_var($ncpu, FILTER_VALIDATE_INT);

if (is_int($cpuCount)) {
return $cpuCount;
}

if (is_readable('/proc/cpuinfo')) {
$cpuInfo = file_get_contents('/proc/cpuinfo');
$cpuCount = substr_count($cpuInfo, 'processor');

if ($cpuCount > 0) {
return $cpuCount;
}
}

return 1;
}
}
4 changes: 2 additions & 2 deletions tests/phpunit/AutoReview/ProjectCode/ProjectCodeProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
use function in_array;
use Infection\CannotBeInstantiated;
use Infection\Command\ConfigureCommand;
use Infection\Command\RunCommand;
use Infection\Config\ConsoleHelper;
use Infection\Config\Guesser\SourceDirGuesser;
use Infection\Configuration\Schema\SchemaConfigurationFactory;
Expand All @@ -66,6 +65,7 @@
use Infection\Mutator\NodeMutationGenerator;
use Infection\Process\Runner\IndexedProcessBearer;
use Infection\Process\ShellCommandLineExecutor;
use Infection\Resource\Processor\CpuCoresCountProvider;
use Infection\TestFramework\AdapterInstaller;
use Infection\TestFramework\Coverage\JUnit\TestFileTimeData;
use Infection\TestFramework\Coverage\NodeLineRangeData;
Expand Down Expand Up @@ -96,7 +96,6 @@ final class ProjectCodeProvider
*/
public const NON_TESTED_CONCRETE_CLASSES = [
ConfigureCommand::class,
RunCommand::class,
Application::class,
ProgressFormatter::class,
ComposerExecutableFinder::class,
Expand All @@ -113,6 +112,7 @@ final class ProjectCodeProvider
NullSubscriber::class,
FormatterName::class,
ShellCommandLineExecutor::class,
CpuCoresCountProvider::class,
];

/**
Expand Down
61 changes: 61 additions & 0 deletions tests/phpunit/Command/RunCommandTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?php
/**
* This code is licensed under the BSD 3-Clause License.
*
* Copyright (c) 2017, Maks Rafalko
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* * Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

declare(strict_types=1);

namespace Infection\Tests\Command;

use Infection\Console\Application;
use Infection\Tests\SingletonContainer;
use InvalidArgumentException;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Console\Tester\CommandTester;

/**
* @group integration
*/
final class RunCommandTest extends TestCase
{
public function test_it_fails_when_threads_value_is_string_but_not_max(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('The value of option `--threads` must be of type integer or string "max". String "abc" provided.');

$app = new Application(SingletonContainer::getContainer());

$tester = new CommandTester($app->find('run'));

$result = $tester->execute(['--threads' => 'abc']);
$this->assertSame(1, $result);
}
}