Merge pull request #93 from hpi-swa-lab/fix/spaceUsed

Fix & extend space usage computation

Author: LinqLover

packages/TraceDebugger.package/TDBMemory.class/instance/spaceUsed.st

@@ -6,6 +6,8 @@ spaceUsed
 	tally := SpaceTally new.
 	^ ({self. values. values array} detectSum: [:ea | tally spaceForInstance: ea depth: 0])
 		+ ((values array select: [:assoc | assoc notNil])
-			detectSum: [:assoc | tally
-				spaceForInstance: assoc value
-				depth: 5 "runs array anyOne value second"])
+			detectSum: [:assoc |
+				(tally spaceForInstance: assoc key "object" depth: 0)
+					+ (tally
+						spaceForInstance: assoc value "slots"
+						depth: 6 "array anyOne value array anyOne second")])

packages/TraceDebugger.package/TDBMemory.class/methodProperties.json

@@ -23,4 +23,4 @@
 		"object:priorTo:fieldAt:put:" : "ct 1/22/2022 15:40",
 		"object:priorTo:instVarAt:put:" : "ct 11/19/2021 18:55",
 		"postCopy" : "ct 5/13/2022 23:15",
-		"spaceUsed" : "ct 2/14/2022 17:19" } }
+		"spaceUsed" : "ct 7/20/2022 19:06" } }

packages/TraceDebugger.package/TDBMemorySlice.class/instance/spaceUsed.st

@@ -0,0 +1,12 @@
+support
+spaceUsed
+
+	| tally space |
+	tally := SpaceTally new.
+	space := "self memory spaceUsed"0.
+	space := space
+		+ (tally spaceForInstance: intervals depth: 1)
+		+ (tally spaceForInstance: rawValues depth: 2).
+	sideEffects ifNotNil:
+		[space := space + (sideEffects detectSum: #spaceUsed)].
+	^ space

packages/TraceDebugger.package/TDBMemorySlice.class/methodProperties.json

@@ -55,6 +55,7 @@
 		"setSideEffects:" : "ct 7/4/2022 00:36",
 		"sideEffects" : "ct 5/14/2022 21:57",
 		"size" : "ct 4/30/2022 19:24",
+		"spaceUsed" : "ct 7/24/2022 20:09",
 		"tdbRangeContextsDo:" : "ct 6/2/2022 13:54",
 		"tdbRangeContextsStep" : "ct 6/2/2022 17:37",
 		"times" : "ct 6/2/2022 10:20",

packages/TraceDebuggerTests.package/TDBCursorTest.class/instance/testSpaceUsed.st

@@ -3,11 +3,10 @@ testSpaceUsed
 	"Smoke test."
 
 	| cursor emptyMemorySpace emptySpace emptyTraceSpace |
-	cursor := self classUnderTest forContext: (Context
-		sender: nil
-		receiver: TDBTestLogic new
-		method: TDBTestLogic >> #plonk
-		arguments: #()).
+	cursor := self classUnderTest forContext:
+		[| x |
+		x := Array new: 100000]
+			asContext.
 
 	emptyMemorySpace := cursor memory spaceUsed.
 	self assert: emptyMemorySpace < 1000.
@@ -16,10 +15,14 @@ testSpaceUsed
 	emptySpace := cursor spaceUsed.
 	self assert: emptyMemorySpace < 1000.
 
-	cursor doStepUntil: [:context | context isDead].
+	cursor doStepUntil: [:context | context willReallyStore].
 
-	self assert: cursor memory spaceUsed - emptyMemorySpace > (20 * 4).
-	self assert: cursor memory spaceUsed < 10000.
+	self assert: cursor memory spaceUsed  - emptyMemorySpace > (20 * 5).
+	self assert: cursor memory spaceUsed < 2000.
 	self assert: cursor rootTrace spaceUsed - emptyTraceSpace > (20 * 4).
 	self assert: cursor spaceUsed > emptySpace.
-	self assert: cursor rootTrace spaceUsed < 100000.
+	self assert: cursor rootTrace spaceUsed < 1000.
+	
+	cursor doStepUntil: [:context | false].
+	
+	self assert: cursor memory spaceUsed  - emptyMemorySpace > (100000 * 8).

packages/TraceDebuggerTests.package/TDBCursorTest.class/methodProperties.json

@@ -32,7 +32,7 @@
 		"testDoStepThroughUntil" : "ct 2/17/2022 19:09",
 		"testDoStepThroughUntilFromSender" : "ct 3/13/2022 14:54",
 		"testReturnValue" : "ct 3/17/2022 00:55",
-		"testSpaceUsed" : "ct 6/3/2022 16:49",
+		"testSpaceUsed" : "ct 7/24/2022 20:05",
 		"testTraceContextFilter" : "ct 2/20/2022 19:39",
 		"testTraceFor:contextFilter:like:" : "ct 3/15/2022 23:59",
 		"testTraceFor:like:" : "ct 2/20/2022 19:39",

packages/TraceDebuggerTests.package/TDBMemorySliceTest.class/instance/testSpaceUsed.st

@@ -0,0 +1,33 @@
+tests - support
+testSpaceUsed
+	"Smoke test."
+
+	slice := self classUnderTest
+		memory: self memoryClass new
+		intervals: {1 to: 1}
+		rawValues: {nil}.
+	self assert: slice spaceUsed < 100.
+	
+	slice := self classUnderTest
+		memory: self memoryClass new
+		intervals: ((1 to: 1000) collect: [:ea | ea to: ea])
+		rawValues: ((1 to: 1000) collect: [:ea | ea]).
+	self assert: slice spaceUsed > (1000 * 8 * 2).
+	self assert: slice spaceUsed < (1000 * 8 * 2 * 4).
+	
+	slice := self classUnderTest
+		memory: self memoryClass new
+		intervals: {1 to: 1}
+		rawValues: {Array new: 1000}.
+	self assert: slice spaceUsed > (1000 * 8).
+	self assert: slice spaceUsed < (1000 * 8 * 4).
+	
+	slice := self classUnderTest
+		memory: self memoryClass new
+		intervals: {1 to: 1}
+		rawValues: {nil}
+		sideEffects: {self memoryClass new
+			object: self priorTo: 1 atSlot: #plonk put: (Array new: 1000);
+			yourself}.
+	self assert: slice spaceUsed > (1000 * 8).
+	self assert: slice spaceUsed < (1000 * 8 * 4).

packages/TraceDebuggerTests.package/TDBMemorySliceTest.class/methodProperties.json

@@ -27,6 +27,7 @@
 		"testRawWithTimesCollect" : "ct 6/2/2022 13:55",
 		"testRawWithTimesGather" : "ct 6/2/2022 13:56",
 		"testSize" : "ct 5/28/2022 15:28",
+		"testSpaceUsed" : "ct 7/24/2022 20:14",
 		"testTimesAndRawValues" : "ct 6/2/2022 11:55",
 		"testTimesAndRawValuesCollect" : "ct 6/2/2022 13:16",
 		"testTimesAndRawValuesDo" : "ct 6/2/2022 13:16",