Merge pull request #101 from hpi-swa-lab/feature/flameGraph

JoeAtHPI · web-flow · commit e368016f8e8e · 2021-12-04T17:14:51.000+01:00
Changes layout of Printbugger to resemble a flame graph
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/instance/filterableClassesInStack.st b/packages/Babylonian-Core.package/BPTraceValue.class/instance/filterableClassesInStack.st
@@ -1,12 +1,14 @@
 private
 filterableClassesInStack
-	
-	^ {BlockClosure.
+
+	^ {	BlockClosure.
 		Symbol.
 		DynamicVariable class.
 		CSProcessContextInformation.
 		CSMethodObject.
 		CSLayeredMethod.
 		CSPartialMethod.
 		TestCase.
-		TestResult.}
+		TestResult.
+		BPPrintbuggerTest.
+		}
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/instance/filterableMessagesInStack.st b/packages/Babylonian-Core.package/BPTraceValue.class/instance/filterableMessagesInStack.st
@@ -1,6 +1,6 @@
 private
 filterableMessagesInStack
-	
+
 	^ {MethodReference class: BlockClosure selector: #newProcess.
 		MethodReference class: BPExample selector: #traceInBackground.
 		MethodReference class: BlockClosure selector: #on:do:.
@@ -17,5 +17,4 @@ filterableMessagesInStack
 		MethodReference class: BPMethodExample selector: #runOn:.
 		MethodReference class: CSMethodObject selector: #run:with:in:.
 		MethodReference class: CSLayeredMethod selector: #valueWithReceiver:arguments:.
-		MethodReference class: CSPartialMethod selector: #valueWithReceiver:arguments:.
-		MethodReference class: BlockClosure selector: #whileFalseDo:.}
+		MethodReference class: CSPartialMethod selector: #valueWithReceiver:arguments:.}
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/instance/filteredStack.st b/packages/Babylonian-Core.package/BPTraceValue.class/instance/filteredStack.st
@@ -1,6 +1,6 @@
 private
 filteredStack
-	
-	^ self filteredStackFor: self stack
+
+	^ self stack reject: [:aStackEntry | self shouldBeFiltered: aStackEntry ]
 
 	
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/instance/filteredStackFor..st b/packages/Babylonian-Core.package/BPTraceValue.class/instance/filteredStackFor..st
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/instance/oneSidedStackLevelTo..st b/packages/Babylonian-Core.package/BPTraceValue.class/instance/oneSidedStackLevelTo..st
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/instance/relativeStackLevelTo..st b/packages/Babylonian-Core.package/BPTraceValue.class/instance/relativeStackLevelTo..st
diff --git a/packages/Babylonian-Core.package/BPTraceValue.class/methodProperties.json b/packages/Babylonian-Core.package/BPTraceValue.class/methodProperties.json
@@ -9,14 +9,11 @@
 		"chronologicalPosition" : "jb 5/20/2021 14:50",
 		"chronologicalPosition:" : "jb 5/20/2021 14:50",
 		"containedMethodReference" : "jb 7/2/2021 14:34",
-		"filterableClassesInStack" : "jb 6/30/2021 00:58",
-		"filterableMessagesInStack" : "jb 6/24/2021 22:43",
-		"filteredStack" : "jb 6/30/2021 00:53",
-		"filteredStackFor:" : "jb 6/30/2021 00:47",
+		"filterableClassesInStack" : "jb 11/20/2021 02:07",
+		"filterableMessagesInStack" : "jb 11/20/2021 01:52",
+		"filteredStack" : "jb 11/19/2021 18:54",
 		"isStackFull" : "jb 6/30/2021 01:26",
-		"oneSidedStackLevelTo:" : "jb 8/1/2021 21:24",
 		"printOn:" : "jb 5/19/2021 20:59",
-		"relativeStackLevelTo:" : "jb 7/2/2021 14:36",
 		"shouldBeFiltered:" : "jb 6/30/2021 00:55",
 		"stack" : "pre 5/8/2019 18:36",
 		"stack:" : "jb 12/7/2020 18:55",
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/barWidthFor.relativeTo..st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/barWidthFor.relativeTo..st
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/colorFor..st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/colorFor..st
@@ -0,0 +1,4 @@
+private
+colorFor: aMethodReference
+
+	^ context colorFor: aMethodReference having: self class barColorScheme
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/lineSubmorphsFor.calledBy..st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/lineSubmorphsFor.calledBy..st
@@ -1,12 +1,12 @@
 private
-lineSubmorphsFor: aTraceValue relativeTo: aStackRelation
-	
+lineSubmorphsFor: aTraceValue calledBy: aStackOfMethodReferences
+
 	| valueMorph |
 	valueMorph := self newLabelValuePairMorphFor: aTraceValue.
 	
 	^ {self newHaltButtonFor: aTraceValue.
 		self newBarMorphFor: aTraceValue 
-			relativeTo: aStackRelation 
+			calledBy: aStackOfMethodReferences 
 			withHeight: (valueMorph fullBounds height + 10).
 		valueMorph.}
 	
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/newBarMorphFor.calledBy.withHeight..st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/newBarMorphFor.calledBy.withHeight..st
@@ -0,0 +1,16 @@
+private - ui
+newBarMorphFor: aTraceValue calledBy: aStackOfMethodReferences withHeight: aNumber
+
+	
+	^ Morph new
+		name: #stackBar;
+		color: Color transparent;
+		changeTableLayout;
+		listDirection: #rightToLeft;
+		wrapCentering: #center;
+		hResizing: #shrinkWrap;
+		vResizing: #shrinkWrap;
+		cellInset: 1@0;
+		addAllMorphsBack: (aStackOfMethodReferences collect: [:aStackMethod |
+			 self newStackFrameMorphFor:  aStackMethod withHeight: aNumber]);
+		yourself
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/newBarMorphFor.relativeTo.withHeight..st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/newBarMorphFor.relativeTo.withHeight..st
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/newStackFrameMorphFor.withHeight..st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/newStackFrameMorphFor.withHeight..st
@@ -0,0 +1,26 @@
+private - ui
+newStackFrameMorphFor: aMethodReference withHeight: aNumber
+
+	| stackMorph |
+	stackMorph := Morph new 
+		color: (self colorFor: aMethodReference);
+		extent: (self stackDepth@aNumber);
+		balloonText: aMethodReference asString;
+		setProperty: #stackMethodReference
+		toValue: aMethodReference;
+		on: #click 
+			send: #value 
+			to: [ToolSet browse: aMethodReference actualClass 
+						selector: aMethodReference selector];
+		yourself.
+	
+	stackMorph
+		on: #mouseEnter
+			send: #value
+			to: [stackMorph borderStyle: (BorderStyle width: 2 color: Color black)];
+		on: #mouseLeave
+			send: #value
+			to: [stackMorph borderStyle: nil].
+			
+	^ stackMorph
+	
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/stackDepth.st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/stackDepth.st
@@ -1,4 +1,4 @@
 constants
 stackDepth
-	
-	^ self fontHeight
+
+	^ self fontHeight / 1.25
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/stackDepthsFor..st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/stackDepthsFor..st
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/stackMethodsFor..st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/stackMethodsFor..st
@@ -0,0 +1,5 @@
+private
+stackMethodsFor: aBPExample
+
+	^ aBPExample traceValues collect: [:aTraceValue |
+		aTraceValue filteredStack collect: [:aStackEntry | MethodReference class: aStackEntry fourth selector: aStackEntry third]]
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/updateLayoutToContext.st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/updateLayoutToContext.st
@@ -1,5 +1,6 @@
 change notifications
 updateLayoutToContext
-	
+
 	self lineSubMorphs withIndexDo: [:aTraceValueLine :anIndex | 
-		(aTraceValueLine submorphNamed: #stackBar) color: (self colorFor: (example traceValues at: anIndex) in: context)].
+		(aTraceValueLine submorphNamed: #stackBar) submorphsDo: [:aStackEntry |
+			aStackEntry color: (self colorFor: (aStackEntry valueOfProperty: #stackMethodReference))]].
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/visualizeLineFor.calledBy..st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/visualizeLineFor.calledBy..st
@@ -1,6 +1,6 @@
 private
-visualizeLineFor: aTraceValue relativeTo: aStackRelation
-	
+visualizeLineFor: aTraceValue calledBy: aStackOfMethodReferences
+
 	^ Morph new
 		name: aTraceValue chronologicalPosition asString;
 		color: Color transparent;
@@ -9,6 +9,6 @@ visualizeLineFor: aTraceValue relativeTo: aStackRelation
 		cellPositioning: #center;
 		vResizing: #shrinkWrap;
 		hResizing: #shrinkWrap;
-		cellInset: 3@1;
-		addAllMorphsBack: (self lineSubmorphsFor: aTraceValue relativeTo: aStackRelation);
-		yourself.
+		cellInset: 3@0;
+		addAllMorphsBack: (self lineSubmorphsFor: aTraceValue calledBy: aStackOfMethodReferences);
+		yourself
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/visualizeLinesFor..st b/packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/visualizeLinesFor..st
@@ -1,8 +1,8 @@
 private
 visualizeLinesFor: aBPExample
-	
-	|stackDepthsRelativeToFirstLine| 
-	stackDepthsRelativeToFirstLine := self stackDepthsFor: aBPExample.
+
+	| stackMethods | 
+	stackMethods := self stackMethodsFor: aBPExample.
 	
 	"Add a wrapper to have some distance between the title morph and the values"
 	^ Morph new
@@ -14,5 +14,5 @@ visualizeLinesFor: aBPExample
 		wrapCentering: #center;
 		cellPositioning: #topLeft;
 		addAllMorphsBack:  (aBPExample traceValues withIndexCollect: [:aTraceValue :anIndex | 
-			self visualizeLineFor: aTraceValue relativeTo: (stackDepthsRelativeToFirstLine at: anIndex )]);
+			self visualizeLineFor: aTraceValue calledBy: (stackMethods at: anIndex )]);
 		yourself
diff --git a/packages/Babylonian-Printbugger.package/BPSwimlane.class/methodProperties.json b/packages/Babylonian-Printbugger.package/BPSwimlane.class/methodProperties.json
@@ -5,7 +5,7 @@
 		"newFor:" : "jb 6/10/2021 23:33",
 		"newFor:withContext:" : "jb 6/10/2021 23:24" },
 	"instance" : {
-		"barWidthFor:relativeTo:" : "jb 6/25/2021 00:34",
+		"colorFor:" : "jb 11/20/2021 01:29",
 		"colorFor:in:" : "jb 6/11/2021 01:04",
 		"context:" : "jb 6/10/2021 23:26",
 		"example:" : "jb 6/10/2021 15:06",
@@ -15,19 +15,20 @@
 		"initialize" : "jb 6/10/2021 23:34",
 		"initializeProperties" : "jb 7/10/2021 16:37",
 		"lineSubMorphs" : "jb 7/10/2021 17:43",
-		"lineSubmorphsFor:relativeTo:" : "jb 7/10/2021 16:57",
-		"newBarMorphFor:relativeTo:withHeight:" : "jb 6/30/2021 03:10",
+		"lineSubmorphsFor:calledBy:" : "jb 11/19/2021 21:37",
+		"newBarMorphFor:calledBy:withHeight:" : "jb 11/19/2021 21:58",
 		"newHaltButtonFor:" : "lu 6/17/2021 13:44",
 		"newLabelFor:" : "jb 7/10/2021 17:13",
 		"newLabelMorphFor:" : "jb 7/10/2021 17:14",
 		"newLabelValuePairMorphFor:" : "jb 7/10/2021 17:14",
+		"newStackFrameMorphFor:withHeight:" : "jb 11/20/2021 01:32",
 		"newTitleMorphFor:" : "lu 7/20/2021 21:21",
 		"positionInProbeFor:and:" : "jb 6/24/2021 22:21",
 		"scrollBarSize" : "lu 6/9/2021 23:47",
-		"stackDepth" : "jb 7/10/2021 16:50",
-		"stackDepthsFor:" : "jb 6/30/2021 02:18",
+		"stackDepth" : "jb 11/19/2021 18:29",
+		"stackMethodsFor:" : "jb 11/19/2021 21:21",
 		"update:with:" : "jb 7/1/2021 23:47",
-		"updateLayoutToContext" : "jb 7/10/2021 17:43",
+		"updateLayoutToContext" : "jb 11/20/2021 01:33",
 		"visualize" : "jb 7/10/2021 16:41",
-		"visualizeLineFor:relativeTo:" : "jb 7/10/2021 16:57",
-		"visualizeLinesFor:" : "jb 7/10/2021 16:56" } }
+		"visualizeLineFor:calledBy:" : "jb 11/19/2021 21:45",
+		"visualizeLinesFor:" : "jb 11/19/2021 21:39" } }
diff --git a/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testSwimlaneDisplaysTraceValuesForOneProbe.st b/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testSwimlaneDisplaysTraceValuesForOneProbe.st
@@ -1,11 +1,12 @@
 tests
 testSwimlaneDisplaysTraceValuesForOneProbe
