Merge branch 'master' into develop

[friendica.git] / src / Core / Worker.php

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 7906f81059d33b1bdd0b8706ef9610eb51b8c942..e3d8df45e40625eb2ce42b31d7328f6639f549f9 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -325,6 +325,8 @@ class Worker
                        $a->performance["start"] = microtime(true);
                        $a->performance["database"] = 0;
                        $a->performance["database_write"] = 0;
+                       $a->performance["cache"] = 0;
+                       $a->performance["cache_write"] = 0;
                        $a->performance["network"] = 0;
                        $a->performance["file"] = 0;
                        $a->performance["rendering"] = 0;
@@ -409,6 +411,24 @@ class Worker
                                                }
                                        }
                                }
+                               if (isset($a->callstack["dache"])) {
+                                       $o .= "\nCache Read:\n";
+                                       foreach ($a->callstack["dache"] as $func => $time) {
+                                               $time = round($time, 3);
+                                               if ($time > 0) {
+                                                       $o .= $func.": ".$time."\n";
+                                               }
+                                       }
+                               }
+                               if (isset($a->callstack["dache_write"])) {
+                                       $o .= "\nCache Write:\n";
+                                       foreach ($a->callstack["dache_write"] as $func => $time) {
+                                               $time = round($time, 3);
+                                               if ($time > 0) {
+                                                       $o .= $func.": ".$time."\n";
+                                               }
+                                       }
+                               }
                                if (isset($a->callstack["network"])) {
                                        $o .= "\nNetwork:\n";
                                        foreach ($a->callstack["network"] as $func => $time) {
@@ -422,12 +442,16 @@ class Worker
 
                        logger(
                                "ID ".$queue["id"].": ".$funcname.": ".sprintf(
-                                       "DB: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s".$o,
+                                       "DB: %s/%s, Cache: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s".$o,
                                        number_format($a->performance["database"] - $a->performance["database_write"], 2),
                                        number_format($a->performance["database_write"], 2),
+                                       number_format($a->performance["cache"], 2),
+                                       number_format($a->performance["cache_write"], 2),
                                        number_format($a->performance["network"], 2),
                                        number_format($a->performance["file"], 2),
-                                       number_format($duration - ($a->performance["database"] + $a->performance["network"] + $a->performance["file"]), 2),
+                                       number_format($duration - ($a->performance["database"]
+                                               + $a->performance["cache"] + $a->performance["cache_write"]
+                                               + $a->performance["network"] + $a->performance["file"]), 2),
                                        number_format($duration, 2)
                                ),
                                LOGGER_DEBUG
@@ -979,7 +1003,7 @@ class Worker
         */
        public static function spawnWorker()
        {
-               $args = ["scripts/worker.php", "no_cron"];
+               $args = ["bin/worker.php", "no_cron"];
                get_app()->proc_run($args);
        }