Makes the linear load calculation optional
This commit is contained in:
parent
533fedf9b8
commit
00124f9ac0
|
@ -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 ##
|
||||||
|
|
|
@ -624,6 +624,12 @@ 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));
|
||||||
|
|
||||||
|
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;
|
$tinyload = 1;
|
||||||
|
|
||||||
if ($load > $maxsysload) {
|
if ($load > $maxsysload) {
|
||||||
|
@ -635,6 +641,18 @@ class Worker
|
||||||
$target = $slope * ($maxqueues - 1);
|
$target = $slope * ($maxqueues - 1);
|
||||||
$queues = intval(ceil($target));
|
$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 = '';
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user