Checking in code

bryanjos · bryanjos · commit cec14237fe89 · 2017-09-06T17:52:32.000-05:00
diff --git a/src/javascript/lib/core/processes/process.js b/src/javascript/lib/core/processes/process.js
@@ -1,5 +1,5 @@
+import Patterns from 'tailored';
 import States from './states';
-import Core from '../../core';
 
 class Process {
   constructor(pid, func, args, mailbox, system) {
@@ -18,7 +18,7 @@ class Process {
     let retval = States.NORMAL;
 
     try {
-      await this.system.pause(this.pid);
+      await this.system.set_current(this.pid);
       await this.func.apply(null, this.args);
     } catch (e) {
       console.error(e);
@@ -52,16 +52,16 @@ class Process {
 
     for (let i = 0; i < messages.length; i++) {
       for (const clause of clauses) {
-        const value = await Core.Patterns.match_or_default_async(
-          clause[0].pattern,
+        const value = await Patterns.match_or_default_async(
+          clause.pattern,
           messages[i],
-          clause[0].guard,
+          clause.guard,
           States.NOMATCH,
         );
 
         if (value !== States.NOMATCH) {
           this.mailbox.removeAt(i);
-          return clause[1].apply(null, value);
+          return clause.fn.apply(null, value);
         }
       }
     }
diff --git a/src/javascript/lib/core/processes/process_system.js b/src/javascript/lib/core/processes/process_system.js
@@ -188,8 +188,10 @@ class ProcessSystem {
 
     if (pid) {
       this.mailboxes.get(pid).deliver(msg);
-
+      console.log('sending');
+      console.log(pid);
       if (this.suspended.has(pid)) {
+        console.log('Got suspended');
         const [args, resolver] = this.suspended.get(pid);
 
         const result = await this.__receive(pid, args);
@@ -204,20 +206,23 @@ class ProcessSystem {
   }
 
   async __receive(pid, args) {
+    this.set_current(pid);
     const process = this.pids.get(pid);
     return process.receive(args);
   }
 
   async receive(args, timeout = 0, timeoutFn = () => true) {
     let DateTimeout = null;
     const pid = this.current_process.pid;
-
+    console.log('Received');
+    console.log(pid);
     if (timeout === 0 || timeout === Infinity) {
       const result = await this.__receive(pid, args);
+      console.log(result);
       if (result !== States.NOMATCH) {
         return result;
       }
-      return this.suspend(args);
+      return this.suspend(pid, args);
     }
 
     DateTimeout = Date.now() + timeout;
@@ -244,11 +249,13 @@ class ProcessSystem {
     });
   }
 
-  suspend(args) {
+  suspend(pid, args) {
     this.current_process.status = States.SUSPENDED;
+    console.log(pid);
 
     return new Promise((resolver) => {
-      this.suspended.set(this.current_process.pid, [args, resolver]);
+      this.suspended.set(pid, [args, resolver]);
+      console.log('suspended');
     });
   }
 
diff --git a/src/javascript/lib/core/processes/scheduler.js b/src/javascript/lib/core/processes/scheduler.js
@@ -1,5 +1,3 @@
-import Task from './task';
-
 class ProcessQueue {
   constructor(pid) {
     this.pid = pid;
@@ -59,12 +57,13 @@ class Scheduler {
     } else {
       for (const [pid, queue] of this.queues) {
         let reductions = 0;
-
-        this.system.set_current(pid);
         while (queue && !queue.empty() && reductions < this.reductions_per_process) {
           const resolver = queue.next();
           this.isRunning = true;
+
           resolver(true);
+          this.system.set_current(pid);
+          console.log(`Scheduler ${pid}`);
           this.isRunning = false;
           reductions++;
         }
@@ -79,6 +78,10 @@ class Scheduler {
   pause(pid, resolver) {
     this.addToQueue(pid, resolver);
   }
+
+  schedule(pid, fun, args, resolver) {
+    this.addToQueue(pid, [fun, args, resolver]);
+  }
 }
 
 export default Scheduler;
diff --git a/src/javascript/lib/core/processes/task.js b/src/javascript/lib/core/processes/task.js
diff --git a/src/javascript/tests/core/processes.spec.js b/src/javascript/tests/core/processes.spec.js
@@ -1,4 +1,5 @@
 import test from 'ava';
+import Patterns from 'tailored';
 import ProcessSystem from '../../lib/core/processes/process_system';
 
 let system = null;
@@ -7,45 +8,35 @@ test.beforeEach(() => {
   system = new ProcessSystem();
 });
 
-test('spawn process', async (t) => {
-  const pid = system.spawn(async () => {
-    await system.sleep(Symbol.for('Infinity'));
-  });
-
-  t.is(system.list().length, 2);
-  t.is(system.list()[1], pid);
-});
-
-test('spawn linked process', async (t) => {
-  const pid = system.spawn_link(async () => {
-    await system.sleep(Symbol.for('Infinity'));
-  });
-
-  t.is(system.list().length, 2);
-  t.true(system.links.get(pid).has(system.list()[0]));
-  t.true(system.links.get(system.list()[0]).has(pid));
-});
-
 test('spawn linked process', async (t) => {
+  // spawn one process
   const pid1 = system.spawn_link(async () => {
+    const arg = Patterns.clause([Patterns.variable()], async x => console.log(x));
+
     await system.pause();
-    console.log('1');
+    console.log(`first process ${system.pid()}`);
+    await system.receive([arg]);
+    console.log(`first process ${system.pid()}`);
     await Math.log2(2);
     await system.pause();
-    console.log('2');
+    console.log(`first process ${system.pid()}`);
     await Math.log2(4);
   });
 
+  // spawn another process
   const pid2 = system.spawn_link(async () => {
     await system.pause();
-    console.log('3');
+    console.log(`second process ${system.pid()}`);
     await Math.log2(4);
     await system.pause();
-    console.log('4');
+    console.log(`second process ${system.pid()}`);
+    await system.send(pid1, 'This message was sent');
+    console.log(`second process ${system.pid()}`);
     await Math.log2(4);
   });
 
-  await system.sleep(Symbol.for('Infinity'));
+  console.log(`first process pid should be ${pid1}`);
+  console.log(`first process pid should be ${pid2}`);
 
   t.is(system.list().length, 3);
   t.is(system.list()[1], pid1);
