Mirrors/cobalt
1
0
Fork 0
mirror of https://github.com/wukko/cobalt.git synced 2025-04-29 22:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

web/scheduler: rename function to schedule(), cleanup control flow

Browse Source
This commit is contained in:
jj 2025-03-29 14:17:04 +00:00
parent a183265838
commit 165fa65964
No known key found for this signature in database
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
web/src/lib/queen-bee/scheduler.ts
View File

@ -18,21 +18,21 @@ const startPipeline = (pipelineItem: CobaltPipelineItem) => {
startWorker(pipelineItem); startWorker(pipelineItem);
} }
export const checkTasks = () => { export const schedule = () => {
const queueItems = get(queue); const queueItems = get(queue);
const ongoingTasks = get(currentTasks); const ongoingTasks = get(currentTasks);
// TODO (?): task concurrency // TODO (?): task concurrency
if (Object.keys(ongoingTasks).length > 0) return; if (Object.keys(ongoingTasks).length > 0) {
return;
for (const item of Object.keys(queueItems)) { }
const task = queueItems[item];
for (const task of Object.values(queueItems)) {
if (task.state === "running") { if (task.state === "running") {
// if the running worker isn't completed, wait // if the running worker isn't completed, wait
// to be called again on worker completion // to be called again on worker completion
if (!task.completedWorkers.has(task.runningWorker)) { if (!task.completedWorkers.has(task.runningWorker)) {
break; return;
} }
// if all workers are completed, then return the // if all workers are completed, then return the
@ -42,11 +42,11 @@ export const checkTasks = () => {
if (finalFile) { if (finalFile) {
itemDone(task.id, finalFile); itemDone(task.id, finalFile);
continue;
} else { } else {
itemError(task.id, task.runningWorker, "no final file"); itemError(task.id, task.runningWorker, "no final file");
continue;
} }
continue;
} }
// if current worker is completed, but there are more workers, // if current worker is completed, but there are more workers,
@ -54,17 +54,13 @@ export const checkTasks = () => {
for (const worker of task.pipeline) { for (const worker of task.pipeline) {
if (!task.completedWorkers.has(worker.workerId)) { if (!task.completedWorkers.has(worker.workerId)) {
startPipeline(worker); startPipeline(worker);
break; return;
} }
} }
break;
}
// start the nearest waiting task and wait to be called again // start the nearest waiting task and wait to be called again
if (task.state === "waiting" && task.pipeline.length > 0) { } else if (task.state === "waiting" && task.pipeline.length > 0) {
startPipeline(task.pipeline[0]); startPipeline(task.pipeline[0]);
break;
} }
} }
} }

14
web/src/lib/state/queen-bee/queue.ts
View File

@ -1,6 +1,6 @@
import { readable, type Updater } from "svelte/store"; import { readable, type Updater } from "svelte/store";
import { checkTasks } from "$lib/queen-bee/scheduler"; import { schedule } from "$lib/queen-bee/scheduler";
import { clearFileStorage, removeFromFileStorage } from "$lib/storage"; import { clearFileStorage, removeFromFileStorage } from "$lib/storage";
import { clearCurrentTasks, removeWorkerFromQueue } from "$lib/state/queen-bee/current-tasks"; import { clearCurrentTasks, removeWorkerFromQueue } from "$lib/state/queen-bee/current-tasks";
@ -34,7 +34,7 @@ export function addItem(item: CobaltQueueItem) {
return queueData; return queueData;
}); });
checkTasks(); schedule();
} }
export function itemError(id: string, workerId: string, error: string) { export function itemError(id: string, workerId: string, error: string) {
@ -52,7 +52,7 @@ export function itemError(id: string, workerId: string, error: string) {
}); });
removeWorkerFromQueue(workerId); removeWorkerFromQueue(workerId);
checkTasks(); schedule();
} }
export function itemDone(id: string, file: CobaltFileReference) { export function itemDone(id: string, file: CobaltFileReference) {
@ -69,7 +69,7 @@ export function itemDone(id: string, file: CobaltFileReference) {
return queueData; return queueData;
}); });
checkTasks(); schedule();
} }
export function pipelineTaskDone(id: string, workerId: string, file: CobaltFileReference) { export function pipelineTaskDone(id: string, workerId: string, file: CobaltFileReference) {
@ -85,7 +85,7 @@ export function pipelineTaskDone(id: string, workerId: string, file: CobaltFileR
}); });
removeWorkerFromQueue(workerId); removeWorkerFromQueue(workerId);
checkTasks(); schedule();
} }
export function itemRunning(id: string, workerId: string) { export function itemRunning(id: string, workerId: string) {
@ -102,7 +102,7 @@ export function itemRunning(id: string, workerId: string) {
return queueData; return queueData;
}); });
checkTasks(); schedule();
} }
export function removeItem(id: string) { export function removeItem(id: string) {
@ -118,7 +118,7 @@ export function removeItem(id: string) {
return queueData; return queueData;
}); });
checkTasks(); schedule();
} }
export function clearQueue() { export function clearQueue() {