Adds the concurrency features to suspend all example processes when an error is encountered and store the erroring process.

codeZeilen · codeZeilen · commit 7ea5d16766f2 · 2023-01-12T11:01:56.000+01:00
diff --git a/packages/Babylonian-Core.package/BPAbstractExample.class/instance/resumeTracing.st b/packages/Babylonian-Core.package/BPAbstractExample.class/instance/resumeTracing.st
@@ -1,4 +1,3 @@
 tracing
 resumeTracing
-	(self tracingProcess notNil and: [self traceInformation isProcessSuspended])
-		ifTrue: [self tracingProcess resume] 
+	^ self traceInformation resumeProcess
diff --git a/packages/Babylonian-Core.package/BPAbstractExample.class/instance/suspendTracingProcess.st b/packages/Babylonian-Core.package/BPAbstractExample.class/instance/suspendTracingProcess.st
@@ -1,4 +1,4 @@
 tracing
 suspendTracingProcess
 	
-	self tracingProcess ifNotNil: [self tracingProcess suspend]
+	^ self traceInformation suspendProcess
diff --git a/packages/Babylonian-Core.package/BPAbstractExample.class/instance/tracingIsStillRunning.st b/packages/Babylonian-Core.package/BPAbstractExample.class/instance/tracingIsStillRunning.st
@@ -1,4 +1,4 @@
 tracing
 tracingIsStillRunning
 	
-	^ self tracingProcess notNil and: [self tracingProcess isTerminated not]
+	^ self traceInformation tracingIsStillRunning
diff --git a/packages/Babylonian-Core.package/BPAbstractExample.class/instance/tracingProcess.st b/packages/Babylonian-Core.package/BPAbstractExample.class/instance/tracingProcess.st
diff --git a/packages/Babylonian-Core.package/BPAbstractExample.class/instance/tracingProcessIsSuspended.st b/packages/Babylonian-Core.package/BPAbstractExample.class/instance/tracingProcessIsSuspended.st
@@ -1,4 +1,4 @@
 tracing
 tracingProcessIsSuspended
 	
-	^ self tracingProcess notNil and: [self traceInformation isProcessSuspended]
+	^ self traceInformation isProcessSuspended
diff --git a/packages/Babylonian-Core.package/BPAbstractExample.class/methodProperties.json b/packages/Babylonian-Core.package/BPAbstractExample.class/methodProperties.json
@@ -33,7 +33,7 @@
 		"printOn:" : "jb 12/7/2020 18:10",
 		"probes" : "lu 12/1/2021 07:36",
 		"removeTrace" : "pre 1/11/2023 10:43",
-		"resumeTracing" : "pre 1/11/2023 10:43",
+		"resumeTracing" : "pre 1/12/2023 09:39",
 		"runOn:" : "pre 1/11/2023 10:47",
 		"runSetUp" : "pre 7/22/2022 21:17",
 		"runSetUpWith:" : "pre 7/22/2022 21:17",
@@ -44,7 +44,7 @@
 		"setUpScript" : "pre 1/11/2023 10:47",
 		"setUpScript:" : "pre 1/11/2023 10:48",
 		"startWatchdog:" : "pre 11/2/2022 11:40",
-		"suspendTracingProcess" : "joabe 9/30/2022 01:28",
+		"suspendTracingProcess" : "pre 1/12/2023 09:39",
 		"tearDownScript" : "pre 1/11/2023 10:48",
 		"tearDownScript:" : "pre 1/11/2023 10:48",
 		"timeout" : "pre 1/11/2023 10:46",
@@ -57,8 +57,7 @@
 		"traceToHaltAt:onCount:" : "lu 11/27/2021 14:03",
 		"traceValues" : "lu 12/6/2021 14:49",
 		"traceValuesMorphs" : "jb 5/20/2021 01:03",
-		"tracingIsStillRunning" : "joabe 9/28/2022 23:20",
-		"tracingProcess" : "pre 1/11/2023 10:46",
-		"tracingProcessIsSuspended" : "pre 1/11/2023 10:47",
+		"tracingIsStillRunning" : "pre 1/12/2023 09:40",
+		"tracingProcessIsSuspended" : "pre 1/12/2023 09:38",
 		"uniqueIdentifier" : "pre 1/21/2021 19:55",
 		"update:with:" : "pre 9/1/2022 21:54" } }
diff --git a/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/isProcessSuspended.st b/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/isProcessSuspended.st
@@ -1,4 +1,4 @@
-accessing
+process control
 isProcessSuspended
 
