From 97cabcecf27178834553e6d4e69783e5f88525d4 Mon Sep 17 00:00:00 2001 From: miqrogroove Date: Wed, 20 Jun 2018 06:06:20 -0400 Subject: [PATCH] Unify Worker Load Formulas --- src/Core/Worker.php | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/src/Core/Worker.php b/src/Core/Worker.php index bc45be2d5b..bafe371130 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -626,34 +626,14 @@ class Worker $maxsysload = intval(Config::get("system", "maxloadavg", 50)); 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)); - } + $exponent = 1; } 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)); } + $slope = pow(max(0, $maxsysload - $load) / $maxsysload, $exponent); + $queues = intval(ceil($slope * $maxqueues)); + $processlist = ''; if (Config::get('system', 'worker_debug')) { -- 2.39.5