Add TidewaysXHProf profiler

README.md

@@ -15,6 +15,7 @@ This profiling library will auto-detect what you have installed and use that.
 
 The preference order is currently as follows:
 1. uprofiler
+1. tideways_xhprof
 1. tideways
 1. xhprof
 

src/Profiler.php

@@ -30,6 +30,7 @@ class Profiler
 
     const PROFILER_XHPROF = 'xhprof';
     const PROFILER_TIDEWAYS = 'tideways';
+    const PROFILER_TIDEWAYS_XHPROF = 'tideways_xhprof';
     const PROFILER_UPROFILER = 'uprofiler';
 
     /**
@@ -138,8 +139,9 @@ public function shutDown()
     /**
      * Determines which profiler you're running.
      * If you're running multiple (which you shouldn't!),
-     * It will return them in this preference order :
+     * It will return them in this preference order:
      * 1) uprofiler
+     * 2) tideways_xhprof
      * 2) tideways
      * 3) xhprof
      *
@@ -148,7 +150,13 @@ public function shutDown()
     private function getProfilerType()
     {
         $profiler = null;
-        $extensions = array(self::PROFILER_XHPROF, self::PROFILER_TIDEWAYS, self::PROFILER_UPROFILER);
+        // NOTE: the list here is reversed
+        $extensions = array(
+            self::PROFILER_XHPROF,
+            self::PROFILER_TIDEWAYS,
+            self::PROFILER_UPROFILER,
+            self::PROFILER_TIDEWAYS_XHPROF,
+        );
         foreach ($extensions as $extension) {
             $profiler = extension_loaded($extension) ? $extension : $profiler;
         }

src/Profilers/Tideways.php

@@ -4,6 +4,11 @@
 
 use Xhgui\Profiler\ProfilingFlags;
 
+/**
+ * v4 (tideways)
+ *
+ * @see https://github.com/tideways/php-profiler-extension
+ */
 class Tideways extends AbstractProfiler
 {
     /**

src/Profilers/TidewaysXHProf.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Xhgui\Profiler\Profilers;
+
+use Xhgui\Profiler\ProfilingFlags;
+
+/**
+ * v5 (tideways_xhprof)
+ *
+ * @see https://github.com/tideways/php-profiler-extension
+ */
+class TidewaysXHProf extends AbstractProfiler
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function enableWith($flags = array(), $options = array())
+    {
+        tideways_xhprof_enable($this->combineFlags($flags), $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function disable()
+    {
+        return tideways_xhprof_disable();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProfileFlagMap()
+    {
+        return array(
+            ProfilingFlags::CPU => TIDEWAYS_XHPROF_FLAGS_CPU,
+            ProfilingFlags::MEMORY => TIDEWAYS_XHPROF_FLAGS_MEMORY,
+            ProfilingFlags::NO_BUILTINS => TIDEWAYS_XHPROF_FLAGS_NO_BUILTINS,
+            ProfilingFlags::NO_SPANS => 0,
+        );
+    }
+}

tests/TidewaysXHProfTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Xhgui\Profiler\Test;
+
+use Xhgui\Profiler\Profilers\TidewaysXHProf;
+use Xhgui\Profiler\ProfilingFlags;
+
+/**
+ * @requires extension tideways_xhprof
+ */
+class TidewaysXHProfTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->profiler = new TidewaysXHProf();
+    }
+
+    public function testDefaults()
+    {
+        $data = $this->runProfiler();
+        $this->assertCount(3, $data);
+    }
+
+    public function testNoFlags()
+    {
+        $flags = array(
+            ProfilingFlags::NO_BUILTINS,
+        );
+        $data = $this->runProfiler($flags);
+        $this->assertCount(2, $data);
+    }
+}