X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fpoller.php;h=45740dab62c3ba04975a08f41b112096968c4c53;hb=a34dbf76a421b8094e3ed956fd80584355c35180;hp=e4b0b092f48ff57033848a2a4699b7c49c4b6124;hpb=12659fc3a11b27ffe0647a1f73f5b4b23d9757ae;p=friendica.git

diff --git a/include/poller.php b/include/poller.php
index e4b0b092f4..45740dab62 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -26,6 +26,18 @@ function poller_run(&$argv, &$argc){
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
+	if(function_exists('sys_getloadavg')) {
+		$maxsysload = intval(get_config('system','maxloadavg'));
+		if($maxsysload < 1)
+			$maxsysload = 50;
+
+		$load = sys_getloadavg();
+		if(intval($load[0]) > $maxsysload) {
+			logger('system: load ' . $load[0] . ' too high. poller deferred to next scheduled run.');
+			return;
+		}
+	}
+
 	if(($argc <= 1) OR ($argv[1] != "no_cron")) {
 		// Run the cron job that calls all other jobs
 		proc_run("php","include/cron.php");
@@ -39,34 +51,51 @@ function poller_run(&$argv, &$argc){
 			if (!posix_kill($pid["pid"], 0))
 				q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
 					intval($pid["pid"]));
+			else {
+				// To-Do: Kill long running processes
+				// But: Update processes (like the database update) mustn't be killed
+			}
 
 	} else
 		// Sleep two seconds before checking for running processes to avoid having too many workers
 		sleep(4);
 
 	// Checking number of workers
-	$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
-
-	$queues = intval(get_config("system", "worker_queues"));
-
-	if ($queues == 0)
-		$queues = 4;
-
-	if ($workers[0]["workers"] >= $queues)
+	if (poller_too_much_workers())
 		return;
 
+	$starttime = time();
+
 	while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
-		q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d",
+
+		q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
 			dbesc(datetime_convert()),
 			intval(getmypid()),
 			intval($r[0]["id"]));
 
+		// Assure that there are no tasks executed twice
+		$id = q("SELECT `id` FROM `workerqueue` WHERE `id` = %d AND `pid` = %d",
+			intval($r[0]["id"]),
+			intval(getmypid()));
+		if (!$id) {
+			logger("Queue item ".$r[0]["id"]." was executed multiple times - skip this execution", LOGGER_DEBUG);
+			continue;
+		}
+
 		$argv = json_decode($r[0]["parameter"]);
 
 		$argc = count($argv);
 
-		// To-Do: Check for existance
-		require_once(basename($argv[0]));
+		// Check for existance and validity of the include file
+		$include = $argv[0];
+
+		if (!validate_include($include)) {
+			logger("Include file ".$argv[0]." is not valid!");
+			q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
+			continue;
+		}
+
+		require_once($include);
 
 		$funcname=str_replace(".php", "", basename($argv[0]))."_run";
 
@@ -77,11 +106,57 @@ function poller_run(&$argv, &$argc){
 			logger("Process ".getmypid().": ".$funcname." - done");
 
 			q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
-		}
+		} else
+			logger("Function ".$funcname." does not exist");
+
+		// Quit the poller once every hour
+		if (time() > ($starttime + 3600))
+			return;
+
+		// Count active workers and compare them with a maximum value that depends on the load
+		if (poller_too_much_workers())
+			return;
 	}
 
 }
 
+function poller_too_much_workers() {
+
+	$queues = get_config("system", "worker_queues");
+
+	if ($queues == 0)
+		$queues = 4;
+
+	$active = poller_active_workers();
+
+	// Decrease the number of workers at higher load
+	if(function_exists('sys_getloadavg')) {
+		$load = max(sys_getloadavg());
+
+		$maxsysload = intval(get_config('system','maxloadavg'));
+		if($maxsysload < 1)
+			$maxsysload = 50;
+
+		$maxworkers = $queues;
+
+		// Some magical mathemathics to reduce the workers
+		$exponent = 3;
+		$slope = $maxworkers / pow($maxsysload, $exponent);
+		$queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
+
+		logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG);
+
+	}
+
+	return($active >= $queues);
+}
+
+function poller_active_workers() {
+	$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+
+	return($workers[0]["workers"]);
+}
+
 if (array_search(__file__,get_included_files())===0){
   poller_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();