Fixed plotter for allocation sites classification. Minor other fixes

jordanmontt · Sep 18, 2024 · 81472f2 · 81472f2
1 parent 330a870
commit 81472f2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/src/IllimaniProfiler/IllAnalyzer.class.st b/src/IllimaniProfiler/IllAnalyzer.class.st
@@ -12,7 +12,10 @@ Class {
 		'maxLiveSize',
 		'groupedAllocationSites',
 		'startTime',
-		'endTime'
+		'endTime',
+		'taThreshold',
+		'hif',
+		'hlf'
 	],
 	#category : 'IllimaniProfiler-Analyzer',
 	#package : 'IllimaniProfiler',
@@ -67,12 +70,7 @@ IllAnalyzer >> calculateMaxLiveSize [
 { #category : 'api' }
 IllAnalyzer >> classifyAllocationSites [
 
-	| hif hlf |
-
 	self binObjects.
-
-	hif := 0.
-	hlf := 0.6.
 
 	groupedAllocationSites valuesDo: [ :allocationSiteBin |
 		| is ss ls wasClassified |
@@ -105,7 +103,7 @@ IllAnalyzer >> groupAllocationSites [
 		groupedAllocationSites
 			at: illAllocationSite
 			ifAbsentPut: (IllAllocationSiteBin new
-				allocatorMethod: illAllocationSite;
+				allocationSite: illAllocationSite;
 				yourself) ]
 ]
 
@@ -115,7 +113,11 @@ IllAnalyzer >> initialize [
 	super initialize.
 	immortalObjectsBin := OrderedCollection new: 100000.
 	shortObjectsBin := OrderedCollection new: 100000.
-	longObjectsBin := OrderedCollection new: 10000
+	longObjectsBin := OrderedCollection new: 10000.
+
+	taThreshold := 0.45.
+	hif := 0.
+	hlf := 0.6
 ]
 
 { #category : 'calculating' }
@@ -133,8 +135,7 @@ IllAnalyzer >> isObjectImmortal: illEphe [
 { #category : 'calculating' }
 IllAnalyzer >> isObjectShortLived: illEphe [
 
-	| age taThreshold |
-	taThreshold := 0.45.
+	| age |
 	age := illEphe lifetime / self maxLiveSize.
 	^ age < (taThreshold * self maxLiveSize)
 ]
@@ -166,6 +167,12 @@ IllAnalyzer >> pruneAllocationSites [
 		  allocationSiteBin totalAllocations < (v * totalProgramAllocations) ]
 ]
 
+{ #category : 'accessing' }
+IllAnalyzer >> shortObjectsBin [
+
+	^ shortObjectsBin
+]
+
 { #category : 'accessing' }
 IllAnalyzer >> startTime [
 	^ startTime

diff --git a/src/IllimaniUI/IllAnalyzerPlot.class.st b/src/IllimaniUI/IllAnalyzerPlot.class.st
@@ -14,7 +14,7 @@ IllAnalyzerPlot >> analyzer: anObject [
 	analyzer := anObject
 ]
 
-{ #category : 'as yet unclassified' }
+{ #category : 'api' }
 IllAnalyzerPlot >> plot [
 
 	| chart plot deathTimes ages shortLivedThreshold |
@@ -25,17 +25,17 @@ IllAnalyzerPlot >> plot [
 
 	plot := RSScatterPlot new
 		x: deathTimes y: ages;
-		xlabel: 'Object time of death relative to total allocation';
-		ylabel: 'Object age relative to total allocation';
 		maxChartValueX: 1;
 		yourself.
 
-	shortLivedThreshold :=  ages max * 0.45.
+	shortLivedThreshold := (analyzer shortObjectsBin max: #lifetime) / analyzer totalTime.
 
 	chart := RSCompositeChart new
 		add: plot;
-		add: (RSLinePlot new x: #(1 0) y: #(0 1); color: Color black);
-		add: (RSLinePlot new x: {1 . 0} y: {0.05 . 0.05}; color: Color black);
+		add: (RSLinePlot new x: {plot maxValueX . 0} y: {0 . plot maxValueY}; color: Color black);
+		add: (RSLinePlot new x: {plot maxValueX . 0} y: {shortLivedThreshold . shortLivedThreshold}; color: Color black);
+		xlabel: 'Object time of death relative to total allocation';
+		ylabel: 'Object age relative to total allocation';
 		yourself.
 
 	chart title: ''.