Merge branch 'develop' into feature/instance-probes

hpi-swa-lab · Oct 7, 2023 · 9536103 · 9536103
2 parents 2bc6f0a + 7b5c92a
commit 9536103
Show file tree

Hide file tree

Showing 97 changed files with 323 additions and 239 deletions.
diff --git a/packages/Babylonian-Compiler.package/CSPartialMethod.extension/instance/^equals.st b/packages/Babylonian-Compiler.package/CSPartialMethod.extension/instance/^equals.st
@@ -0,0 +1,8 @@
+*Babylonian-Compiler
+= anotherPartialMethod
+	"see #hash"
+
+	^ anotherPartialMethod class == self class
+	and: [self basicLayers = anotherPartialMethod basicLayers
+	and: [self selector = anotherPartialMethod selector
+	and: [self methodClass name = anotherPartialMethod methodClass name]]]
diff --git a/packages/Babylonian-Compiler.package/CSPartialMethod.extension/instance/hash.st b/packages/Babylonian-Compiler.package/CSPartialMethod.extension/instance/hash.st
@@ -0,0 +1,5 @@
+*Babylonian-Compiler
+hash
+	"see #="
+
+	^ (self basicLayers hash bitXor: self selector hash) bitXor: self class name hash
diff --git a/packages/Babylonian-Compiler.package/CSPartialMethod.extension/methodProperties.json b/packages/Babylonian-Compiler.package/CSPartialMethod.extension/methodProperties.json
@@ -0,0 +1,6 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"=" : "sp 8/23/2023 14:35",
+		"hash" : "sp 8/23/2023 14:36" } }
diff --git a/packages/Babylonian-Compiler.package/CSPartialMethod.extension/properties.json b/packages/Babylonian-Compiler.package/CSPartialMethod.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "CSPartialMethod" }
diff --git a/packages/Babylonian-Core.package/BPAbstractExample.class/instance/runSetUpWith..st b/packages/Babylonian-Core.package/BPAbstractExample.class/instance/runSetUpWith..st
@@ -2,7 +2,8 @@ tracing
 runSetUpWith: aState
 
 	| result |
-	self setUpScript ifNotNil: [
-		result := Compiler evaluate: self setUpScript notifying: aState.
-		result isSymbol ifTrue: [
-			self method methodClass perform: result]]
+	#bpInstrumented withoutLayerDo: [
+		self setUpScript ifNotNil: [
+			result := Compiler evaluate: self setUpScript notifying: aState.
+			result isSymbol ifTrue: [
+				self method methodClass perform: result]]]
diff --git a/packages/Babylonian-Core.package/BPAbstractExample.class/instance/runTearDownWith..st b/packages/Babylonian-Core.package/BPAbstractExample.class/instance/runTearDownWith..st
@@ -2,7 +2,8 @@ tracing
 runTearDownWith: aState
 
 	| result |
-	self tearDownScript ifNotNil: [
-		result := Compiler evaluate: self tearDownScript notifying: aState.
-		result isSymbol ifTrue: [
-			self method methodClass perform: result]]
+	#bpInstrumented withoutLayerDo: [
+		self tearDownScript ifNotNil: [
+			result := Compiler evaluate: self tearDownScript notifying: aState.
+			result isSymbol ifTrue: [
+				self method methodClass perform: result]]]
diff --git a/packages/Babylonian-Core.package/BPAbstractExample.class/instance/runWithTimeoutOn..st b/packages/Babylonian-Core.package/BPAbstractExample.class/instance/runWithTimeoutOn..st
@@ -5,11 +5,11 @@ runWithTimeoutOn: initialState
 	complete := false.
 
 	self startWatchdog: [
-		semaphore waitTimeoutMSecs: self timeout. 
+		self timeout milliSeconds wait. 
 		"We sadly cannot simply ask self tracingIsStillRunning as the values rely
 		on this method's return value which is not done at this point. So uglyish complete workaround"  
 		complete ifFalse: [self suspendTracingProcess]].
 
 	[ ^ self runOn: initialState] ensure: [
-		complete := true. 
-		semaphore signal]
+		complete := true.
+		semaphore terminateProcess.]
diff --git a/packages/Babylonian-Core.package/BPAbstractExample.class/instance/startWatchdog..st b/packages/Babylonian-Core.package/BPAbstractExample.class/instance/startWatchdog..st
@@ -1,7 +1,6 @@
 private
 startWatchdog: watchdogBlock
 
