Simplifies the background tracing logic considerably.

codeZeilen · codeZeilen · commit c1bbed2ae577 · 2023-01-11T10:22:27.000+01:00
diff --git a/packages/Babylonian-Core.package/BPContinuousRunExample.class/instance/traceAsyncNotifying..st b/packages/Babylonian-Core.package/BPContinuousRunExample.class/instance/traceAsyncNotifying..st
diff --git a/packages/Babylonian-Core.package/BPContinuousRunExample.class/methodProperties.json b/packages/Babylonian-Core.package/BPContinuousRunExample.class/methodProperties.json
@@ -9,5 +9,4 @@
 		"stopTracing" : "pre 9/6/2022 09:07",
 		"toggleTracing" : "pre 9/6/2022 09:11",
 		"trace" : "pre 9/5/2022 14:51",
-		"traceAsyncNotifying:" : "pre 9/5/2022 14:51",
 		"traceInBackground" : "pre 9/5/2022 14:52" } }
diff --git a/packages/Babylonian-Core.package/BPExample.class/instance/traceAsyncNotifying..st b/packages/Babylonian-Core.package/BPExample.class/instance/traceAsyncNotifying..st
diff --git a/packages/Babylonian-Core.package/BPExample.class/instance/traceInBackground.st b/packages/Babylonian-Core.package/BPExample.class/instance/traceInBackground.st
@@ -2,20 +2,10 @@ tracing
 traceInBackground
 	
 	<bpRelevantMethod>
-	| exampleExecution promise |
+	| traceAndProcess |
 	self ensureTerminatedProcess.
-	promise := Promise new.
-	promise whenResolved: [:trace |
-		Project current addDeferredUIMessage: [traceInformation trace: trace]].
-	exampleExecution := [[
-		self traceAsyncNotifying: [:intermediateTrace | 
-			promise resolveWith: intermediateTrace]]
-				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.
-					promise resolveWith: e trace.]].
-	traceInformation tracingProcess: (exampleExecution 
-		forkAt: Processor userSchedulingPriority 
-		named: 'Execution of example ' , self exampleName) 
+	
+	traceAndProcess := [self execute] bpTraceInBackgroundForExample: self.
+	traceInformation 
+		trace: traceAndProcess first;
+		tracingProcess: traceAndProcess second.
diff --git a/packages/Babylonian-Core.package/BPExample.class/methodProperties.json b/packages/Babylonian-Core.package/BPExample.class/methodProperties.json
@@ -51,8 +51,7 @@
 		"timeout:" : "joabe 9/27/2022 20:26",
 		"toggleIsActive" : "pre 10/23/2020 10:16",
 		"trace" : "pre 5/6/2021 17:47",
-		"traceAsyncNotifying:" : "pre 5/6/2021 17:48",
-		"traceInBackground" : "pre 5/6/2021 17:47",
+		"traceInBackground" : "pre 1/11/2023 10:14",
 		"traceToHaltAt:" : "lu 11/27/2021 14:06",
 		"traceToHaltAt:onCount:" : "lu 11/27/2021 14:03",
 		"traceValues" : "lu 12/6/2021 14:49",
diff --git a/packages/Babylonian-Core.package/BPScriptExample.class/instance/prepareRunState.st b/packages/Babylonian-Core.package/BPScriptExample.class/instance/prepareRunState.st
@@ -1,5 +1,4 @@
 executing
 prepareRunState
 	
-	"By default examples do not prepare any run state"
 	^ BPScriptExampleRunConfiguration new
diff --git a/packages/Babylonian-Core.package/BPScriptExample.class/methodProperties.json b/packages/Babylonian-Core.package/BPScriptExample.class/methodProperties.json
@@ -5,7 +5,7 @@
 		"asPragma" : "pre 5/3/2021 17:03",
 		"initializeFromPragma:" : "pre 7/22/2022 21:07",
 		"morphClass" : "pre 9/30/2020 10:41",
-		"prepareRunState" : "pre 7/22/2022 21:19",
+		"prepareRunState" : "pre 1/11/2023 09:48",
 		"runOn:" : "pre 7/22/2022 21:37",
 		"script" : "pre 9/30/2020 11:00",
 		"script:" : "jb 12/7/2020 18:13",
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/instance/ignoredMessagesInStack.st b/packages/Babylonian-Core.package/BPTraceValue.class/instance/ignoredMessagesInStack.st
@@ -5,7 +5,7 @@ ignoredMessagesInStack
 		MethodReference class: BPExample selector: #traceInBackground.
 		MethodReference class: BlockClosure selector: #on:do:.
 		MethodReference class: BPExample selector: #traceAsyncNotifying:.