-	^ self tracingProcess isSuspended
+	^ self tracingProcess notNil and: [self tracingProcess isSuspended]
diff --git a/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/resumeProcess.st b/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/resumeProcess.st
@@ -0,0 +1,5 @@
+process control
+resumeProcess
+	
+	self tracingProcessAndDescendants do: [:p |
+		p isSuspended ifTrue: [p resume]]
diff --git a/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/suspendProcess.st b/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/suspendProcess.st
@@ -0,0 +1,5 @@
+process control
+suspendProcess
+	
+	(self tracingProcessAndDescendants copyWithout: Processor activeProcess) do: [:p |
+		(p isSuspended not and: [p isTerminated not]) ifTrue: [p suspend]]
diff --git a/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/terminateTracingProcess.st b/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/terminateTracingProcess.st
@@ -1,6 +1,5 @@
 process control
 terminateTracingProcess
 
-	self tracingProcess ifNotNil: [:aTracingProcess | 
-		{aTracingProcess} , (BPProcessGenealogy allDescendantsOf: aTracingProcess) do: [:p |
-			p isTerminated ifFalse: [p terminate]]].
+	self tracingProcessAndDescendants do: [:p |
+		p isTerminated ifFalse: [p terminate]]
diff --git a/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/tracingIsStillRunning.st b/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/tracingIsStillRunning.st
@@ -0,0 +1,4 @@
+process control
+tracingIsStillRunning
+	
+	^ self tracingProcess notNil and: [self tracingProcess isTerminated not]
diff --git a/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/tracingProcessAndDescendants.st b/packages/Babylonian-Core.package/BPExampleTraceInformation.class/instance/tracingProcessAndDescendants.st
@@ -0,0 +1,7 @@
+process control
+tracingProcessAndDescendants
+
+	^ self tracingProcess 
+		ifNil: [#()]
+		ifNotNil: [:aTracingProcess | 
+			{aTracingProcess} , (BPProcessGenealogy allDescendantsOf: aTracingProcess)]
diff --git a/packages/Babylonian-Core.package/BPExampleTraceInformation.class/methodProperties.json b/packages/Babylonian-Core.package/BPExampleTraceInformation.class/methodProperties.json
@@ -2,10 +2,14 @@
 	"class" : {
 		 },
 	"instance" : {
-		"isProcessSuspended" : "joabe 9/28/2022 01:08",
+		"isProcessSuspended" : "pre 1/12/2023 09:37",
 		"probes" : "jb 5/19/2021 19:35",
-		"terminateTracingProcess" : "pre 1/12/2023 09:06",
+		"resumeProcess" : "pre 1/12/2023 10:38",
+		"suspendProcess" : "pre 1/12/2023 10:57",
+		"terminateTracingProcess" : "pre 1/12/2023 10:37",
 		"trace" : "pre 8/18/2020 08:45",
 		"trace:" : "jb 7/1/2021 23:21",
+		"tracingIsStillRunning" : "pre 1/12/2023 09:40",
 		"tracingProcess" : "pre 8/18/2020 08:45",
-		"tracingProcess:" : "jb 12/7/2020 18:12" } }
+		"tracingProcess:" : "jb 12/7/2020 18:12",
+		"tracingProcessAndDescendants" : "pre 1/12/2023 10:37" } }
diff --git a/packages/Babylonian-Core.package/BPTrace.class/instance/erroredProcess..st b/packages/Babylonian-Core.package/BPTrace.class/instance/erroredProcess..st
@@ -0,0 +1,4 @@
+accessing
+erroredProcess: aProcess
+
+	erroredProcess := aProcess.
diff --git a/packages/Babylonian-Core.package/BPTrace.class/instance/erroredProcess.st b/packages/Babylonian-Core.package/BPTrace.class/instance/erroredProcess.st
@@ -0,0 +1,4 @@
+accessing
+erroredProcess
+
+	^ erroredProcess
diff --git a/packages/Babylonian-Core.package/BPTrace.class/instance/exampleExecutionProcess..st b/packages/Babylonian-Core.package/BPTrace.class/instance/exampleExecutionProcess..st
diff --git a/packages/Babylonian-Core.package/BPTrace.class/instance/exampleExecutionProcess.st b/packages/Babylonian-Core.package/BPTrace.class/instance/exampleExecutionProcess.st
diff --git a/packages/Babylonian-Core.package/BPTrace.class/instance/traceException..st b/packages/Babylonian-Core.package/BPTrace.class/instance/traceException..st
@@ -2,4 +2,5 @@ recording
 traceException: anException
 
 	exampleErrored := true.