-	| watchdog |
-	watchdog := watchdogBlock newProcess.
-	watchdog priority: Processor timingPriority-1.
-	watchdog resume.	
+	watchdogBlock 
+		forkAt: Processor timingPriority-1 
+		named: 'watchdog for ' , self exampleName.
diff --git a/packages/Babylonian-Core.package/BPAbstractExample.class/methodProperties.json b/packages/Babylonian-Core.package/BPAbstractExample.class/methodProperties.json
@@ -36,13 +36,13 @@
 		"removeTrace" : "pre 1/11/2023 10:43",
 		"resumeTracing" : "pre 1/12/2023 09:39",
 		"runOn:" : "pre 1/11/2023 10:47",
-		"runSetUpWith:" : "pre 7/22/2022 21:17",
-		"runTearDownWith:" : "pre 7/22/2022 21:17",
-		"runWithTimeoutOn:" : "pre 11/2/2022 11:42",
+		"runSetUpWith:" : "pre 8/23/2023 11:07",
+		"runTearDownWith:" : "pre 8/23/2023 11:07",
+		"runWithTimeoutOn:" : "pre 8/23/2023 12:04",
 		"setIsActive:" : "pre 1/11/2023 10:47",
 		"setUpScript" : "pre 1/11/2023 10:47",
 		"setUpScript:" : "pre 1/11/2023 10:48",
-		"startWatchdog:" : "pre 11/2/2022 11:40",
+		"startWatchdog:" : "pre 8/23/2023 12:01",
 		"suspendTracingProcess" : "pre 1/12/2023 09:39",
 		"tearDownScript" : "pre 1/11/2023 10:48",
 		"tearDownScript:" : "pre 1/11/2023 10:48",

diff --git a/packages/Babylonian-Core.package/BPExample.class/instance/timeout.st b/packages/Babylonian-Core.package/BPExample.class/instance/timeout.st
@@ -1,4 +1,4 @@
 accessing
 timeout
 
-	^ timeout ifNil: [timeout := 30000]
+	^ timeout ifNil: [timeout := 5000]
diff --git a/packages/Babylonian-Core.package/BPExample.class/methodProperties.json b/packages/Babylonian-Core.package/BPExample.class/methodProperties.json
@@ -16,6 +16,6 @@
 		"setUpScript:" : "pre 1/21/2021 15:36",
 		"tearDownScript" : "pre 1/21/2021 15:36",
 		"tearDownScript:" : "pre 1/21/2021 15:36",
-		"timeout" : "joabe 9/27/2022 23:28",
+		"timeout" : "pre 8/22/2023 17:13",
 		"timeout:" : "joabe 9/27/2022 20:26",
 		"traceInformation" : "pre 1/11/2023 10:49" } }
diff --git a/packages/Babylonian-Core.package/BPExamples.class/instance/add..st b/packages/Babylonian-Core.package/BPExamples.class/instance/add..st
@@ -3,4 +3,5 @@ add: aBPExample
 
 	<bpRelevantMethod>
 	mutex critical: [examples add: aBPExample].
+	aBPExample addDependent: self.
 	self changed: #bpExamples.
diff --git a/packages/Babylonian-Core.package/BPExamples.class/instance/remove..st b/packages/Babylonian-Core.package/BPExamples.class/instance/remove..st
@@ -4,4 +4,5 @@ remove: aBPExample
 	mutex critical: [
 		examples remove: aBPExample ifAbsent: ["dont care"].
 		aBPExample ensureTerminatedProcess].
+	aBPExample removeDependent: self.
 	self changed: #bpExamples.
