clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makes the linear load calculation optional

This commit is contained in:
Michael 2018-06-20 04:38:50 +00:00
parent 533fedf9b8
commit 00124f9ac0
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/htconfig.md
View File

@ -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. * **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. * **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_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. * **xrd_timeout** - Timeout for fetching the XRD links. Default value is 20 seconds.
## experimental ## ## experimental ##

36
src/Core/Worker.php
View File

@ -624,16 +624,34 @@ class Worker
$load = current_load(); $load = current_load();
if ($load) { if ($load) {
$maxsysload = intval(Config::get("system", "maxloadavg", 50)); $maxsysload = intval(Config::get("system", "maxloadavg", 50));
$tinyload = 1;
if ($load > $maxsysload) { if (Config::get('system', 'worker_linear_load', false)) {
$queues = 0; /* The linear load calculation works fine if there is a low
} elseif ($load > $tinyload) { * number of maximum queues and a high load base level.
//Provide $queues number between 1 (below max load) and $maxqueues - 1 (above tiny load). * This can be present at shared hosters.
$range = $maxsysload - $tinyload; */
$slope = 1.00 - (($load - $tinyload) / $range); $tinyload = 1;
$target = $slope * ($maxqueues - 1);
$queues = intval(ceil($target)); 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 = ''; $processlist = '';