From: Michael <heluecht@pirati.ca>
Date: Wed, 20 Jun 2018 04:38:50 +0000 (+0000)
Subject: Makes the linear load calculation optional
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=00124f9ac09429d311eb7f171cf5356b1d28ce48;p=friendica.git

Makes the linear load calculation optional
---

diff --git a/doc/htconfig.md b/doc/htconfig.md
index 15242e3077..50fc4255fb 100644
--- a/doc/htconfig.md
+++ b/doc/htconfig.md
@@ -94,6 +94,7 @@ Example: To set the automatic database cleanup process add this line to your .ht
 * **throttle_limit_month** - Maximum number of posts that a user can send per month with the API.
 * **wall-to-wall_share** (Boolean) - Displays forwarded posts like "wall-to-wall" posts.
 * **worker_cooldown** - Cooldown time after each worker function call. Default value is 0 seconds.
+* **worker_linear_load** (Boolean) - Enables the linear calculation of maximum queues.
 * **xrd_timeout** - Timeout for fetching the XRD links. Default value is 20 seconds.
 
 ## experimental ##
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index d4257f1246..bc45be2d5b 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -624,16 +624,34 @@ class Worker
 		$load = current_load();
 		if ($load) {
 			$maxsysload = intval(Config::get("system", "maxloadavg", 50));
-			$tinyload = 1;
-
-			if ($load > $maxsysload) {
-				$queues = 0;
-			} elseif ($load > $tinyload) {
-				//Provide $queues number between 1 (below max load) and $maxqueues - 1 (above tiny load).
-				$range = $maxsysload - $tinyload;
-				$slope = 1.00 - (($load - $tinyload) / $range);
-				$target = $slope * ($maxqueues - 1);
-				$queues = intval(ceil($target));
+
+			if (Config::get('system', 'worker_linear_load', false)) {
+				/* The linear load calculation works fine if there is a low
+				 * number of maximum queues and a high load base level.
+				 * This can be present at shared hosters.
+				*/
+				$tinyload = 1;
+
+				if ($load > $maxsysload) {
+					$queues = 0;
+				} elseif ($load > $tinyload) {
+					//Provide $queues number between 1 (below max load) and $maxqueues - 1 (above tiny load).
+					$range = $maxsysload - $tinyload;
+					$slope = 1.00 - (($load - $tinyload) / $range);
+					$target = $slope * ($maxqueues - 1);
+					$queues = intval(ceil($target));
+				}
+			} else {
+				/* The exponentional load calculation respects the load behaviour
+				 * of Linux systems with regular hardware that normally idles
+				 * with load values near 0.
+				*/
+				$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));
 			}
 
 			$processlist = '';