-	
+
 	| swimlane traceValues|
 	self initExample1WithMethodWithMultipleProbes.
 	swimlane := printbugger canvasMorph firstSubmorph.
 	self assert: (swimlane isKindOf: BPSwimlane).
 	self assert: 6 equals: (swimlane lineSubMorphs size).
-	traceValues := swimlane allMorphs select: [:aSubmorph | aSubmorph isKindOf: StringMorph] thenCollect: [:aStringMorph | aStringMorph contents].
+	traceValues := swimlane allMorphs select: [:aSubmorph | 
+		aSubmorph isKindOf: StringMorph] thenCollect: [:aStringMorph | aStringMorph contents].
 	self assert: (traceValues includesAllOf: {'1'. '2'. '2'. '4'. '3'. '6'.}).
 	
diff --git a/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testSwimlaneDisplaysTraceValuesForTwoProbesChronologicallySorted.st b/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testSwimlaneDisplaysTraceValuesForTwoProbesChronologicallySorted.st
@@ -1,10 +1,11 @@
 tests
 testSwimlaneDisplaysTraceValuesForTwoProbesChronologicallySorted
-	
+
 	|swimlane traceValues traceIndexes|
 	self initExample1WithMethodWithMultipleProbes.
 	swimlane := BPSwimlane newFor: example1.
