Resolve segfaulting issues with pecl-ev

steverhoades · steverhoades · commit b2b68c61b869 · 2014-09-06T14:04:33.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,10 @@ matrix:
   allow_failures:
     - php: hhvm
 
+before_script:
+    - sudo apt-get install gdb
+
 install: ./travis-init.sh
   
 script:
-  - phpunit --coverage-text
+    - phpunit --coverage-text
diff --git a/script.gdb b/script.gdb
@@ -0,0 +1,3 @@
+set env MALLOC_CHECK_=3
+run
+backtrace full
diff --git a/src/ExtEvLoop.php b/src/ExtEvLoop.php
@@ -16,6 +16,7 @@ class ExtEvLoop implements LoopInterface
     private $timers;
     private $readEvents     = array();
     private $writeEvents    = array();
+
     private $running        = false;
 
     public function __construct()
@@ -58,7 +59,7 @@ public function removeReadStream($stream)
     {
         $key = (int) $stream;
         if(isset($this->readEvents[$key])) {
-            $this->readEvents[$key]->stop();
+            $this->readEvents[$key]->stop();   
             unset($this->readEvents[$key]);
         }
     }
@@ -72,8 +73,8 @@ public function removeWriteStream($stream)
     {
         $key = (int) $stream;
         if(isset($this->writeEvents[$key])) {
-            $this->writeEvents[(int)$stream]->stop();
-            unset($this->writeEvents[(int)$stream]);
+            $this->writeEvents[$key]->stop();
+            unset($this->writeEvents[$key]);
         }
     }
 
@@ -147,7 +148,11 @@ public function cancelTimer(TimerInterface $timer)
         if (isset($this->timers[$timer])) {
             /* stop EvTimer */
             $this->timers[$timer]->stop();
-            $this->timers->detach($timer);
+
+            /* defer timer */
+            $this->nextTick(function() use ($timer) {
+                $this->timers->detach($timer);    
+            });
         }
     }
 
@@ -225,4 +230,20 @@ public function stop()
     {
         $this->running = false;
     }
+
+    public function __destruct()
+    {
+        // mannually stop all watchers
+        foreach($this->timers as $timer) {
+            $this->timers[$timer]->stop();            
+        }
+
+        foreach($this->readEvents as $event) {
+            $event->stop();
+        }
+
+        foreach($this->writeEvents as $event) {
+            $event->stop();
+        }
+    }
 }
diff --git a/tests/AbstractLoopTest.php b/tests/AbstractLoopTest.php
@@ -355,25 +355,6 @@ function () {
         $this->loop->run();
     }
 
-    public function testPeriodTimerExecutes()
-    {
-        $count = 0;
-        $this->loop->addPeriodicTimer(
-            0.001,
-            function ($timer) use (&$count) {
-                echo 'tick';
-                $count++;
-                if($count === 3) {
-                    $timer->cancel();
-                }
-            }
-        );
-
-        $this->expectOutputString('tickticktick');
-
-        $this->loop->run();        
-    }
-
     public function testFutureTick()
     {
         $called = false;
diff --git a/travis-init.sh b/travis-init.sh
@@ -27,6 +27,7 @@ if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then
     phpize
     ./configure
     make
+    # make test
     make install
     popd
     echo "extension=ev.so" >> "$(php -r 'echo php_ini_loaded_file();')"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+set env MALLOC_CHECK_=3`
	`2`	`+run`
	`3`	`+backtrace full`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ class ExtEvLoop implements LoopInterface`
`16`	`16`	`private $timers;`
`17`	`17`	`private $readEvents = array();`
`18`	`18`	`private $writeEvents = array();`
	`19`	`+`
`19`	`20`	`private $running = false;`
`20`	`21`
`21`	`22`	`public function __construct()`
`@@ -58,7 +59,7 @@ public function removeReadStream($stream)`
`58`	`59`	`{`
`59`	`60`	`$key = (int) $stream;`
`60`	`61`	`if(isset($this->readEvents[$key])) {`
`61`		`- $this->readEvents[$key]->stop();`
	`62`	`+ $this->readEvents[$key]->stop();`
`62`	`63`	`unset($this->readEvents[$key]);`
`63`	`64`	`}`
`64`	`65`	`}`
`@@ -72,8 +73,8 @@ public function removeWriteStream($stream)`
`72`	`73`	`{`
`73`	`74`	`$key = (int) $stream;`
`74`	`75`	`if(isset($this->writeEvents[$key])) {`
`75`		`- $this->writeEvents[(int)$stream]->stop();`
`76`		`- unset($this->writeEvents[(int)$stream]);`
	`76`	`+ $this->writeEvents[$key]->stop();`
	`77`	`+ unset($this->writeEvents[$key]);`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`
`@@ -147,7 +148,11 @@ public function cancelTimer(TimerInterface $timer)`
`147`	`148`	`if (isset($this->timers[$timer])) {`
`148`	`149`	`/* stop EvTimer */`
`149`	`150`	`$this->timers[$timer]->stop();`
`150`		`- $this->timers->detach($timer);`
	`151`	`+`
	`152`	`+ /* defer timer */`
	`153`	`+ $this->nextTick(function() use ($timer) {`
	`154`	`+ $this->timers->detach($timer);`
	`155`	`+ });`
`151`	`156`	`}`
`152`	`157`	`}`
`153`	`158`
`@@ -225,4 +230,20 @@ public function stop()`
`225`	`230`	`{`
`226`	`231`	`$this->running = false;`
`227`	`232`	`}`
	`233`	`+`
	`234`	`+ public function __destruct()`
	`235`	`+ {`
	`236`	`+ // mannually stop all watchers`
	`237`	`+ foreach($this->timers as $timer) {`
	`238`	`+ $this->timers[$timer]->stop();`
	`239`	`+ }`
	`240`	`+`
	`241`	`+ foreach($this->readEvents as $event) {`
	`242`	`+ $event->stop();`
	`243`	`+ }`
	`244`	`+`
	`245`	`+ foreach($this->writeEvents as $event) {`
	`246`	`+ $event->stop();`
	`247`	`+ }`
	`248`	`+ }`
`228`	`249`	`}`