]> git.mxchange.org Git - friendica.git/blobdiff - include/poller.php
Removed some more unneeded stuff
[friendica.git] / include / poller.php
index a6671f5ae39c26618e35c8d9f333396c45aee432..89ab85a1f5f420a09c4b33365595f2a9c28fbc7c 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,16 @@ 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->set_baseurl(Config::get('system', 'url'));
+
+       load_hooks();
 
        $a->start_process();
 
@@ -90,10 +96,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 +141,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];
 
@@ -153,23 +155,8 @@ function poller_execute($queue) {
        $funcname = str_replace(".php", "", basename($argv[0]))."_run";
 
        if (function_exists($funcname)) {
-               logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]);
-
-               // 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);
-
-               $a->process_id = $old_process_id;
 
-               if ($cooldown > 0) {
-                       logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
-                       sleep($cooldown);
-               }
-
-               logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done");
+               poller_exec_function($queue, $funcname, $argv);
 
                q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($queue["id"]));
        } else {
@@ -179,6 +166,104 @@ function poller_execute($queue) {
        return true;
 }
 
+/**
+ * @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 = get_app();
+
+       $mypid = getmypid();
+
+       $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);
+
+       $a->process_id = $old_process_id;
+
+       $duration = number_format(microtime(true) - $stamp, 3);
+
+       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 = '';
+               }
+
+               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);
+       }
+
+       $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);
+       }
+}
+
 /**
  * @brief Checks if the number of database connections has reached a critical limit.
  *
@@ -187,7 +272,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);
@@ -213,7 +298,7 @@ function poller_max_connections_reached() {
        // The processlist only shows entries of the current user
        if ($max != 0) {
                $r = q("SHOW PROCESSLIST");
-               if (!$r)
+               if (!dbm::is_result($r))
                        return false;
 
                $used = count($r);
@@ -371,9 +456,9 @@ 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");
+                       $args = array("include/poller.php", "no_cron");
                        $a = get_app();
                        $a->proc_run($args);
                }
@@ -480,7 +565,7 @@ function poller_worker_process() {
  * @brief Call the front end worker
  */
 function call_worker() {
-       if (!Config::get("system", "frontend_worker") OR !Config::get("system", "worker")) {
+       if (!Config::get("system", "frontend_worker")) {
                return;
        }
 
@@ -492,7 +577,7 @@ function call_worker() {
  * @brief Call the front end worker if there aren't any active
  */
 function call_worker_if_idle() {
-       if (!Config::get("system", "frontend_worker") OR !Config::get("system", "worker")) {
+       if (!Config::get("system", "frontend_worker")) {
                return;
        }
 
@@ -500,7 +585,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;
                }
 
@@ -519,7 +604,7 @@ function call_worker_if_idle() {
 
                logger('Call poller', LOGGER_DEBUG);
 
-               $args = array("php", "include/poller.php", "no_cron");
+               $args = array("include/poller.php", "no_cron");
                $a = get_app();
                $a->proc_run($args);
                return;