8000 Ensure large timer interval does not overflow on 32bit systems by clue · Pull Request #132 · reactphp/event-loop · GitHub
[go: up one dir, main page]
Skip to content

Ensure large timer interval does not overflow on 32bit systems #132

8000
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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 4, 2017
Merged

Ensure large timer interval does not overflow on 32bit systems #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/StreamSelectLoop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@ public function run()
if ($timeout < 0) {
$timeout = 0;
} else {
/*
* round() needed to correct float error:
* https://github.com/reactphp/event-loop/issues/48
*/
$timeout = round($timeout * self::MICROSECONDS_PER_SECOND);
// Convert float seconds to int microseconds.
// Ensure we do not exceed maximum integer size, which may
// cause the loop to tick once every ~35min on 32bit systems.
$timeout *= self::MICROSECONDS_PER_SECOND;
$timeout = $timeout > PHP_INT_MAX ? PHP_INT_MAX : (int)$timeout;
}

// The only possible event is stream activity, so wait forever ...
Expand All @@ -213,6 +213,8 @@ public function stop()

/**
* Wait/check for stream activity, or until the next timer is due.
*
* @param integer|null $timeout Activity timeout in microseconds, or null to wait forever.
*/
private function waitForStreamActivity($timeout)
{
Expand Down
17 changes: 17 additions & 0 deletions tests/AbstractLoopTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,23 @@ public function testSignalsKeepTheLoopRunningAndRemovingItStopsTheLoop()
$this->assertRunFasterThan(1.6);
}

public function testTimerIntervalCanBeFarInFuture()
{
// get only one part of the pair to ensure the other side will close immediately
list($stream) = $this->createSocketPair();

// start a timer very far in the future
$timer = $this->loop->addTimer(PHP_INT_MAX, function () { });

// remove stream and timer when the stream is readable (closes)
$this->loop->addReadStream($stream, function ($stream) use ($timer) {
$this->loop->removeReadStream($stream);
$this->loop->cancelTimer($timer);
});

$this->assertRunFasterThan($this->tickTimeout);
}

private function assertRunSlowerThan($minInterval)
{
$start = microtime(true);
Expand Down
33 changes: 0 additions & 33 deletions tests/StreamSelectLoopTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use React\EventLoop\LoopInterface;
use React\EventLoop\StreamSelectLoop;
use React\EventLoop\Timer\Timer;

class StreamSelectLoopTest extends AbstractLoopTest
{
Expand Down Expand Up @@ -144,36 +143,4 @@ protected function forkSendSignal($signal)
die();
}
}

/**
* https://github.com/reactphp/event-loop/issues/48
*
* Tests that timer with very small interval uses at least 1 microsecond
* timeout.
*/
public function testSmallTimerInterval()
{
/** @var StreamSelectLoop|\PHPUnit_Framework_MockObject_MockObject $loop */
$loop = $this->getMockBuilder('React\EventLoop\StreamSelectLoop')
->setMethods(['streamSelect'])
->getMock();
$loop
->expects($this->at(0))
->method('streamSelect')
->with([], [], 1);
$loop
->expects($this->at(1))
->method('streamSelect')
->with([], [], 0);

$callsCount = 0;
$loop->addPeriodicTimer(Timer::MIN_INTERVAL, function() use (&$loop, &$callsCount) {
$callsCount++;
if ($callsCount == 2) {
$loop->stop();
}
});

$loop->run();
}
}
0