From 338b8ca37f9552a9e00a77bfa2c7ad5d6b222b26 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Sat, 18 Jan 2020 18:26:31 -0500 Subject: Schedule bugfix It was adding too many prios to prios[] for the number of available jobs[] queues because they were added on every job insertion instead of on every new queue creation --- tools/schedule.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/schedule.js b/tools/schedule.js index 033fddb..fabcce7 100644 --- a/tools/schedule.js +++ b/tools/schedule.js @@ -28,9 +28,11 @@ exports.Queue = function(delayms, maxExport, call){ this.enqueue = function(job){ if (! (job instanceof exports.Job)) job = new exports.Job(job); let prio = job.prio; - if (!jobs[prio]) jobs[prio] = []; + if (!jobs[prio]){ + jobs[prio] = []; + prios.splice(0, Math.abs(bs(prios, prio, (el, ne) => el-ne)), prio); // prios is meant to be sorted least to most, and each job layer is too (by "maximum number of rounds"). + } jobs[prio].splice(0, Math.abs(bs(jobs[prio], job, (el, ne) => el.maxr() - ne.maxr())), job); - prios.splice(0, Math.abs(bs(prios, prio, (el, ne) => el-ne)), prio); // prios is meant to be sorted least to most, and each job layer is too (by "maximum number of rounds"). // These were sorted like this so that getNumOrAll could use [0] or [.length-1] or .pop instead of having to re-sort lists repetitively. if (open) dequeue(); } -- cgit