-	recordedException := anException.
+	recordedException := anException.
+	erroredProcess := Processor activeProcess.
diff --git a/packages/Babylonian-Core.package/BPTrace.class/methodProperties.json b/packages/Babylonian-Core.package/BPTrace.class/methodProperties.json
@@ -7,11 +7,11 @@
 		"addTracedValue:forProbe:" : "pre 1/11/2023 16:25",
 		"assertions" : "pre 5/10/2019 10:09",
 		"chronologicallyTrackedTraceValuesCount" : "lu 11/22/2021 22:03",
+		"erroredProcess" : "pre 1/12/2023 09:32",
+		"erroredProcess:" : "pre 1/12/2023 09:32",
 		"example" : "pre 5/8/2019 16:26",
 		"example:" : "jb 12/7/2020 18:54",
 		"exampleErrored" : "pre 7/25/2019 12:19",
-		"exampleExecutionProcess" : "pre 7/25/2019 13:48",
-		"exampleExecutionProcess:" : "jb 12/7/2020 18:54",
 		"executionResult" : "jb 12/30/2021 21:09",
 		"hasTraceCompleted" : "pre 8/17/2020 09:55",
 		"hasTraceCompleted:" : "jb 12/7/2020 18:54",
@@ -30,7 +30,7 @@
 		"trace:forId:inContext:" : "jb 12/7/2020 18:54",
 		"traceAssignment:previousValues:forId:inContext:" : "jb 12/7/2020 18:54",
 		"traceBlock:enteredInContext:" : "pre 1/11/2023 16:25",
-		"traceException:" : "jb 12/7/2020 18:54",
+		"traceException:" : "pre 1/12/2023 10:33",
 		"traceException:forId:" : "jb 12/30/2021 21:10",
 		"traceExecutionResult:" : "jb 12/30/2021 21:15",
 		"traceValues" : "pre 1/11/2023 16:26",
diff --git a/packages/Babylonian-Core.package/BPTrace.class/properties.json b/packages/Babylonian-Core.package/BPTrace.class/properties.json
@@ -11,11 +11,11 @@
 		"executionResult",
 		"exampleErrored",
 		"recordedException",
-		"exampleExecutionProcess",
 		"hasTraceCompleted",
 		"blockRecord",
 		"chronologicallyTrackedTraceValuesCount",
-		"mutex" ],
+		"mutex",
+		"erroredProcess" ],
 	"name" : "BPTrace",
 	"pools" : [
 		 ],
diff --git a/packages/Babylonian-Core.package/BPWrappedTrace.class/instance/exampleExecutionProcess..st b/packages/Babylonian-Core.package/BPWrappedTrace.class/instance/exampleExecutionProcess..st
diff --git a/packages/Babylonian-Core.package/BPWrappedTrace.class/instance/exampleExecutionProcess.st b/packages/Babylonian-Core.package/BPWrappedTrace.class/instance/exampleExecutionProcess.st
diff --git a/packages/Babylonian-Core.package/BPWrappedTrace.class/methodProperties.json b/packages/Babylonian-Core.package/BPWrappedTrace.class/methodProperties.json
@@ -5,8 +5,6 @@
 		"assertions" : "pre 9/6/2022 09:44",
 		"chronologicallyTrackedTraceValuesCount" : "pre 9/6/2022 09:44",
 		"exampleErrored" : "pre 9/6/2022 09:44",
-		"exampleExecutionProcess" : "pre 9/6/2022 09:45",
-		"exampleExecutionProcess:" : "pre 9/6/2022 09:45",
 		"executionResult" : "pre 9/6/2022 09:45",
 		"hasTraceCompleted" : "pre 9/6/2022 09:45",
 		"hasTraceCompleted:" : "pre 9/6/2022 09:45",
diff --git a/packages/Babylonian-Core.package/BlockClosure.extension/instance/bpTraceInBackgroundForExample..st b/packages/Babylonian-Core.package/BlockClosure.extension/instance/bpTraceInBackgroundForExample..st
@@ -7,9 +7,8 @@ bpTraceInBackgroundForExample: anExample
 	traceProcess := [[self bpTraceWith: tracer] 
 		on: BPExampleExecutionInterrupted
 		do: [:e | 
-			"We need to remember this in order to terminate example processes
-			whenever a trace leaves the registry."
-			e trace exampleExecutionProcess: Processor activeProcess.]] newProcess.
+			"We need to remember this in order to debug the error"
+			e trace erroredProcess: Processor activeProcess.]] newProcess.
 	traceProcess 
 		priority: Processor userSchedulingPriority;
 		name: 'Execution of example ' , anExample exampleName;
