Do not submit cancelled tasks

Fixes #198.

Author: trowski

src/Worker/Internal/ContextWorker.php

@@ -2,6 +2,9 @@
 
 namespace Amp\Parallel\Worker\Internal;
 
+use Amp\ByteStream\ReadableBuffer;
+use Amp\ByteStream\StreamChannel;
+use Amp\ByteStream\WritableBuffer;
 use Amp\Cancellation;
 use Amp\CancelledException;
 use Amp\DeferredFuture;
@@ -139,6 +142,10 @@ public function submit(Task $task, ?Cancellation $cancellation = null): Executio
             throw new StatusError("The worker has been shut down");
         }
 
+        if ($cancellation?->isRequested()) {
+            return self::createCancelledExecution($task, $cancellation);
+        }
+
         $receive = empty($this->jobQueue);
         $submission = new Internal\TaskSubmission($task);
         $jobId = $submission->getId();
@@ -220,4 +227,17 @@ public function kill(): void
         $this->exitStatus ??= Future::error(new WorkerException("The worker was killed"));
         $this->exitStatus->ignore();
     }
+
+    private static function createCancelledExecution(Task $task, Cancellation $cancellation): Execution
+    {
+        $channel = new StreamChannel(new ReadableBuffer(), new WritableBuffer());
+        $channel->close();
+
+        try {
+            $cancellation->throwIfRequested();
+            throw new \Error('Expected cancellation to have been requested');
+        } catch (CancelledException $exception) {
+            return new Execution($task, $channel, Future::error($exception));
+        }
+    }
 }

test/Worker/AbstractWorkerTest.php

@@ -3,6 +3,8 @@
 namespace Amp\Parallel\Test\Worker;
 
 use Amp\Cancellation;
+use Amp\CancelledException;
+use Amp\DeferredCancellation;
 use Amp\Future;
 use Amp\Parallel\Context\ContextFactory;
 use Amp\Parallel\Context\StatusError;
@@ -337,6 +339,22 @@ public function testSubmitAfterCancelledTask(): void
         $worker->shutdown();
     }
 
+    public function testCancelBeforeSubmit(): void
+    {
+        $this->expectException(CancelledException::class);
+
+        $worker = $this->createWorker();
+
+        $deferredCancellation = new DeferredCancellation();
+        $deferredCancellation->cancel();
+
+        try {
+            $worker->submit(new Fixtures\CancellingTask, $deferredCancellation->getCancellation())->await();
+        } finally {
+            $worker->shutdown();
+        }
+    }
+
     public function testCancellingCompletedTask(): void
     {
         $worker = $this->createWorker();