Merge pull request #100 from tonybaldwin/master

[friendica-addons.git] / rendertime / rendertime.php

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 87a32901924263bc0aec33f027ff2a73ff47e4ea..dcbfb411ed09580d6280cf8b2a48509e96a42c9f 100755 (executable)
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -10,7 +10,6 @@
  */
 
 function rendertime_install() {
-       register_hook('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1');
        register_hook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
 }
 
@@ -21,15 +20,24 @@ function rendertime_uninstall() {
 }
 
 function rendertime_init_1(&$a) {
-       global $rendertime_start;
-
-       $rendertime_start = microtime(true);
 }
 
 function rendertime_page_end(&$a, &$o) {
-       global $rendertime_start;
 
-       $duration = round(microtime(true)-$rendertime_start, 3);
+       $duration = microtime(true)-$a->performance["start"];
+
+       $o = $o.'<div class="renderinfo">'.sprintf(t("Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"),
+                                               round($a->performance["database"], 3),
+                                               round($a->performance["network"], 3),
+                                               round($a->performance["rendering"], 3),
+                                               round($a->performance["parser"], 3),
+                                               round($a->performance["file"], 3),
+                                               round($duration - $a->performance["database"] - $a->performance["network"]
+                                                        - $a->performance["rendering"] - $a->performance["parser"]
+                                                        - $a->performance["file"], 3),
+                                               round($duration, 3)
+                                               //round($a->performance["markstart"], 3)
+                                               //round($a->performance["plugin"], 3)
+                                               )."</div>";
 
-       $o = $o.'<div class="renderinfo">'.sprintf(t("This page took %s seconds to render"), $duration)."</div>";
 }