[EventLoop] Add a method to check the status of a timer.

nrk · nrk · commit 7e7cc49fdab0 · 2013-01-12T18:06:23.000+01:00
diff --git a/LibEvLoop.php b/LibEvLoop.php
@@ -138,6 +138,11 @@ private function setupTimer(TimerInterface $timer)
         return $timer;
     }
 
+    public function isTimerActive(TimerInterface $timer)
+    {
+        return $this->timers->contains($timer);
+    }
+
     public function tick()
     {
         $this->loop->run(\libev\EventLoop::RUN_ONCE);
diff --git a/LibEventLoop.php b/LibEventLoop.php
@@ -203,6 +203,11 @@ public function cancelTimer(TimerInterface $timer)
         }
     }
 
+    public function isTimerActive(TimerInterface $timer)
+    {
+        return $this->timers->contains($timer);
+    }
+
     public function tick()
     {
         event_base_loop($this->base, EVLOOP_ONCE | EVLOOP_NONBLOCK);
diff --git a/LoopInterface.php b/LoopInterface.php
@@ -16,6 +16,7 @@ public function removeStream($stream);
     public function addTimer($interval, $callback);
     public function addPeriodicTimer($interval, $callback);
     public function cancelTimer(TimerInterface $timer);
+    public function isTimerActive(TimerInterface $timer);
 
     public function tick();
     public function run();
diff --git a/StreamSelectLoop.php b/StreamSelectLoop.php
@@ -89,6 +89,11 @@ public function cancelTimer(TimerInterface $timer)
         $this->timers->cancel($timer);
     }
 
+    public function isTimerActive(TimerInterface $timer)
+    {
+        return $this->timers->contains($timer);
+    }
+
     protected function getNextEventTimeInMicroSeconds()
     {
         $nextEvent = $this->timers->getFirst();
diff --git a/Timer/Timer.php b/Timer/Timer.php
@@ -56,6 +56,11 @@ public function isPeriodic()
         return $this->periodic;
     }
 
+    public function isActive()
+    {
+        return $this->loop->isTimerActive($this);
+    }
+
     public function cancel()
     {
         $this->loop->cancelTimer($this);
diff --git a/Timer/TimerInterface.php b/Timer/TimerInterface.php
@@ -10,5 +10,6 @@ public function getCallback();
     public function setData($data);
     public function getData();
     public function isPeriodic();
+    public function isActive();
     public function cancel();
 }
diff --git a/Timer/Timers.php b/Timer/Timers.php
@@ -45,6 +45,11 @@ public function add(TimerInterface $timer)
         $this->scheduler->insert($timer, -$scheduledAt);
     }
 
+    public function contains(TimerInterface $timer)
+    {
+        return $this->timers->contains($timer);
+    }
+
     public function cancel(TimerInterface $timer)
     {
         $this->timers->detach($timer);

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,11 @@ private function setupTimer(TimerInterface $timer)`
`138`	`138`	`return $timer;`
`139`	`139`	`}`
`140`	`140`
	`141`	`+ public function isTimerActive(TimerInterface $timer)`
	`142`	`+ {`
	`143`	`+ return $this->timers->contains($timer);`
	`144`	`+ }`
	`145`	`+`
`141`	`146`	`public function tick()`
`142`	`147`	`{`
`143`	`148`	`$this->loop->run(\libev\EventLoop::RUN_ONCE);`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,11 @@ public function cancelTimer(TimerInterface $timer)`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
	`206`	`+ public function isTimerActive(TimerInterface $timer)`
	`207`	`+ {`
	`208`	`+ return $this->timers->contains($timer);`
	`209`	`+ }`
	`210`	`+`
`206`	`211`	`public function tick()`
`207`	`212`	`{`
`208`	`213`	`event_base_loop($this->base, EVLOOP_ONCE \| EVLOOP_NONBLOCK);`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,11 @@ public function cancelTimer(TimerInterface $timer)`
`89`	`89`	`$this->timers->cancel($timer);`
`90`	`90`	`}`
`91`	`91`
	`92`	`+ public function isTimerActive(TimerInterface $timer)`
	`93`	`+ {`
	`94`	`+ return $this->timers->contains($timer);`
	`95`	`+ }`
	`96`	`+`
`92`	`97`	`protected function getNextEventTimeInMicroSeconds()`
`93`	`98`	`{`
`94`	`99`	`$nextEvent = $this->timers->getFirst();`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,11 @@ public function isPeriodic()`
`56`	`56`	`return $this->periodic;`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ public function isActive()`
	`60`	`+ {`
	`61`	`+ return $this->loop->isTimerActive($this);`
	`62`	`+ }`
	`63`	`+`
`59`	`64`	`public function cancel()`
`60`	`65`	`{`
`61`	`66`	`$this->loop->cancelTimer($this);`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@ public function getCallback();`
`10`	`10`	`public function setData($data);`
`11`	`11`	`public function getData();`
`12`	`12`	`public function isPeriodic();`
	`13`	`+ public function isActive();`
`13`	`14`	`public function cancel();`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,11 @@ public function add(TimerInterface $timer)`
`45`	`45`	`$this->scheduler->insert($timer, -$scheduledAt);`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ public function contains(TimerInterface $timer)`
	`49`	`+ {`
	`50`	`+ return $this->timers->contains($timer);`
	`51`	`+ }`
	`52`	`+`
`48`	`53`	`public function cancel(TimerInterface $timer)`
`49`	`54`	`{`
`50`	`55`	`$this->timers->detach($timer);`