# HG changeset patch
# User Edouard Tisserant <edouard.tisserant@gmail.com>
# Date 1696249502 -7200
# Node ID 4e1906d119d5163f2db31e4ef1eb09afd9829054
# Parent  722846bd6680cc07799ccca144453e97e9077b63
Runtime: fix non-interleaved worker loop

diff -r 722846bd6680 -r 4e1906d119d5 runtime/Worker.py
--- a/runtime/Worker.py	Fri Sep 29 13:46:36 2023 +0200
+++ b/runtime/Worker.py	Mon Oct 02 14:25:02 2023 +0200
@@ -66,16 +66,21 @@
         self.mutex.acquire()
         self.enabled = True
         if args or kwargs:
-            _job = job(*args, **kwargs)
-            _job.do()
-            # _job.success can't be None after do()
-            if not _job.success:
-                self.reraise(_job)
+            self.job = job(*args, **kwargs)
+            self.job.do()
+            # fail if first job fails
+            if not self.job.success:
+                self.reraise(self.job)
+            self.job = None
+
+        self.free.notify()
 
         while not self._finish:
             self.todo.wait_for(lambda: self.job is not None)
             self.job.do()
             self.done.notify()
+            self.job = None
+            self.free.notify()
             
         self.mutex.release()
 
@@ -90,9 +95,8 @@
 
         def do_pending_job():
             self.mutex.acquire()
-            if self.job is not None:
-                self.job.do()
-                self.done.notify_all()
+            self.job.do()
+            self.done.notify_all()
             self.mutex.release()
 
         def wakerfeedingloop():
@@ -104,8 +108,9 @@
                 self.job = job(*args, **kwargs)
                 waker(do_pending_job)
                 self.done.wait_for(lambda: self.job.success is not None)
+                # fail if first job fails
                 if not self.job.success:
-                    self.reraise(_job)
+                    self.reraise(self.job)
                 self.job = None
 
             self.free.notify()