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

Jump to bottom

Fix WAMemory on Pharo #1339

Merged
merged 1 commit into from
Sep 1, 2022
Merged

Fix WAMemory on Pharo #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions ...Seaside-Pharo-Development.package/Behavior.extension/instance/traverseWithMemory.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*Seaside-Pharo-Development
traverseWithMemory: aMemory seen: anIdentitySet
"classes are in the global pool, ignore counting them"
anIdentitySet add: self
3 changes: 3 additions & 0 deletions repository/Seaside-Pharo-Development.package/Behavior.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name" : "Behavior"
}
4 changes: 4 additions & 0 deletions .../Seaside-Pharo-Development.package/Boolean.extension/instance/traverseWithMemory.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*Seaside-Pharo-Development
traverseWithMemory: aMemory seen: anIdentitySet
"booleans are singletons, ignore counting them"
anIdentitySet add: self
3 changes: 3 additions & 0 deletions repository/Seaside-Pharo-Development.package/Boolean.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name" : "Boolean"
}
6 changes: 6 additions & 0 deletions ...de-Pharo-Development.package/CompiledBlock.extension/instance/traverseWithMemory.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*Seaside-Pharo-Development
traverseWithMemory: aMemory seen: anIdentitySet
"blocks can be stored in collections and instance variables
Report but don't intropect them. This may miss reporting catured variables."
aMemory accumulate: self.
anIdentitySet add: self
3 changes: 3 additions & 0 deletions repository/Seaside-Pharo-Development.package/CompiledBlock.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name" : "CompiledBlock"
}
4 changes: 4 additions & 0 deletions ...e-Pharo-Development.package/CompiledMethod.extension/instance/traverseWithMemory.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*Seaside-Pharo-Development
traverseWithMemory: aMemory seen: anIdentitySet
"methods are stored in classes, ignore counting them"
anIdentitySet add: self
3 changes: 3 additions & 0 deletions repository/Seaside-Pharo-Development.package/CompiledMethod.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name" : "CompiledMethod"
}
6 changes: 0 additions & 6 deletions ...aro-Development.package/InstructionStream.extension/instance/traversableInstVarIndexes.st
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions ...haro-Development.package/InstructionStream.extension/instance/traverseWithMemory.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
*Seaside-Pharo-Development
traverseWithMemory: aMemory seen: anIdentitySet
"we only have two instance variables:
- sender which we ignore because will always get niled out when the stack unwound so won't be captured but this will not have happened yet for contexts involved in the current request
- pc with is a SmallInteger and therefore immediate"
aMemory accumulate: self.
anIdentitySet add: self
3 changes: 0 additions & 3 deletions ...ide-Pharo-Development.package/Object.extension/instance/traversableIndexableVarIndexes.st
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .../Seaside-Pharo-Development.package/Object.extension/instance/traversableInstVarIndexes.st
View file
Open in desktop

This file was deleted.