diff --git a/packages/Babylonian-Core.package/BPExamples.class/instance/update.with..st b/packages/Babylonian-Core.package/BPExamples.class/instance/update.with..st
@@ -0,0 +1,8 @@
+change notifications
+update: anAspect with: anObject
+
+	anAspect = #exampleIsActive ifTrue: [
+		^ self changed: #activeExamples].
+
+	anAspect = #newTrace ifTrue: [
+		^ self changed: #tracesChanged].
diff --git a/packages/Babylonian-Core.package/BPExamples.class/methodProperties.json b/packages/Babylonian-Core.package/BPExamples.class/methodProperties.json
@@ -6,15 +6,15 @@
 		"shutDown:" : "pre 5/26/2021 17:17" },
 	"instance" : {
 		"activeExamples" : "pre 5/3/2021 16:55",
-		"add:" : "pre 5/6/2021 18:30",
+		"add:" : "pre 8/23/2023 10:39",
 		"doSilently:" : "pre 9/2/2022 14:46",
 		"exampleIdentifiers" : "pre 5/3/2021 16:41",
 		"examples" : "pre 5/4/2021 15:20",
 		"examplesForMethod:" : "pre 5/4/2021 15:09",
 		"initialize" : "pre 5/3/2021 16:42",
 		"paddedTracesOfActiveExamples" : "pre 5/3/2021 16:55",
 		"rehash" : "pre 5/19/2021 21:36",
-		"remove:" : "pre 5/6/2021 16:54",
+		"remove:" : "pre 8/23/2023 11:02",
 		"removeAll:" : "jb 12/7/2020 18:52",
 		"removeTraces" : "jb 12/7/2020 18:52",
 		"runActiveExamples" : "pre 5/6/2021 18:31",
@@ -25,4 +25,5 @@
 		"systemChangeEvent:" : "pre 1/11/2023 13:42",
 		"tracesOfActiveExamples" : "pre 5/6/2021 18:31",
 		"update:" : "pre 9/2/2022 14:46",
+		"update:with:" : "pre 8/23/2023 10:42",
 		"updateExamplesOnEvent:" : "pre 1/11/2023 13:38" } }