diff --git a/packages/Babylonian-Core.package/BlockClosure.extension/methodProperties.json b/packages/Babylonian-Core.package/BlockClosure.extension/methodProperties.json
@@ -4,5 +4,5 @@
 	"instance" : {
 		"bpTraceForExample:" : "pre 5/6/2021 18:20",
 		"bpTraceForExample:andHaltAt:onCount:" : "lu 11/27/2021 13:26",
-		"bpTraceInBackgroundForExample:" : "pre 1/11/2023 16:14",
+		"bpTraceInBackgroundForExample:" : "pre 1/12/2023 09:32",
 		"bpTraceWith:" : "jb 12/30/2021 21:21" } }
diff --git a/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/setUp.st b/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/setUp.st
@@ -1,4 +1,9 @@
 tests
 setUp
 
-	preventTerminationSemaphore := Semaphore new.
+	preventTerminationSemaphore := Semaphore new.
+	processesToTerminate := Set new.
+	example := BPMethodExample new
+		exampleName: 'test example';
+		method: BPTestManuallyInstrumentedClass>>#methodA;
+		yourself.
diff --git a/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/tearDown.st b/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/tearDown.st
@@ -1,4 +1,6 @@
 tests
 tearDown
 
-	10 timesRepeat: [preventTerminationSemaphore signal].
+	10 timesRepeat: [preventTerminationSemaphore signal].
+	processesToTerminate do: [:p | 
+		p isTerminated ifFalse: [p terminate]].
diff --git a/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/testKeepingTrackOfAllDescendingProcesses.st b/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/testKeepingTrackOfAllDescendingProcesses.st
@@ -1,11 +1,7 @@
 tests
 testKeepingTrackOfAllDescendingProcesses
 
-	| example traceAndProcess semaphore process1 descendants |
-	example := BPMethodExample new
-		exampleName: 'test example';
-		method: BPTestManuallyInstrumentedClass>>#methodA;
-		yourself.
+	| traceAndProcess semaphore process1 descendants |
 	descendants := nil.
 	semaphore := Semaphore new.
 	traceAndProcess := [2+3.
diff --git a/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/testProbingAMethodCalledInANewProcess.st b/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/testProbingAMethodCalledInANewProcess.st
@@ -1,12 +1,7 @@
 tests
 testProbingAMethodCalledInANewProcess
 
-	| example traceAndProcess semaphore |
-	example := BPMethodExample new
-		exampleName: 'test example';
-		method: BPTestManuallyInstrumentedClass>>#methodA;
-		yourself.
-		
+	| traceAndProcess semaphore |
 	semaphore := Semaphore new.
 	traceAndProcess := [
 		[BPTestManuallyInstrumentedClass new methodA] fork.
diff --git a/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/testSuspendOnErroredDescendantProcesses.st b/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/testSuspendOnErroredDescendantProcesses.st
@@ -0,0 +1,22 @@
+tests
+testSuspendOnErroredDescendantProcesses
+
+	| traceAndProcess descendants processesStartedSemaphore allTracingProcesses |
+	descendants := nil.
+	preventTerminationSemaphore := Semaphore new.
+	processesStartedSemaphore := Semaphore new.
+	traceAndProcess := [
+		processesToTerminate add: ([[2 + 3. Processor yield] repeat] 
+			forkAt: Processor userBackgroundPriority
+			named: 'test process infinite').
+		processesToTerminate add: ([2 + 3. 1 / 0. 2 + 3] 
+			forkNamed: 'test process error').
+		processesStartedSemaphore signal.
+		preventTerminationSemaphore wait.] bpTraceInBackgroundForExample: example.
+	example traceInformation tracingProcess: traceAndProcess second.
+	traceAndProcess second resume.
+	processesStartedSemaphore wait.
+	
+	allTracingProcesses := (BPProcessGenealogy allDescendantsOf: traceAndProcess second) , {traceAndProcess second}.
+	self assert: (allTracingProcesses allSatisfy: [:p | p isSuspended]).
+	
diff --git a/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/testTerminatingAllDescendantProcesses.st b/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/instance/testTerminatingAllDescendantProcesses.st
@@ -1,11 +1,7 @@
 tests
 testTerminatingAllDescendantProcesses
 
-	| example traceAndProcess process1 descendants descendantsSetSemaphore preventTerminationSemaphore |
-	example := BPMethodExample new
-		exampleName: 'test example';
-		method: BPTestManuallyInstrumentedClass>>#methodA;
-		yourself.
+	| traceAndProcess process1 descendants descendantsSetSemaphore preventTerminationSemaphore |
 	descendants := nil.
 	preventTerminationSemaphore := Semaphore new.
 	descendantsSetSemaphore := Semaphore new.
diff --git a/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/methodProperties.json b/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/methodProperties.json
@@ -2,8 +2,9 @@
 	"class" : {
 		 },
 	"instance" : {
-		"setUp" : "pre 1/12/2023 09:09",
-		"tearDown" : "pre 1/12/2023 09:10",
-		"testKeepingTrackOfAllDescendingProcesses" : "pre 1/12/2023 09:00",
-		"testProbingAMethodCalledInANewProcess" : "pre 1/11/2023 16:18",
-		"testTerminatingAllDescendantProcesses" : "pre 1/12/2023 09:13" } }
+		"setUp" : "pre 1/12/2023 10:59",
+		"tearDown" : "pre 1/12/2023 10:53",
+		"testKeepingTrackOfAllDescendingProcesses" : "pre 1/12/2023 11:00",
+		"testProbingAMethodCalledInANewProcess" : "pre 1/12/2023 11:00",
+		"testSuspendOnErroredDescendantProcesses" : "pre 1/12/2023 11:00",
+		"testTerminatingAllDescendantProcesses" : "pre 1/12/2023 11:00" } }
diff --git a/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/properties.json b/packages/Babylonian-Tests.package/BPConcurrentTracingTest.class/properties.json
@@ -6,7 +6,9 @@
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
-		"preventTerminationSemaphore" ],
+		"preventTerminationSemaphore",
+		"processesToTerminate",
+		"example" ],
 	"name" : "BPConcurrentTracingTest",
 	"pools" : [
 		 ],