-		MethodReference class: BlockClosure selector: #bpTraceAsyncForExample:notifying:.
+		MethodReference class: BlockClosure selector: #bpTraceInBackgroundForExample:.
 		MethodReference class: BlockClosure selector: #bpTraceWith:.
 		MethodReference class: Symbol selector: #withLayerDo:.
 		MethodReference class: Array selector: #withLayersDo:.
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/methodProperties.json b/packages/Babylonian-Core.package/BPTraceValue.class/methodProperties.json
@@ -11,7 +11,7 @@
 		"containedMethodReference" : "pre 11/16/2022 16:04",
 		"filteredStack" : "pre 11/16/2022 15:57",
 		"ignoredClassesInStack" : "pre 11/16/2022 15:56",
-		"ignoredMessagesInStack" : "pre 11/16/2022 15:56",
+		"ignoredMessagesInStack" : "pre 1/11/2023 10:15",
 		"isStackFull" : "jb 6/30/2021 01:26",
 		"printOn:" : "jb 5/19/2021 20:59",
 		"shouldBeIgnored:" : "pre 11/16/2022 16:04",
diff --git a/packages/Babylonian-Core.package/BlockClosure.extension/instance/bpTraceAsyncForExample.notifying..st b/packages/Babylonian-Core.package/BlockClosure.extension/instance/bpTraceAsyncForExample.notifying..st
diff --git a/packages/Babylonian-Core.package/BlockClosure.extension/instance/bpTraceInBackgroundForExample..st b/packages/Babylonian-Core.package/BlockClosure.extension/instance/bpTraceInBackgroundForExample..st
@@ -0,0 +1,18 @@
+*Babylonian-Core
+bpTraceInBackgroundForExample: anExample
+	
+	<bpRelevantMethod>
+	| tracer traceProcess |
+	tracer := BPTracer forExample: 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.
+	traceProcess 
+		priority: Processor userSchedulingPriority;
+		name: 'Execution of example ' , anExample exampleName.
+	(traceProcess future: 1 "to delay process start") resume.
+	^ {tracer intermediateTrace . traceProcess}
+	
diff --git a/packages/Babylonian-Core.package/BlockClosure.extension/methodProperties.json b/packages/Babylonian-Core.package/BlockClosure.extension/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
-		"bpTraceAsyncForExample:notifying:" : "pre 5/6/2021 18:20",
 		"bpTraceForExample:" : "pre 5/6/2021 18:20",
 		"bpTraceForExample:andHaltAt:onCount:" : "lu 11/27/2021 13:26",
+		"bpTraceInBackgroundForExample:" : "pre 1/11/2023 10:14",
 		"bpTraceWith:" : "jb 12/30/2021 21:21" } }
diff --git a/packages/Babylonian-Tests.package/BPTracingTest.class/instance/testAsyncTracingReturnsIntermediateTrace.st b/packages/Babylonian-Tests.package/BPTracingTest.class/instance/testAsyncTracingReturnsIntermediateTrace.st
@@ -1,7 +1,8 @@
 tests - asynchronous tracing
 testAsyncTracingReturnsIntermediateTrace
 
-	[BPTestManuallyInstrumentedClass new methodA] 
-		bpTraceAsyncForExample: nil
-		notifying: [:t | self assert: t hasTraceCompleted not].
+	| traceAndProcess |
+	traceAndProcess := [BPTestManuallyInstrumentedClass new methodA]
+		bpTraceInBackgroundForExample: BPScriptExample new.
+	self assert: traceAndProcess first hasTraceCompleted not.
 	
diff --git a/packages/Babylonian-Tests.package/BPTracingTest.class/instance/testAsyncTracingReturnsSameTrace.st b/packages/Babylonian-Tests.package/BPTracingTest.class/instance/testAsyncTracingReturnsSameTrace.st
diff --git a/packages/Babylonian-Tests.package/BPTracingTest.class/methodProperties.json b/packages/Babylonian-Tests.package/BPTracingTest.class/methodProperties.json
@@ -7,8 +7,7 @@
 		"testActivateBPTracingOnBlock" : "pre 8/17/2020 10:31",
 		"testActivateTracingGivenAnExample" : "pre 9/30/2020 09:47",
 		"testActivateTracingGivenAnExampleAndMethods" : "pre 9/30/2020 09:47",
-		"testAsyncTracingReturnsIntermediateTrace" : "jb 12/7/2020 19:10",
-		"testAsyncTracingReturnsSameTrace" : "jb 12/7/2020 19:10",
+		"testAsyncTracingReturnsIntermediateTrace" : "pre 1/11/2023 10:16",
 		"testExampleWithNoProbeHasNoTraceValues" : "lu 11/22/2021 22:03",
 		"testExampleWithProbesCountsTraceValuesCorrectly" : "lu 11/22/2021 22:03",
 		"testExampleWithProbesReturnsTraceValuesSortedChronologically" : "jb 5/20/2021 17:32",