diff --git a/packages/Babylonian-Core.package/BPReferencingExample.class/instance/addDependent..st b/packages/Babylonian-Core.package/BPReferencingExample.class/instance/addDependent..st
@@ -0,0 +1,4 @@
+dependents access
+addDependent: aDependent
+
+	referencedExample addDependent: aDependent.
diff --git a/packages/Babylonian-Core.package/BPReferencingExample.class/instance/removeDependent..st b/packages/Babylonian-Core.package/BPReferencingExample.class/instance/removeDependent..st
@@ -0,0 +1,4 @@
+dependents access
+removeDependent: aDependent
+
+	referencedExample removeDependent: aDependent.
diff --git a/packages/Babylonian-Core.package/BPReferencingExample.class/methodProperties.json b/packages/Babylonian-Core.package/BPReferencingExample.class/methodProperties.json
@@ -2,6 +2,7 @@
 	"class" : {
 		"bpExamplePragmaPrefix" : "pre 1/11/2023 14:39" },
 	"instance" : {
+		"addDependent:" : "pre 8/22/2023 15:00",
 		"asPragma" : "pre 1/11/2023 14:54",
 		"canBeUsedForDoIts" : "pre 1/11/2023 13:27",
 		"exampleName" : "pre 1/11/2023 14:51",
@@ -18,6 +19,7 @@
 		"morphClass" : "pre 1/11/2023 13:28",
 		"referencedExample:" : "pre 1/11/2023 14:29",
 		"referencedExampleName" : "pre 1/11/2023 14:52",
+		"removeDependent:" : "pre 8/22/2023 15:00",
 		"setIsActive:" : "pre 1/11/2023 13:22",
 		"setUpScript" : "pre 1/11/2023 13:22",
 		"setUpScript:" : "pre 1/11/2023 13:22",

diff --git a/.../instance/allBabylonianInternalClasses.st → ...ass/class/allBabylonianInternalClasses.st b/.../instance/allBabylonianInternalClasses.st → ...ass/class/allBabylonianInternalClasses.st
@@ -1,4 +1,4 @@
-*Babylonian-ExampleMining-Core-override
+as yet unclassified
 allBabylonianInternalClasses
 		^ #('Babylonian-Core'  'Babylonian-Compiler' 'Babylonian-UI' 'Babylonian-ProbeLog' 'Babylonian-ExampleMining') 
 				inject: OrderedCollection new 

diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/class/ignoredClassesInStack.st b/packages/Babylonian-Core.package/BPTraceValue.class/class/ignoredClassesInStack.st
@@ -0,0 +1,17 @@
+as yet unclassified
+ignoredClassesInStack
+
+	^ IgnoredClassesInStack ifNil: [IgnoredClassesInStack := {	Symbol.
+		DynamicVariable class.
+		ActiveEventVariable class.
+		CSProcessContextInformation.
+		CSMethodObject.
+		CSLayeredMethod.
+		CSPartialMethod.
+		TestCase.
+		TestResult.
+		BPProbeLogTest.
+		BPExample.
+		BPAbstractExample.
+		MorphicEventDispatcher.
+		}, self allBabylonianInternalClasses]
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/class/ignoredMessagesInStack.st b/packages/Babylonian-Core.package/BPTraceValue.class/class/ignoredMessagesInStack.st
@@ -0,0 +1,21 @@
+as yet unclassified
+ignoredMessagesInStack
+
+	^ IgnoredMessagesInStack ifNil: [IgnoredMessagesInStack := {MethodReference class: BlockClosure selector: #newProcess.
+		MethodReference class: BPExample selector: #traceInBackground.
+		MethodReference class: BlockClosure selector: #on:do:.
+		MethodReference class: BPExample selector: #traceAsyncNotifying:.
+		MethodReference class: BlockClosure selector: #bpTraceInBackgroundForExample:.
+		MethodReference class: BlockClosure selector: #bpTraceWith:.
+		MethodReference class: Symbol selector: #withLayerDo:.
+		MethodReference class: Array selector: #withLayersDo:.
+		MethodReference class: CSProcessContextInformation selector: #withLayers:do:.
+		MethodReference class: BlockClosure selector: #ensure:.
+		MethodReference class: DynamicVariable class selector: #value:during:.
+		MethodReference class: BPExample selector: #traceAsyncNotifying:.
+		MethodReference class: BPExample selector: #execute.
+		MethodReference class: BPExample selector: #executeSynchronously.
+		MethodReference class: BPMethodExample selector: #runOn:.
+		MethodReference class: CSMethodObject selector: #run:with:in:.
+		MethodReference class: CSLayeredMethod selector: #valueWithReceiver:arguments:.
+		MethodReference class: CSPartialMethod selector: #valueWithReceiver:arguments:.}]
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/instance/ignoredClassesInStack.st b/packages/Babylonian-Core.package/BPTraceValue.class/instance/ignoredClassesInStack.st
@@ -1,17 +1,4 @@
 private
 ignoredClassesInStack
 
-	^ {	Symbol.
-		DynamicVariable class.
-		ActiveEventVariable class.
-		CSProcessContextInformation.
-		CSMethodObject.
-		CSLayeredMethod.
-		CSPartialMethod.
-		TestCase.
-		TestResult.
-		BPProbeLogTest.
-		BPExample.
-		BPAbstractExample.
-		MorphicEventDispatcher.
-		}, self allBabylonianInternalClasses
+	^ self class ignoredClassesInStack
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/instance/ignoredMessagesInStack.st b/packages/Babylonian-Core.package/BPTraceValue.class/instance/ignoredMessagesInStack.st
@@ -1,21 +1,4 @@
 private
 ignoredMessagesInStack
 
-	^ {MethodReference class: BlockClosure selector: #newProcess.
-		MethodReference class: BPExample selector: #traceInBackground.
-		MethodReference class: BlockClosure selector: #on:do:.
-		MethodReference class: BPExample selector: #traceAsyncNotifying:.
-		MethodReference class: BlockClosure selector: #bpTraceInBackgroundForExample:.
-		MethodReference class: BlockClosure selector: #bpTraceWith:.
-		MethodReference class: Symbol selector: #withLayerDo:.
-		MethodReference class: Array selector: #withLayersDo:.
-		MethodReference class: CSProcessContextInformation selector: #withLayers:do:.
-		MethodReference class: BlockClosure selector: #ensure:.
-		MethodReference class: DynamicVariable class selector: #value:during:.
-		MethodReference class: BPExample selector: #traceAsyncNotifying:.
-		MethodReference class: BPExample selector: #execute.
-		MethodReference class: BPExample selector: #executeSynchronously.
-		MethodReference class: BPMethodExample selector: #runOn:.
-		MethodReference class: CSMethodObject selector: #run:with:in:.
-		MethodReference class: CSLayeredMethod selector: #valueWithReceiver:arguments:.
-		MethodReference class: CSPartialMethod selector: #valueWithReceiver:arguments:.}
+	^ self class ignoredMessagesInStack
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/methodProperties.json b/packages/Babylonian-Core.package/BPTraceValue.class/methodProperties.json
@@ -1,5 +1,8 @@
 {
 	"class" : {
+		"allBabylonianInternalClasses" : "pre 9/27/2023 14:33",
+		"ignoredClassesInStack" : "pre 9/27/2023 14:33",
+		"ignoredMessagesInStack" : "pre 9/27/2023 14:34",
 		"value:identityHash:stack:" : "pre 10/12/2020 17:57" },
 	"instance" : {
 		"allBabylonianInternalClasses" : "joabe 7/2/2023 23:54",
@@ -11,8 +14,8 @@
 		"chronologicalPosition:" : "jb 5/20/2021 14:50",
 		"containedMethodReference" : "pre 11/16/2022 16:04",
 		"filteredStack" : "pre 11/16/2022 15:57",
-		"ignoredClassesInStack" : "joabe 7/2/2023 23:53",
-		"ignoredMessagesInStack" : "pre 7/13/2023 10:45",
+		"ignoredClassesInStack" : "pre 9/27/2023 14:33",
+		"ignoredMessagesInStack" : "pre 9/27/2023 14:33",
 		"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/BPTraceValue.class/properties.json b/packages/Babylonian-Core.package/BPTraceValue.class/properties.json
@@ -3,7 +3,8 @@
 	"classinstvars" : [
 		 ],
 	"classvars" : [
-		 ],
+		"IgnoredClassesInStack",
+		"IgnoredMessagesInStack" ],
 	"commentStamp" : "",
 	"instvars" : [
 		"tracedValue",

diff --git a/packages/Babylonian-Core.package/Behavior.extension/instance/bpSnapshot.st b/packages/Babylonian-Core.package/Behavior.extension/instance/bpSnapshot.st
@@ -0,0 +1,4 @@
+*Babylonian-Core
+bpSnapshot
+
+	^ self
diff --git a/packages/Babylonian-Core.package/Behavior.extension/methodProperties.json b/packages/Babylonian-Core.package/Behavior.extension/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"bpSnapshot" : "pre 8/22/2023 16:22" } }
diff --git a/packages/Babylonian-Core.package/Behavior.extension/properties.json b/packages/Babylonian-Core.package/Behavior.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "Behavior" }
diff --git a/packages/Babylonian-Core.package/Context.extension/instance/bpSnapshot.st b/packages/Babylonian-Core.package/Context.extension/instance/bpSnapshot.st
@@ -0,0 +1,4 @@
+*Babylonian-Core
+bpSnapshot
+
+	^ self copy
diff --git a/packages/Babylonian-Core.package/Context.extension/methodProperties.json b/packages/Babylonian-Core.package/Context.extension/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"bpSnapshot" : "pre 8/23/2023 12:49" } }
diff --git a/packages/Babylonian-Core.package/Context.extension/properties.json b/packages/Babylonian-Core.package/Context.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "Context" }
diff --git a/packages/Babylonian-Core.package/Parser.extension/instance/bpSnapshot.st b/packages/Babylonian-Core.package/Parser.extension/instance/bpSnapshot.st
@@ -0,0 +1,4 @@
+*Babylonian-Core
+bpSnapshot
+
+	^ self copy
diff --git a/packages/Babylonian-Core.package/Parser.extension/instance/postCopy.st b/packages/Babylonian-Core.package/Parser.extension/instance/postCopy.st
@@ -0,0 +1,6 @@
+*Babylonian-Core
+postCopy
+
+	super postCopy.
+	parseNode := parseNode copy.
+
diff --git a/packages/Babylonian-Core.package/Parser.extension/methodProperties.json b/packages/Babylonian-Core.package/Parser.extension/methodProperties.json
@@ -0,0 +1,6 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"bpSnapshot" : "pre 8/23/2023 12:18",
+		"postCopy" : "pre 8/23/2023 12:19" } }
diff --git a/packages/Babylonian-Core.package/Parser.extension/properties.json b/packages/Babylonian-Core.package/Parser.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "Parser" }
diff --git a/packages/Babylonian-Core.package/TestResult.extension/instance/bpSnapshot.st b/packages/Babylonian-Core.package/TestResult.extension/instance/bpSnapshot.st
@@ -0,0 +1,4 @@
+*Babylonian-Core
+bpSnapshot
+
+	^ self copy
diff --git a/packages/Babylonian-Core.package/TestResult.extension/methodProperties.json b/packages/Babylonian-Core.package/TestResult.extension/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"bpSnapshot" : "pre 8/23/2023 12:20" } }
diff --git a/packages/Babylonian-Core.package/TestResult.extension/properties.json b/packages/Babylonian-Core.package/TestResult.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "TestResult" }
diff --git a/packages/Babylonian-Core.package/TranscriptStream.extension/instance/bpSnapshot.st b/packages/Babylonian-Core.package/TranscriptStream.extension/instance/bpSnapshot.st
@@ -0,0 +1,4 @@
+*Babylonian-Core
+bpSnapshot
+
+	^ self copy