unset($db_host, $db_user, $db_pass, $db_data);
};
- if(function_exists('sys_getloadavg')) {
+ $load = current_load();
+ if($load) {
$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.');
+ if(intval($load) > $maxsysload) {
+ logger('system: load ' . $load . ' too high. poller deferred to next scheduled run.');
return;
}
}
+ // Checking the number of workers
+ if (poller_too_much_workers(1))
+ return;
+
if(($argc <= 1) OR ($argv[1] != "no_cron")) {
// Run the cron job that calls all other jobs
proc_run("php","include/cron.php");
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
+ /// @TODO 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 four seconds before checking for running processes again to avoid having too many workers
sleep(4);
// Checking number of workers
- if (poller_too_much_workers())
+ if (poller_too_much_workers(2))
return;
$starttime = time();
while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
+ // Count active workers and compare them with a maximum value that depends on the load
+ if (poller_too_much_workers(3))
+ return;
+
q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
dbesc(datetime_convert()),
intval(getmypid()),
$funcname=str_replace(".php", "", basename($argv[0]))."_run";
if (function_exists($funcname)) {
- logger("Process ".getmypid().": ".$funcname." ".$r[0]["parameter"]);
+ logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
$funcname($argv, $argc);
- logger("Process ".getmypid().": ".$funcname." - done");
+ logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." - done");
q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
} else
// 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() {
+function poller_too_much_workers($stage) {
$queues = get_config("system", "worker_queues");
$active = poller_active_workers();
// Decrease the number of workers at higher load
- if(function_exists('sys_getloadavg')) {
- $load = max(sys_getloadavg());
-
+ $load = current_load();
+ if($load) {
$maxsysload = intval(get_config('system','maxloadavg'));
if($maxsysload < 1)
$maxsysload = 50;
$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);
+ logger("Current load stage ".$stage.": ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG);
}