12 changes: 9 additions & 3 deletions ...y/Seaside-Pharo-Development.package/Object.extension/instance/traverseWithMemory.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
*Seaside-Pharo-Development
traverseWithMemory: aMemory seen: anIdentitySet
aMemory accumulate: self.
| traversableInstVarIndexes traversableIndexableVarIndexes |
anIdentitySet add: self.
self traversableInstVarIndexes do: [ :index |
self isImmediateObject ifTrue: [
"don't report immediates"
^ self ].
aMemory accumulate: self.
traversableInstVarIndexes := self class instSize.
1 to: traversableInstVarIndexes do: [ :index |
aMemory
traverse: self
value: (self instVarAt: index)
seen: anIdentitySet ].
self traversableIndexableVarIndexes do: [ :index |
traversableIndexableVarIndexes := self basicSize.
1 to: traversableIndexableVarIndexes do: [ :index |
aMemory
traverse: self
value: (self basicAt: index)
Expand Down
5 changes: 5 additions & 0 deletions .../Seaside-Pharo-Development.package/Process.extension/instance/traverseWithMemory.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*Seaside-Pharo-Development
traverseWithMemory: aMemory seen: anIdentitySet
"Process is excluded because otherwise our Semaphores pull them in and the Process is
obviously not held onto by the Semaphore indefinitely."
anIdentitySet add: self
3 changes: 3 additions & 0 deletions repository/Seaside-Pharo-Development.package/Process.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name" : "Process"
}
4 changes: 4 additions & 0 deletions ...y/Seaside-Pharo-Development.package/Symbol.extension/instance/traverseWithMemory.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*Seaside-Pharo-Development
traverseWithMemory: aMemory seen: anIdentitySet
"symbol are in the global table, ignore counting them"
anIdentitySet add: self
3 changes: 3 additions & 0 deletions repository/Seaside-Pharo-Development.package/Symbol.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name" : "Symbol"
}
4 changes: 4 additions & 0 deletions ...-Pharo-Development.package/UndefinedObject.extension/instance/traverseWithMemory.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*Seaside-Pharo-Development
traverseWithMemory: aMemory seen: anIdentitySet
"nil is global, ignore counting it"
anIdentitySet add: self
3 changes: 3 additions & 0 deletions repository/Seaside-Pharo-Development.package/UndefinedObject.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name" : "UndefinedObject"
}
8 changes: 0 additions & 8 deletions repository/Seaside-Pharo-Development.package/WAMemory.class/class/initialize.st
View file
Open in desktop

This file was deleted.

23 changes: 14 additions & 9 deletions repository/Seaside-Pharo-Development.package/WAMemory.class/instance/buildTable.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
private
buildTable
^ WATableReport new
rows: instances values;
columns: (Array
with: (WAReportColumn new
| classColumn instanceCountColumn totalSizeColumn |
classColumn := WAReportColumn new
title: 'Class';
selector: #name;
sortBlock: [ :a :b | a < b ];
yourself)
with: (WAReportColumn new
yourself.
instanceCountColumn := WAReportColumn new
title: 'Instances';
selector: #count;
sortBlock: [ :a :b | a > b ];
cssClass: 'right';
hasTotal: true;
yourself)
with: (WAReportColumn new
yourself.
totalSizeColumn := WAReportColumn new
title: 'Total Size';
selector: #size;
sortBlock: [ :a :b | a > b ];
formatBlock: [ :each | formatter print: each ];
cssClass: 'right';
hasTotal: true;
yourself));
yourself.
^ WATableReport new
rows: instances values;
columns: (Array
with: classColumn
with: instanceCountColumn
with: totalSizeColumn);
sortColumn: totalSizeColumn;
yourself
2 changes: 1 addition & 1 deletion repository/Seaside-Pharo-Development.package/WAMemory.class/instance/traverse.value.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
private
traverse: anObject value: aValue seen: anIdentitySet
(aValue isNil or: [ aValue isLiteral or: [ aValue isBehavior or: [ (anIdentitySet includes: aValue) or: [ IgnoredClasses anySatisfy: [ :each | aValue isKindOf: each ] ] ] ] ])
(aValue isNil or: [ anIdentitySet includes: aValue ])
ifTrue: [ ^ self ].
aValue traverseWithMemory: self seen: anIdentitySet
4 changes: 4 additions & 0 deletions ...ory/Seaside-Pharo-Development.package/WAMemory.class/instance/traverseWithMemory.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
hooks
traverseWithMemory: aMemory seen: anIdentitySet
"don't report self"
anIdentitySet add: self
4 changes: 1 addition & 3 deletions repository/Seaside-Pharo-Development.package/WAMemory.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
"category" : "Seaside-Pharo-Development-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [
"IgnoredClasses"
],
"classvars" : [ ],
"instvars" : [
"instances",
"table",
Expand Down
4 changes: 4 additions & 0 deletions ...Seaside-Pharo-Development.package/WAMemoryItem.class/instance/traverseWithMemory.seen..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
hooks
traverseWithMemory: aMemory seen: anIdentitySet
"don't report self"
anIdentitySet add: self