changed scheduler.async to scheduler.run. refactored gen_server

Author: bryanjos

src/processes/otp/gen_server.js

@@ -11,22 +11,42 @@ function start_process(module, args){
     let [ok, state] = module.init.apply(null, [args]);
     yield self.scheduler.put("state", state);
 
-    while(true){
-      yield self.scheduler.receive(function(args){
-        if(args[0] === "call"){
-          let result = module.handle_call(args[1], args[2], self.scheduler.get("state"));
-          self.scheduler.put("state", result[2]);
+    try{
+      while(true){
+        yield self.scheduler.receive(function(args){
+          let command = args[0];
 
-          self.scheduler.send(args[2], result[1]);
+          switch(command){
+            case "call":
+              var request = args[1];
+              var sender = args[2];
 
-        }else if(args[0] === "cast"){
-          let result = module.handle_cast(args[1], self.scheduler.get("state"));
-          self.scheduler.put("state", result[1]);
+              var [reply, response, new_state] = module.handle_call(request, sender, self.scheduler.get("state"));
+              self.scheduler.put("state", new_state);
 
-          self.scheduler.send(args[2], Symbol.for("ok"));
+              self.scheduler.send(sender, response);
+              break;
 
-        }        
-      });
+            case "cast":
+              var request = args[1];
+              var sender = args[2];
+
+              var [reply, new_state] = module.handle_cast(request, self.scheduler.get("state"));
+
+              self.scheduler.put("state", new_state);
+              self.scheduler.send(args[2], Symbol.for("ok"));
+
+              break;
+
+            case "stop":
+              throw "stop";
+          }       
+        });
+      }
+    }catch(e){
+      if(e !== "stop"){
+        throw e;
+      }
     }
   }
 }
@@ -47,4 +67,8 @@ function* cast(server, request){
   });  
 }
 
-export default { start, start_link, call, cast };
+function stop(server, request){
+  self.scheduler.send(server, ["stop"]); 
+}
+
+export default { start, start_link, call, cast, stop };

src/processes/scheduler.js

@@ -28,7 +28,7 @@ class Scheduler {
     });
   }
 
-  static * async(fun, args, context = null){
+  static * run(fun, args, context = null){
     if(fun.constructor.name === "GeneratorFunction"){
       return yield* fun.apply(context, args);
     }else{
@@ -53,14 +53,14 @@ class Scheduler {
   spawn_link(...args){
     if(args.length === 1){
       let fun = args[0];
-      return this.add_proc(fun, [], false).pid;
+      return this.add_proc(fun, [], true).pid;
 
     }else if(args.length === 3){
       let mod = args[0];
       let fun = args[1];
       let the_args = args[2];
 
-      return this.add_proc(mod[fun], the_args, false).pid;
+      return this.add_proc(mod[fun], the_args, true).pid;
     }
   }
 
@@ -93,7 +93,7 @@ class Scheduler {
     this.links.set(newpid, new Set());
 
     if(linked){
-      link(newpid);
+      this.link(newpid);
     }
 
     newproc.start();

test.js

@@ -19,15 +19,15 @@ const Stack = {
 }
 
 self.scheduler.spawn(function*(){
-  const [ok, pid] = yield* Scheduler.async(GenServer.start, [Stack, ["hello"]]);
+  const [ok, pid] = yield* Scheduler.run(GenServer.start, [Stack, ["hello"]]);
 
-  let a = yield* Scheduler.async(GenServer.call, [pid, "pop"]);
+  let a = yield* Scheduler.run(GenServer.call, [pid, "pop"]);
   console.log(a);
 
-  let b = yield* Scheduler.async(GenServer.cast, [pid, ["push", "world"]]);
+  let b = yield* Scheduler.run(GenServer.cast, [pid, ["push", "world"]]);
   console.log(b);
 
-  let c = yield* Scheduler.async(GenServer.call, [pid, "pop"]);
+  let c = yield* Scheduler.run(GenServer.call, [pid, "pop"]);
   console.log(c);
 });