Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes layout of Printbugger to resemble a flame graph #101

Merged
merged 6 commits into from
Dec 4, 2021
Merged

Changes layout of Printbugger to resemble a flame graph #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f349383
Changes layout of printbugger to resemble flame graph
JoeAtHPI Nov 19, 2021
a4dcfd3
Enters hover and click interaction for printbugger stack frames
JoeAtHPI Nov 19, 2021
3a96aaa
Removes unused methods
JoeAtHPI Nov 19, 2021
06cd1b5
Fixes the update of stack entry colors on new methods
JoeAtHPI Nov 20, 2021
9f893c6
Fixes failing tests as the stack of the test was overflowing
JoeAtHPI Nov 20, 2021
b16737b
Changes test logic slightly as stack size in test would need to add a…
JoeAtHPI Nov 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/Babylonian-Core.package/BPTraceValue.class/instance/filterableClassesInStack.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
private
filterableClassesInStack
^ {BlockClosure.

^ { BlockClosure.
Symbol.
DynamicVariable class.
CSProcessContextInformation.
CSMethodObject.
CSLayeredMethod.
CSPartialMethod.
TestCase.
TestResult.}
TestResult.
BPPrintbuggerTest.
}
5 changes: 2 additions & 3 deletions packages/Babylonian-Core.package/BPTraceValue.class/instance/filterableMessagesInStack.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
private
filterableMessagesInStack

^ {MethodReference class: BlockClosure selector: #newProcess.
MethodReference class: BPExample selector: #traceInBackground.
MethodReference class: BlockClosure selector: #on:do:.
Expand All @@ -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:.}
4 changes: 2 additions & 2 deletions packages/Babylonian-Core.package/BPTraceValue.class/instance/filteredStack.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
private
filteredStack
^ self filteredStackFor: self stack

^ self stack reject: [:aStackEntry | self shouldBeFiltered: aStackEntry ]


6 changes: 0 additions & 6 deletions packages/Babylonian-Core.package/BPTraceValue.class/instance/filteredStackFor..st
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions packages/Babylonian-Core.package/BPTraceValue.class/instance/oneSidedStackLevelTo..st
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions packages/Babylonian-Core.package/BPTraceValue.class/instance/relativeStackLevelTo..st
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions packages/Babylonian-Core.package/BPTraceValue.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 0 additions & 6 deletions packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/barWidthFor.relativeTo..st
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/colorFor..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
private
colorFor: aMethodReference

^ context colorFor: aMethodReference having: self class barColorScheme
6 changes: 3 additions & 3 deletions .../instance/lineSubmorphsFor.relativeTo..st → ...ss/instance/lineSubmorphsFor.calledBy..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.}

16 changes: 16 additions & 0 deletions ...nian-Printbugger.package/BPSwimlane.class/instance/newBarMorphFor.calledBy.withHeight..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
9 changes: 0 additions & 9 deletions ...an-Printbugger.package/BPSwimlane.class/instance/newBarMorphFor.relativeTo.withHeight..st
View file
Open in desktop

This file was deleted.

26 changes: 26 additions & 0 deletions ...lonian-Printbugger.package/BPSwimlane.class/instance/newStackFrameMorphFor.withHeight..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

4 changes: 2 additions & 2 deletions packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/stackDepth.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
constants
stackDepth
^ self fontHeight

^ self fontHeight / 1.25
17 changes: 0 additions & 17 deletions packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/stackDepthsFor..st
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/stackMethodsFor..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
private
stackMethodsFor: aBPExample

^ aBPExample traceValues collect: [:aTraceValue |
aTraceValue filteredStack collect: [:aStackEntry | MethodReference class: aStackEntry fourth selector: aStackEntry third]]
5 changes: 3 additions & 2 deletions packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/updateLayoutToContext.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))]].
10 changes: 5 additions & 5 deletions .../instance/visualizeLineFor.relativeTo..st → ...ss/instance/visualizeLineFor.calledBy..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
private
visualizeLineFor: aTraceValue relativeTo: aStackRelation
visualizeLineFor: aTraceValue calledBy: aStackOfMethodReferences

^ Morph new
name: aTraceValue chronologicalPosition asString;
color: Color transparent;
Expand All @@ -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
8 changes: 4 additions & 4 deletions packages/Babylonian-Printbugger.package/BPSwimlane.class/instance/visualizeLinesFor..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
17 changes: 9 additions & 8 deletions packages/Babylonian-Printbugger.package/BPSwimlane.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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" } }
5 changes: 3 additions & 2 deletions ...ts.package/BPPrintbuggerTest.class/instance/testSwimlaneDisplaysTraceValuesForOneProbe.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'.}).

5 changes: 3 additions & 2 deletions ...erTest.class/instance/testSwimlaneDisplaysTraceValuesForTwoProbesChronologicallySorted.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
8 changes: 5 additions & 3 deletions ...ass/instance/testTwoTraceValuesInDifferentMethodsGetDifferentColorsInMultipleSwimlanes.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
5 changes: 3 additions & 2 deletions ...st.class/instance/testTwoTraceValuesInDifferentMethodsGetDifferentColorsInSameSwimlane.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Loading