]> git.mxchange.org Git - friendica.git/blobdiff - include/poller.php
Merge pull request #3216 from annando/1701-performance
[friendica.git] / include / poller.php
index 3a83770ceb97a47c23732b8ddef7442d517f415b..82befae51842dc4bd1dd49c2f5f3dabeaa144216 100644 (file)
@@ -11,7 +11,6 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
 }
 
 use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
 
 require_once("boot.php");
 
@@ -29,9 +28,12 @@ function poller_run($argv, $argc){
                unset($db_host, $db_user, $db_pass, $db_data);
        };
 
+       Config::load();
+
        // Quit when in maintenance
-       if (get_config('system', 'maintenance', true))
+       if (Config::get('system', 'maintenance', true)) {
                return;
+       }
 
        $a->start_process();
 
@@ -90,10 +92,8 @@ function poller_execute($queue) {
 
        $mypid = getmypid();
 
-       $cooldown = Config::get("system", "worker_cooldown", 0);
-
        // Quit when in maintenance
-       if (get_config('system', 'maintenance', true)) {
+       if (Config::get('system', 'maintenance', true)) {
                return false;
        }
 
@@ -137,8 +137,6 @@ function poller_execute($queue) {
 
        $argv = json_decode($queue["parameter"]);
 
-       $argc = count($argv);
-
        // Check for existance and validity of the include file
        $include = $argv[0];
 
@@ -154,59 +152,122 @@ function poller_execute($queue) {
 
        if (function_exists($funcname)) {
 
-               $stamp = (float)microtime(true);
-
-               if (get_config("system", "profiler")) {
-                       $a->performance["start"] = microtime(true);
-                       $a->performance["database"] = 0;
-                       $a->performance["database_write"] = 0;
-                       $a->performance["network"] = 0;
-                       $a->performance["file"] = 0;
-                       $a->performance["rendering"] = 0;
-                       $a->performance["parser"] = 0;
-                       $a->performance["marktime"] = 0;
-                       $a->performance["markstart"] = microtime(true);
-               }
+               poller_exec_function($queue, $funcname, $argv);
 
-               logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]);
+               q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
+       } else {
+               logger("Function ".$funcname." does not exist");
+       }
 
-               // For better logging create a new process id for every worker call
-               // But preserve the old one for the worker
-               $old_process_id = $a->process_id;
-               $a->process_id = uniqid("wrk", true);
+       return true;
+}
 
-               $funcname($argv, $argc);
+/**
+ * @brief Execute a function from the queue
+ *
+ * @param array $queue Workerqueue entry
+ * @param string $funcname name of the function
+ * @param array $argv Array of values to be passed to the function
+ */
+function poller_exec_function($queue, $funcname, $argv) {
 
-               $a->process_id = $old_process_id;
+       $a = get_app();
 
-               if ($cooldown > 0) {
-                       logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
-                       sleep($cooldown);
-               }
+       $mypid = getmypid();
 
-               $duration = (float)round(microtime(true)-$stamp, 3);
+       $argc = count($argv);
+
+       logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]);
+
+       $stamp = (float)microtime(true);
+
+       // We use the callstack here to analyze the performance of executed worker entries.
+       // For this reason the variables have to be initialized.
+       if (Config::get("system", "profiler")) {
+               $a->performance["start"] = microtime(true);
+               $a->performance["database"] = 0;
+               $a->performance["database_write"] = 0;
+               $a->performance["network"] = 0;
+               $a->performance["file"] = 0;
+               $a->performance["rendering"] = 0;
+               $a->performance["parser"] = 0;
+               $a->performance["marktime"] = 0;
+               $a->performance["markstart"] = microtime(true);
+               $a->callstack = array();
+       }
+
+       // For better logging create a new process id for every worker call
+       // But preserve the old one for the worker
+       $old_process_id = $a->process_id;
+       $a->process_id = uniqid("wrk", true);
+
+       $funcname($argv, $argc);
 
-               logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds.");
+       $a->process_id = $old_process_id;
 
-               if (get_config("system", "profiler")) {
-                       $duration = microtime(true)-$a->performance["start"];
+       $duration = number_format(microtime(true) - $stamp, 3);
 
-                       logger("ID ".$queue["id"].": ".$funcname.": ".sprintf("DB: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s",
-                               round($a->performance["database"] - $a->performance["database_write"], 2),
-                               round($a->performance["database_write"], 2),
-                               round($a->performance["network"], 2),
-                               round($a->performance["file"], 2),
-                               round($duration - ($a->performance["database"] + $a->performance["network"] + $a->performance["file"]), 2),
-                               round($duration, 2)),
-                               LOGGER_DEBUG);
+       if ($duration > 3600) {
+               logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 1 hour (".round($duration/60, 3).")", LOGGER_DEBUG);
+       } elseif ($duration > 600) {
+               logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 10 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
+       } elseif ($duration > 300) {
+               logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 5 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
+       } elseif ($duration > 120) {
+               logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
+       }
+
+       logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds.");
+
+       // Write down the performance values into the log
+       if (Config::get("system", "profiler")) {
+               $duration = microtime(true)-$a->performance["start"];
+
+               if (Config::get("rendertime", "callstack")) {
+                       if (isset($a->callstack["database"])) {
+                               $o = "\nDatabase Read:\n";
+                               foreach ($a->callstack["database"] AS $func => $time) {
+                                       $time = round($time, 3);
+                                       if ($time > 0)
+                                               $o .= $func.": ".$time."\n";
+                               }
+                       }
+                       if (isset($a->callstack["database_write"])) {
+                               $o .= "\nDatabase Write:\n";
+                               foreach ($a->callstack["database_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) {
+                                       $time = round($time, 3);
+                                       if ($time > 0)
+                                               $o .= $func.": ".$time."\n";
+                               }
+                       }
+               } else {
+                       $o = '';
                }
 
-               q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
-       } else {
-               logger("Function ".$funcname." does not exist");
+               logger("ID ".$queue["id"].": ".$funcname.": ".sprintf("DB: %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["network"], 2),
+                       number_format($a->performance["file"], 2),
+                       number_format($duration - ($a->performance["database"] + $a->performance["network"] + $a->performance["file"]), 2),
+                       number_format($duration, 2)),
+                       LOGGER_DEBUG);
        }
 
-       return true;
+       $cooldown = Config::get("system", "worker_cooldown", 0);
+
+       if ($cooldown > 0) {
+               logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
+               sleep($cooldown);
+       }
 }
 
 /**
@@ -217,7 +278,7 @@ function poller_execute($queue) {
 function poller_max_connections_reached() {
 
        // Fetch the max value from the config. This is needed when the system cannot detect the correct value by itself.
-       $max = get_config("system", "max_connections");
+       $max = Config::get("system", "max_connections");
 
        // Fetch the percentage level where the poller will get active
        $maxlevel = Config::get("system", "max_connections_level", 75);
@@ -401,7 +462,7 @@ function poller_too_much_workers() {
                logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries." (".$processlist.") - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
 
                // Are there fewer workers running as possible? Then fork a new one.
-               if (!get_config("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) {
+               if (!Config::get("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) {
                        logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG);
                        $args = array("php", "include/poller.php", "no_cron");
                        $a = get_app();
@@ -530,7 +591,7 @@ function call_worker_if_idle() {
        if (function_exists("proc_open")) {
                // When was the last time that we called the worker?
                // Less than one minute? Then we quit
-               if ((time() - get_config("system", "worker_started")) < 60) {
+               if ((time() - Config::get("system", "worker_started")) < 60) {
                        return;
                }