From fb72fc77f5268a9036b43eabea2fa5fffff57b68 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 4 Jun 2017 20:03:37 +0000 Subject: [PATCH] Some code beautification --- include/poller.php | 160 +++++++++++++++++++++++++-------------------- 1 file changed, 89 insertions(+), 71 deletions(-) diff --git a/include/poller.php b/include/poller.php index a67f6a7d86..3d53be0abb 100644 --- a/include/poller.php +++ b/include/poller.php @@ -7,9 +7,9 @@ use Friendica\Util\Lock; if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) { $directory = dirname($_SERVER["argv"][0]); - if (substr($directory, 0, 1) != "/") + if (substr($directory, 0, 1) != "/") { $directory = $_SERVER["PWD"]."/".$directory; - + } $directory = realpath($directory."/.."); chdir($directory); @@ -38,53 +38,58 @@ function poller_run($argv, $argc){ load_hooks(); - if (($argc <= 1) OR ($argv[1] != "no_cron")) { - poller_run_cron(); - } - - $a->start_process(); - - if ($a->min_memory_reached()) { - logger('Pre check: Memory limit reached, quitting.', LOGGER_DEBUG); - return; - } - - if (poller_max_connections_reached()) { - logger('Pre check: maximum connections reached, quitting.', LOGGER_DEBUG); - return; - } - + // At first check the maximum load. We shouldn't continue with a high load if ($a->maxload_reached()) { logger('Pre check: maximum load reached, quitting.', LOGGER_DEBUG); return; } - if ($a->max_processes_reached()) { - logger('Pre check: maximum processes reached, quitting.', LOGGER_DEBUG); - return; - } + // We now start the process. This is done after the load check since this could increase the load. + $a->start_process(); - // Checking the number of workers + // At first we check the number of workers and quit if there are too much of them + // This is done at the top to avoid that too much code is executed without a need to do so, + // since the poller mostly quits here. if (poller_too_much_workers()) { poller_kill_stale_workers(); logger('Pre check: Active worker limit reached, quitting.', LOGGER_DEBUG); return; } + // Do we have too few memory? + if ($a->min_memory_reached()) { + logger('Pre check: Memory limit reached, quitting.', LOGGER_DEBUG); + return; + } + + // Possibly there are too much database connections + if (poller_max_connections_reached()) { + logger('Pre check: maximum connections reached, quitting.', LOGGER_DEBUG); + return; + } + + // Possibly there are too much database processes that block the system + if ($a->max_processes_reached()) { + logger('Pre check: maximum processes reached, quitting.', LOGGER_DEBUG); + return; + } + + // Now we start additional cron processes if we should do so + if (($argc <= 1) OR ($argv[1] != "no_cron")) { + poller_run_cron(); + } + $starttime = time(); + // We fetch the next queue entry that is about to be executed while ($r = poller_worker_process()) { + // If we got that queue entry we claim it for us if (!poller_claim_process($r[0])) { continue; } - // Check free memory - if ($a->min_memory_reached()) { - logger('Memory limit reached, quitting.', LOGGER_DEBUG); - return; - } - + // To avoid the quitting of multiple pollers we serialize the next check if (!Lock::set('poller_worker')) { logger('Cannot get a lock, retrying.', LOGGER_DEBUG); poller_unclaim_process(); @@ -99,6 +104,13 @@ function poller_run($argv, $argc){ Lock::remove('poller_worker'); + // Check free memory + if ($a->min_memory_reached()) { + logger('Memory limit reached, quitting.', LOGGER_DEBUG); + return; + } + + // finally the work will be done if (!poller_execute($r[0])) { logger('Process execution failed, quitting.', LOGGER_DEBUG); return; @@ -160,7 +172,6 @@ function poller_execute($queue) { $funcname = str_replace(".php", "", basename($argv[0]))."_run"; if (function_exists($funcname)) { - poller_exec_function($queue, $funcname, $argv); dba::delete('workerqueue', array('id' => $queue["id"])); } else { @@ -236,24 +247,27 @@ function poller_exec_function($queue, $funcname, $argv) { $o = "\nDatabase Read:\n"; foreach ($a->callstack["database"] AS $func => $time) { $time = round($time, 3); - if ($time > 0) + 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) + 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) + if ($time > 0) { $o .= $func.": ".$time."\n"; + } } } } else { @@ -294,27 +308,30 @@ function poller_max_connections_reached() { if ($max == 0) { // the maximum number of possible user connections can be a system variable $r = q("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'"); - if ($r) + if (dbm::is_result($r)) { $max = $r[0]["Value"]; - + } // Or it can be granted. This overrides the system variable $r = q("SHOW GRANTS"); - if ($r) + if (dbm::is_result($r)) { foreach ($r AS $grants) { $grant = array_pop($grants); - if (stristr($grant, "GRANT USAGE ON")) - if (preg_match("/WITH MAX_USER_CONNECTIONS (\d*)/", $grant, $match)) + if (stristr($grant, "GRANT USAGE ON")) { + if (preg_match("/WITH MAX_USER_CONNECTIONS (\d*)/", $grant, $match)) { $max = $match[1]; + } + } } + } } // If $max is set we will use the processlist to determine the current number of connections // The processlist only shows entries of the current user if ($max != 0) { $r = q("SHOW PROCESSLIST"); - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { return false; - + } $used = count($r); logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG); @@ -330,28 +347,28 @@ function poller_max_connections_reached() { // We will now check for the system values. // This limit could be reached although the user limits are fine. $r = q("SHOW VARIABLES WHERE `variable_name` = 'max_connections'"); - if (!$r) + if (!dbm::is_result($r)) { return false; - + } $max = intval($r[0]["Value"]); - if ($max == 0) + if ($max == 0) { return false; - + } $r = q("SHOW STATUS WHERE `variable_name` = 'Threads_connected'"); - if (!$r) + if (!dbm::is_result($r)) { return false; - + } $used = intval($r[0]["Value"]); - if ($used == 0) + if ($used == 0) { return false; - + } logger("Connection usage (system values): ".$used."/".$max, LOGGER_DEBUG); $level = $used / $max * 100; - if ($level < $maxlevel) + if ($level < $maxlevel) { return false; - + } logger("Maximum level (".$level."%) of system connections reached: ".$used."/".$max); return true; } @@ -376,9 +393,9 @@ function poller_kill_stale_workers() { // Kill long running processes // Check if the priority is in a valid range - if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE))) + if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE))) { $pid["priority"] = PRIORITY_MEDIUM; - + } // Define the maximum durations $max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360); $max_duration = $max_duration_defaults[$pid["priority"]]; @@ -480,7 +497,7 @@ function poller_too_much_workers() { } } - return($active >= $queues); + return $active >= $queues; } /** @@ -491,7 +508,7 @@ function poller_too_much_workers() { function poller_active_workers() { $workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'poller.php'"); - return($workers[0]["processes"]); + return $workers[0]["processes"]; } /** @@ -512,36 +529,37 @@ function poller_passing_slow(&$highest_priority) { INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`"); // No active processes at all? Fine - if (!dbm::is_result($r)) - return(false); - + if (!dbm::is_result($r)) { + return false; + } $priorities = array(); - foreach ($r AS $line) + foreach ($r AS $line) { $priorities[] = $line["priority"]; - + } // Should not happen - if (count($priorities) == 0) - return(false); - + if (count($priorities) == 0) { + return false; + } $highest_priority = min($priorities); // The highest process is already the slowest one? // Then we quit - if ($highest_priority == PRIORITY_NEGLIGIBLE) - return(false); - + if ($highest_priority == PRIORITY_NEGLIGIBLE) { + return false; + } $high = 0; - foreach ($priorities AS $priority) - if ($priority == $highest_priority) + foreach ($priorities AS $priority) { + if ($priority == $highest_priority) { ++$high; - + } + } logger("Highest priority: ".$highest_priority." Total processes: ".count($priorities)." Count high priority processes: ".$high, LOGGER_DEBUG); $passing_slow = (($high/count($priorities)) > (2/3)); - if ($passing_slow) + if ($passing_slow) { logger("Passing slower processes than priority ".$highest_priority, LOGGER_DEBUG); - - return($passing_slow); + } + return $passing_slow; } /**