diff --git a/packages/Babylonian-Tests.package/BPTracingTest.class/instance/testKeepingTrackOfAllDescendingProcesses.st b/packages/Babylonian-Tests.package/BPTracingTest.class/instance/testKeepingTrackOfAllDescendingProcesses.st
@@ -0,0 +1,23 @@
+tests - concurrent tracing
+testKeepingTrackOfAllDescendingProcesses
+
+	| example traceAndProcess semaphore process1 descendants |
+	example := BPMethodExample new
+		exampleName: 'test example';
+		method: BPTestManuallyInstrumentedClass>>#methodA;
+		yourself.
+	descendants := nil.
+	semaphore := Semaphore new.
+	traceAndProcess := [2+3.
+	process1 := Processor activeProcess.
+	 	[2+3. 
+			[descendants := BPProcessGenealogy allDescendantsOf: process1.
+			semaphore signal.] 
+				forkNamed: 'the third'
+		] forkNamed: 'the second'] bpTraceInBackgroundForExample: example.
+	traceAndProcess second resume.
+	semaphore wait.
+
+	self assert: descendants size = 2.
+	self assert: descendants first name = 'the second'.
+	self assert: descendants second name = 'the third'.
diff --git a/packages/Babylonian-Tests.package/BPTracingTest.class/methodProperties.json b/packages/Babylonian-Tests.package/BPTracingTest.class/methodProperties.json
@@ -12,6 +12,7 @@
 		"testExampleWithProbesCountsTraceValuesCorrectly" : "lu 11/22/2021 22:03",
 		"testExampleWithProbesReturnsTraceValuesSortedChronologically" : "pre 1/11/2023 13:43",
 		"testFinishedTracesAreComplete" : "jb 12/7/2020 19:10",
+		"testKeepingTrackOfAllDescendingProcesses" : "pre 1/12/2023 09:00",
 		"testProfilingTracingRecordsTimesToRun" : "pre 11/29/2022 16:42",
 		"testTheTracingReturnsTheExpressionValueAnyways" : "jb 12/7/2020 19:10",
 		"testTracingAnErrorRecordsTheStack" : "jb 12/7/2020 19:10",
diff --git a/packages/Babylonian-UI.package/BPToolSet.class/class/handleError..st b/packages/Babylonian-UI.package/BPToolSet.class/class/handleError..st
diff --git a/packages/Babylonian-UI.package/BPToolSet.class/methodProperties.json b/packages/Babylonian-UI.package/BPToolSet.class/methodProperties.json