-	traceValues := swimlane allMorphs select: [:aSubmorph | aSubmorph isKindOf: StringMorph] thenCollect: [:aStringMorph | aStringMorph contents].
+	traceValues := swimlane allMorphs select: [:aSubmorph | 
+		aSubmorph isKindOf: StringMorph] thenCollect: [:aStringMorph | aStringMorph contents].
 	self assert: (traceValues includesAllOf: {'1'. '2'. '2'. '4'. '3'. '6'.}).
 	traceIndexes := {'1'. '2'. '2'. '4'. '3'. '6'.} collect: [:aTraceString | traceValues indexOf: aTraceString].
 	self assert: traceIndexes isSorted.
diff --git a/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testTwoTraceValuesInDifferentMethodsGetDifferentColorsInMultipleSwimlanes.st b/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testTwoTraceValuesInDifferentMethodsGetDifferentColorsInMultipleSwimlanes.st
@@ -1,14 +1,16 @@
 tests
 testTwoTraceValuesInDifferentMethodsGetDifferentColorsInMultipleSwimlanes
-	
+
 	|swimlane1 swimlane2 colors1 colors2|
 	self initExample1WithMethodWithMultipleProbes.
 	self initExample2WithSingleProbe.
 	
 	swimlane1 := printbugger canvasMorph firstSubmorph.
 	swimlane2 := printbugger canvasMorph submorphs second.
