PHP7 support

.arcconfig

@@ -1,6 +1,5 @@
 {
-  "project_id" : "xhprof",
-  "conduit_uri" : "https://secure.phabricator.com/",
-  "remote_hooks_installed" : true,
-  "copyright_holder" : "Facebook, Inc."
-}
+  "phabricator.uri": "https://secure.phabricator.com/",
+  "load": ["support/libxhprof"],
+  "unit.engine": "XHProfExtensionUnitTestEngine"
+}

.arclint

@@ -0,0 +1,30 @@
+{
+  "exclude": [
+    "(^xhprof_html/jquery/)",
+    "(^xhprof_html/docs/)",
+    "(^extension/Makefile.local)"
+  ],
+  "linters": {
+    "chmod": {
+      "type": "chmod"
+    },
+    "filename": {
+      "type": "filename"
+    },
+    "generated": {
+      "type": "generated"
+    },
+    "merge-conflict": {
+      "type": "merge-conflict"
+    },
+    "nolint": {
+      "type": "nolint"
+    },
+    "text-without-length": {
+      "type": "text",
+      "severity": {
+        "3": "disabled"
+      }
+    }
+  }
+}

.gitignore

@@ -4,3 +4,12 @@ extension/*
 !extension/php_xhprof.h
 !extension/tests/
 !extension/xhprof.c
+
+extension/tests/*.sh
+extension/tests/*.exp
+extension/tests/*.out
+extension/tests/*.diff
+extension/tests/*.log
+extension/tests/*.php
+
+support/libxhprof/.phutil_module_cache

CREDITS

@@ -1,5 +1,7 @@
 Originally developed at Facebook, XHProf was open sourced in Mar, 2009.
 
+XHProf is now maintained by Phacility.
+
 Creators:
   Changhao Jiang
   Kannan Muthukkaruppan
@@ -9,4 +11,3 @@ Creators:
 Additional Contributors:
   George Cabrera      - UI enhancements
   Paul Saab           - FreeBSD port
-

LICENSE

@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/

README.md

@@ -0,0 +1,21 @@
+# xhprof for PHP7
+
+Please do not use this in an production env.
+
+
+## Install
+
+### Compile in Linux
+```
+$ /$PHP7/bin/phpize
+$ ./configure --with-php-config=/$PHP7/bin/php-config
+$ make && make install
+```
+edit php.ini, add a new line:
+```
+extension=xhprof.so
+```
+make sure it works:
+```
+php7 -m |grep xhprof
+```

bin/xhprofile

@@ -0,0 +1 @@
+../scripts/xhprofile.php

examples/sample.php

@@ -17,14 +17,28 @@ function foo() {
 xhprof_enable();
 
 // run program
-foo();
+for ($i = 0; $i < 1000; $i++) {
+
+	foo();
+}
 
 // stop profiler
 $xhprof_data = xhprof_disable();
 
 // display raw xhprof data for the profiler run
 print_r($xhprof_data);
 
+xhprof_enable();
+
+// run program
+for ($i = 0; $i < 1000; $i++) {
+
+	foo();
+}
+
+// stop profiler
+$xhprof_data = xhprof_disable();
+print_r($xhprof_data);
 
 $XHPROF_ROOT = realpath(dirname(__FILE__) .'/..');
 include_once $XHPROF_ROOT . "/xhprof_lib/utils/xhprof_lib.php";
@@ -37,8 +51,9 @@ function foo() {
 // save the run under a namespace "xhprof_foo"
 $run_id = $xhprof_runs->save_run($xhprof_data, "xhprof_foo");
 
+
 echo "---------------\n".
      "Assuming you have set up the http based UI for \n".
      "XHProf at some address, you can view run at \n".
-     "http://<xhprof-ui-address>/index.php?run=$run_id&source=xhprof_foo\n".
+     "<a href='http://".$_SERVER['HTTP_HOST']."/xhprof_html/index.php?run=$run_id&source=xhprof_foo'>click here</a>\n".
      "---------------\n";

extension/config.m4

@@ -1,4 +1,3 @@
-
 PHP_ARG_ENABLE(xhprof, whether to enable xhprof support,
 [ --enable-xhprof      Enable xhprof support])
 

extension/php_xhprof.h

@@ -42,4 +42,4 @@ PHP_FUNCTION(xhprof_disable);
 PHP_FUNCTION(xhprof_sample_enable);
 PHP_FUNCTION(xhprof_sample_disable);
 
-#endif	/* PHP_XHPROF_H */
+#endif /* PHP_XHPROF_H */

extension/tests/tags

@@ -0,0 +1 @@
+!_TAG_FILE_SORTED	2	/0=unsorted, 1=sorted, 2=foldcase/

extension/tests/xhprof_001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-XHPRrof: Basic Profiling Test
+XHProf: Basic Profiling Test
 Author: Kannan
 --FILE--
 <?php

extension/tests/xhprof_002.phpt

@@ -1,5 +1,5 @@
 --TEST--
-XHPRrof: Test (direct and indirect) recursive function calls.
+XHProf: Test (direct and indirect) recursive function calls.
 Author: Kannan
 --FILE--
 <?php

extension/tests/xhprof_003.phpt

@@ -1,5 +1,5 @@
 --TEST--
-XHPRrof: Test Class Methods, Constructors, Destructors.
+XHProf: Test Class Methods, Constructors, Destructors.
 Author: Kannan
 --FILE--
 <?php

extension/tests/xhprof_004.phpt

@@ -1,5 +1,5 @@
 --TEST--
-XHPRrof: Test Include File (load/run_init operations)
+XHProf: Test Include File (load/run_init operations)
 Author: Kannan
 --FILE--
 <?php

extension/tests/xhprof_005.phpt

@@ -1,5 +1,5 @@
 --TEST--
-XHPRrof: Timer Tests
+XHProf: Timer Tests
 Author: Kannan
 --FILE--
 <?php