extras/threadedProcessing.ec: Fixed race condition

jerstlouis · jerstlouis · commit 038c620b9f44 · 2023-09-12T02:25:20.000-04:00
- Fixed race condition on initial setup of processing stage thread
- Also some attempts at clarifying remaining potential race conditions upon stage termination
diff --git a/extras/threadedProcessing.ec b/extras/threadedProcessing.ec
@@ -56,6 +56,7 @@ class ProcessingStage
       bool result = false;
       ProcessingTask task;
 
+      mutex.Wait();
       if(!thread)
       {
          thread = threads[0];
@@ -68,7 +69,6 @@ class ProcessingStage
 
       // PrintLn("Thread ", thread.number, " working!");
 
-      mutex.Wait();
       task = tasks.first;
       if(task)
       {
@@ -285,7 +285,10 @@ class ProcessingStage
          {
             semaphore.Release();
             t.Wait();
-            delete threads[i];
+            mutex.Wait();
+            delete t;
+            threads[i] = null;
+            mutex.Release();
          }
       }
       threads.size = 1;

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ class ProcessingStage`
`56`	`56`	`bool result = false;`
`57`	`57`	`ProcessingTask task;`
`58`	`58`
	`59`	`+ mutex.Wait();`
`59`	`60`	`if(!thread)`
`60`	`61`	`{`
`61`	`62`	`thread = threads[0];`
`@@ -68,7 +69,6 @@ class ProcessingStage`
`68`	`69`
`69`	`70`	`// PrintLn("Thread ", thread.number, " working!");`
`70`	`71`
`71`		`- mutex.Wait();`
`72`	`72`	`task = tasks.first;`
`73`	`73`	`if(task)`
`74`	`74`	`{`
`@@ -285,7 +285,10 @@ class ProcessingStage`
`285`	`285`	`{`
`286`	`286`	`semaphore.Release();`
`287`	`287`	`t.Wait();`
`288`		`- delete threads[i];`
	`288`	`+ mutex.Wait();`
	`289`	`+ delete t;`
	`290`	`+ threads[i] = null;`
	`291`	`+ mutex.Release();`
`289`	`292`	`}`
`290`	`293`	`}`
`291`	`294`	`threads.size = 1;`