-	colors1 := (swimlane1 allMorphs select: [:aSubmorph | aSubmorph knownName = 'stackBar'] thenCollect: [:aBarMorph | aBarMorph color]) asSet.
-	colors2 := (swimlane2 allMorphs select: [:aSubmorph | aSubmorph knownName = 'stackBar'] thenCollect: [:aBarMorph | aBarMorph color]) asSet.
+	colors1 := (swimlane1 allMorphs select: [:aSubmorph | 
+		aSubmorph knownName = 'stackBar'] thenCollect: [:aBarMorph | aBarMorph firstSubmorph color]) asSet.
+	colors2 := (swimlane2 allMorphs select: [:aSubmorph | 
+		aSubmorph knownName = 'stackBar'] thenCollect: [:aBarMorph | aBarMorph firstSubmorph color]) asSet.
 	
 	self assert: colors1 size equals: colors2 size.
 	self assert: colors1 ~= colors2.
diff --git a/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testTwoTraceValuesInDifferentMethodsGetDifferentColorsInSameSwimlane.st b/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testTwoTraceValuesInDifferentMethodsGetDifferentColorsInSameSwimlane.st
@@ -1,10 +1,11 @@
 tests
 testTwoTraceValuesInDifferentMethodsGetDifferentColorsInSameSwimlane
-	
+
 	|swimlane colors|
 	self initExample1WithMethodWithExampleCallingOnlyProbedMethod.
 	
 	swimlane := printbugger canvasMorph firstSubmorph.
-	colors := (swimlane allMorphs select: [:aSubmorph | aSubmorph knownName = 'stackBar'] thenCollect: [:aBarMorph | aBarMorph color]) asSet.
+	colors := (swimlane allMorphs select: [:aSubmorph | 
+		aSubmorph knownName = 'stackBar'] thenCollect: [:aBarMorph | aBarMorph firstSubmorph color]) asSet.
 	
 	self assert: 2 equals: colors size.
diff --git a/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testTwoTraceValuesInDifferentMethodsGetDifferentStackDepthsInSameSwimlane.st b/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testTwoTraceValuesInDifferentMethodsGetDifferentStackDepthsInSameSwimlane.st
diff --git a/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testTwoTraceValuesInSameMethodGetSameColorInSameSwimlane.st b/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/instance/testTwoTraceValuesInSameMethodGetSameColorInSameSwimlane.st
diff --git a/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/methodProperties.json b/packages/Babylonian-Tests.package/BPPrintbuggerTest.class/methodProperties.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +private
 +colorFor: aMethodReference
++
 +	^ context colorFor: aMethodReference having: self class barColorScheme