Skip to content

clean up some duplicated code related to TickQueue #28

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

Closed
drealecs wants to merge 1 commit into from
Closed

clean up some duplicated code related to TickQueue #28

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
7 changes: 3 additions & 4 deletions src/ExtEventLoop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
use Event;
use EventBase;
use EventConfig as EventBaseConfig;
use React\EventLoop\Tick\FutureTickQueue;
use React\EventLoop\Tick\NextTickQueue;
use React\EventLoop\Tick\TickQueue;
use React\EventLoop\Timer\Timer;
use React\EventLoop\Timer\TimerInterface;
use SplObjectStorage;
Expand All @@ -31,8 +30,8 @@ class ExtEventLoop implements LoopInterface
public function __construct(EventBaseConfig $config = null)
{
$this->eventBase = new EventBase($config);
$this->nextTickQueue = new NextTickQueue($this);
$this->futureTickQueue = new FutureTickQueue($this);
$this->nextTickQueue = new TickQueue($this);
$this->futureTickQueue = new TickQueue($this);
$this->timerEvents = new SplObjectStorage();

$this->createTimerCallback();
Expand Down
7 changes: 3 additions & 4 deletions src/LibEvLoop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
use libev\EventLoop;
use libev\IOEvent;
use libev\TimerEvent;
use React\EventLoop\Tick\FutureTickQueue;
use React\EventLoop\Tick\NextTickQueue;
use React\EventLoop\Tick\TickQueue;
use React\EventLoop\Timer\Timer;
use React\EventLoop\Timer\TimerInterface;
use SplObjectStorage;
Expand All @@ -28,8 +27,8 @@ class LibEvLoop implements LoopInterface
public function __construct()
{
$this->loop = new EventLoop();
$this->nextTickQueue = new NextTickQueue($this);
$this->futureTickQueue = new FutureTickQueue($this);
$this->nextTickQueue = new TickQueue($this);
$this->futureTickQueue = new TickQueue($this);
$this->timerEvents = new SplObjectStorage();
}

Expand Down
7 changes: 3 additions & 4 deletions src/LibEventLoop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

use Event;
use EventBase;
use React\EventLoop\Tick\FutureTickQueue;
use React\EventLoop\Tick\NextTickQueue;
use React\EventLoop\Tick\TickQueue;
use React\EventLoop\Timer\Timer;
use React\EventLoop\Timer\TimerInterface;
use SplObjectStorage;
Expand All @@ -32,8 +31,8 @@ class LibEventLoop implements LoopInterface
public function __construct()
{
$this->eventBase = event_base_new();
$this->nextTickQueue = new NextTickQueue($this);
$this->futureTickQueue = new FutureTickQueue($this);
$this->nextTickQueue = new TickQueue($this);
$this->futureTickQueue = new TickQueue($this);
$this->timerEvents = new SplObjectStorage();

$this->createTimerCallback();
Expand Down
7 changes: 3 additions & 4 deletions src/StreamSelectLoop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

namespace React\EventLoop;

use React\EventLoop\Tick\FutureTickQueue;
use React\EventLoop\Tick\NextTickQueue;
use React\EventLoop\Tick\TickQueue;
use React\EventLoop\Timer\Timer;
use React\EventLoop\Timer\TimerInterface;
use React\EventLoop\Timer\Timers;
Expand All @@ -26,8 +25,8 @@ class StreamSelectLoop implements LoopInterface

public function __construct()
{
$this->nextTickQueue = new NextTickQueue($this);
$this->futureTickQueue = new FutureTickQueue($this);
$this->nextTickQueue = new TickQueue($this);
$this->futureTickQueue = new TickQueue($this);
$this->timers = new Timers();
}

Expand Down
57 changes: 0 additions & 57 deletions src/Tick/NextTickQueue.php
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/Tick/FutureTickQueue.php → src/Tick/TickQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use React\EventLoop\LoopInterface;
use SplQueue;

class FutureTickQueue
class TickQueue
{
private $eventLoop;
private $queue;
Expand All @@ -20,7 +20,7 @@ public function __construct(LoopInterface $eventLoop)
}

/**
* Add a callback to be invoked on a future tick of the event loop.
* Add a callback to be invoked on a tick of the event loop.
*
* Callbacks are guaranteed to be executed in the order they are enqueued.
*
Expand Down