Skip to content

Commit 42fc446

Browse files
committed
Renamed TaskQueue to Scheduler
1 parent c534542 commit 42fc446

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

src/processes/process.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Process {
4444
const function_scope = this;
4545
let machine = this.main();
4646

47-
this.system.queue(function() {
47+
this.system.schedule(function() {
4848
function_scope.system.set_current(function_scope.pid);
4949
function_scope.run(machine, machine.next());
5050
}, this.pid);
@@ -112,7 +112,7 @@ class Process {
112112

113113
let result = value[3]();
114114

115-
this.system.queue(function() {
115+
this.system.schedule(function() {
116116
function_scope.system.set_current(function_scope.pid);
117117
function_scope.run(machine, machine.next(result));
118118
});
@@ -127,14 +127,14 @@ class Process {
127127
function_scope.run(machine, step);
128128
});
129129
}else{
130-
this.system.queue(function() {
130+
this.system.schedule(function() {
131131
function_scope.system.set_current(function_scope.pid);
132132
function_scope.run(machine, machine.next(result));
133133
});
134134
}
135135

136136
}else{
137-
this.system.queue(function() {
137+
this.system.schedule(function() {
138138
function_scope.system.set_current(function_scope.pid);
139139
function_scope.run(machine, machine.next(value));
140140
});

src/processes/process_system.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import Mailbox from "./mailbox";
55
import Process from "./process";
66
import States from "./states";
7-
import TaskQueue from "./task_queue";
7+
import Scheduler from "./scheduler";
88

99
class ProcessSystem {
1010

@@ -15,9 +15,9 @@ class ProcessSystem {
1515
this.names = new Map();
1616
this.links = new Map();
1717

18-
const throttle = 5; //ms between queued tasks
18+
const throttle = 5; //ms between scheduled tasks
1919
this.current_process = null;
20-
this.task_queue = new TaskQueue(throttle);
20+
this.scheduler = new Scheduler(throttle);
2121
this.suspended = new Map();
2222

2323
let process_system_scope = this;
@@ -103,7 +103,7 @@ class ProcessSystem {
103103
remove_proc(pid, exitreason){
104104
this.pids.delete(pid);
105105
this.unregister(pid);
106-
this.task_queue.removePid(pid);
106+
this.scheduler.removePid(pid);
107107

108108
if(this.links.get(pid)){
109109
for (let linkpid in this.links.get(pid).entries()) {
@@ -162,7 +162,7 @@ class ProcessSystem {
162162
if(this.suspended.has(pid)){
163163
let fun = this.suspended.get(pid);
164164
this.suspended.delete(pid);
165-
this.queue(fun);
165+
this.schedule(fun);
166166
}
167167
}
168168

@@ -197,12 +197,12 @@ class ProcessSystem {
197197

198198
delay(fun, time){
199199
this.current_process.status = States.SLEEPING;
200-
this.task_queue.queueFuture(this.current_process.pid, time, fun);
200+
this.scheduler.scheduleFuture(this.current_process.pid, time, fun);
201201
}
202202

203-
queue(fun, pid){
203+
schedule(fun, pid){
204204
const the_pid = pid != null ? pid : this.current_process.pid;
205-
this.task_queue.queue(the_pid, fun);
205+
this.scheduler.schedule(the_pid, fun);
206206
}
207207

208208
exit(one, two){
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
"use strict";
22

3-
//TaskQueue. Borrowed and modified from RxJS's Default Scheduler.
3+
//Scheduler. Borrowed and modified from RxJS's Default Scheduler.
44
//While it is probably more robust, this should fit the needs for
55
//this project.
66

7-
class TaskQueue {
7+
class Scheduler {
88
constructor(throttle = 0){
99
this.nextTaskId = 1;
1010
this.tasks = {}
1111
this.isRunning = false;
1212
this.invokeLater = function (callback) { setTimeout(callback, throttle); }
1313
}
1414

15-
removeFromTaskQueue(taskId){
15+
removeFromScheduler(taskId){
1616
delete this.tasks[taskId];
1717
}
1818

@@ -23,7 +23,7 @@ class TaskQueue {
2323

2424
for(let taskId of Object.keys(this.tasks)){
2525
if(this.tasks[taskId] && this.tasks[taskId][0] === pid){
26-
this.removeFromTaskQueue(taskId);
26+
this.removeFromScheduler(taskId);
2727
}
2828
}
2929

@@ -50,7 +50,7 @@ class TaskQueue {
5050
result = e;
5151
}
5252

53-
this.removeFromTaskQueue(taskId);
53+
this.removeFromScheduler(taskId);
5454
this.isRunning = false;
5555

5656
if (result instanceof Error) {
@@ -62,7 +62,7 @@ class TaskQueue {
6262
}
6363
}
6464

65-
addToTaskQueue(pid, task, dueTime = 0) {
65+
addToScheduler(pid, task, dueTime = 0) {
6666
let id = this.nextTaskId ++;
6767
this.tasks[id] = [ pid, task ];
6868

@@ -75,13 +75,13 @@ class TaskQueue {
7575
return id;
7676
};
7777

78-
queue(pid, task){
79-
this.addToTaskQueue(pid, () => { task(); });
78+
schedule(pid, task){
79+
this.addToScheduler(pid, () => { task(); });
8080
}
8181

82-
queueFuture(pid, dueTime, task){
83-
this.addToTaskQueue(pid, () => { task(); }, dueTime);
82+
scheduleFuture(pid, dueTime, task){
83+
this.addToScheduler(pid, () => { task(); }, dueTime);
8484
}
8585
}
8686

87-
export default TaskQueue;
87+
export default Scheduler;

0 commit comments

Comments
 (0)