Merge branch 'master' into async-await-continuations

Author: pmurias

src/vm/js/HLL/Backend.nqp

@@ -37,7 +37,11 @@ my sub run_command($command, :$stdout) {
       $read_all := 1;
   }
 
-  nqp::spawnprocasync($queue, $command, nqp::cwd(), nqp::getenvhash(), $config);
+  my $task := nqp::spawnprocasync($queue, $command, nqp::cwd(), nqp::getenvhash(), $config);
+
+  if $stdout {
+      nqp::permit($task, 1, -1);
+  }
 
   while !$done || !$read_all {
       if nqp::shift($queue) -> $task {

src/vm/js/Operations.nqp

@@ -1690,6 +1690,8 @@ class QAST::OperationsJS {
     add_simple_op('spawnprocasync', $T_OBJ, [$T_OBJ, $T_OBJ, $T_STR, $T_OBJ, $T_OBJ], :ctx, :side_effects);
     add_simple_op('killprocasync', $T_OBJ, [$T_OBJ, $T_INT], :side_effects);
 
+    add_simple_op('permit', $T_OBJ, [$T_OBJ, $T_INT, $T_INT], :side_effects);
+
     add_simple_op('semacquire', $T_OBJ, [$T_OBJ], :side_effects);
     add_simple_op('semtryacquire', $T_INT, [$T_OBJ], :side_effects);
     add_simple_op('semrelease', $T_OBJ, [$T_OBJ], :side_effects);

src/vm/js/nqp-runtime/io.js

@@ -524,3 +524,8 @@ op.spawnprocasync = function(ctx, queue, args, cwd, env, config) {
     config.content.get('done').$$call(ctx, null, result.status << 8);
   }
 };
+
+op.permit = function(handle, channel, permits) {
+  // TODO Implement permit handling properly
+  return handle;
+};

t/nqp/111-spawnprocasync.t

@@ -0,0 +1,71 @@
+plan(2);
+
+my $tmp-file := "tmp";
+spew($tmp-file, "\n");
+my $is-windows := nqp::stat($tmp-file, nqp::const::STAT_FILESIZE) == 2;
+nqp::unlink($tmp-file);
+
+my $args := $is-windows ?? nqp::list(nqp::getenvhash()<CompSpec>, '/c', 'echo aardvarks') !! nqp::list('/bin/sh', '-c', 'echo aardvarks');
+
+my sub create_buf($type) {
+    my $buf := nqp::newtype(nqp::null(), 'VMArray');
+    nqp::composetype($buf, nqp::hash('array', nqp::hash('type', $type)));
+    nqp::setmethcache($buf, nqp::hash('new', method () {nqp::create($buf)}));
+    $buf;
+}
+
+my $done := 0;
+
+my class Queue is repr('ConcBlockingQueue') { }
+my $queue := nqp::create(Queue);
+
+my @stdout_bytes;
+my $read_all := 0;
+
+my $called_ready := 0;
+
+
+my $config := nqp::hash(
+    'done', -> $status {
+        $done := $done + 1;
+    },
+    'ready', -> $stdin?, $stdout? {
+        $called_ready := $called_ready + 1;
+    },
+    'stdout_bytes', -> $seq, $data, $err {
+        if nqp::isconcrete($data) {
+            @stdout_bytes[$seq] := $data;
+        }
+        else {
+            $read_all := 1;
+        }
+    },
+    'buf_type', create_buf(uint8)
+);
+
+
+my $task := nqp::spawnprocasync($queue, $args, nqp::cwd(), nqp::getenvhash(), $config);
+
+nqp::permit($task, 1, -1);
+
+while !$done || !$read_all {
+  if nqp::shift($queue) -> $task {
+    if nqp::list($task) {
+      my $code := nqp::shift($task);
+      $code(|$task);
+    } else {
+      $task();
+    }
+  }
+}
+
+my class VMDecoder is repr('Decoder') {}
+my $dec := nqp::create(VMDecoder);
+nqp::decoderconfigure($dec, 'utf8', nqp::hash());
+
+is($called_ready, 1, 'called the ready callback once');
+
+for @stdout_bytes -> $bytes {
+    nqp::decoderaddbytes($dec, $bytes);
+}
+ok(nqp::decodertakeallchars($dec) ~~ /^aardvarks\s*$/, 'got the correct output');