sandbox: speed up memory lookups (ported back from TraceDebugger)

LinqLover · Jan 2, 2025 · 51c7c52 · 51c7c52
1 parent a26d757
commit 51c7c52
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/packages/SimulationStudio-Sandbox.package/Sandbox.class/class/initialize.st b/packages/SimulationStudio-Sandbox.package/Sandbox.class/class/initialize.st
@@ -0,0 +1,4 @@
+class initialization
+initialize
+
+	Mirror := thisContext. "Used for accessing miror primitives while avoiding frequent invocations of the expensive bytecode pushThisContext."
diff --git a/packages/SimulationStudio-Sandbox.package/Sandbox.class/instance/initialize.st b/packages/SimulationStudio-Sandbox.package/Sandbox.class/instance/initialize.st
@@ -5,8 +5,8 @@ initialize
 
 	objects := SimPluggableWeakKeyDictionary new
 		"Simulation-safe WeakIdentityKeyDictionary. We must not send any message to any simulated object here (the object could inject arbitrary code in the executor by this, or it might simply not understand the message and raise an error). Use mirror primitives for identity and hash testing."
-		equalBlock: [:first :second | thisContext object: first eqeq: second];
-		hashBlock: [:object | thisContext simObjectIdentityHash: object];
+		equalBlock: [:first :second | Mirror object: first eqeq: second];
+		hashBlock: [:object | Mirror simObjectIdentityHash: object];
 		yourself.
 	hashes := objects copy.
 	stepCount := 0.
diff --git a/packages/SimulationStudio-Sandbox.package/Sandbox.class/methodProperties.json b/packages/SimulationStudio-Sandbox.package/Sandbox.class/methodProperties.json
@@ -5,7 +5,8 @@
 		"evaluate:" : "ct 3/6/2021 13:12",
 		"evaluate:ifFailed:" : "ct 3/6/2021 13:12",
 		"evaluate:on:do:" : "ct 3/6/2021 13:12",
-		"fromMemory:" : "ct 3/6/2021 01:39" },
+		"fromMemory:" : "ct 3/6/2021 01:39",
+		"initialize" : "ct 12/29/2024 21:14" },
 	"instance" : {
 		"addObject:" : "ct 3/22/2021 17:51",
 		"basicEvaluate:" : "ct 11/13/2021 16:12",
@@ -18,7 +19,7 @@
 		"exportMemory" : "ct 3/6/2021 01:38",
 		"hashFor:" : "ct 1/10/2021 21:40",
 		"importMemory:" : "ct 3/6/2021 01:39",
-		"initialize" : "ct 12/29/2021 14:40",
+		"initialize" : "ct 1/2/2025 03:33",
 		"lookupSelector:inClass:" : "ct 12/29/2021 01:55",
 		"patchObject:with:" : "ct 3/6/2021 13:25",
 		"readableObjectFor:" : "ct 12/28/2020 21:24",

diff --git a/packages/SimulationStudio-Sandbox.package/Sandbox.class/properties.json b/packages/SimulationStudio-Sandbox.package/Sandbox.class/properties.json
@@ -3,7 +3,7 @@
 	"classinstvars" : [
 		 ],
 	"classvars" : [
-		 ],
+		"Mirror" ],
 	"commentStamp" : "ct 12/26/2021 21:36",
 	"instvars" : [
 		"stepLimit",

diff --git a/packages/SimulationStudio-Sandbox.package/Sandbox2.class/class/initialize.st b/packages/SimulationStudio-Sandbox.package/Sandbox2.class/class/initialize.st
@@ -0,0 +1,4 @@
+class initialization
+initialize
+
+	Mirror := thisContext. "Used for accessing miror primitives while avoiding frequent invocations of the expensive bytecode pushThisContext."
diff --git a/packages/SimulationStudio-Sandbox.package/Sandbox2.class/instance/initialize.st b/packages/SimulationStudio-Sandbox.package/Sandbox2.class/instance/initialize.st
@@ -5,8 +5,8 @@ initialize
 
 	objects := SimPluggableWeakKeyDictionary new
 		"Simulation-safe WeakIdentityKeyDictionary. We must not send any message to any simulated object here (the object could inject arbitrary code in the executor by this, or it might simply not understand the message and raise an error). Use mirror primitives for identity and hash testing."
-		equalBlock: [:first :second | thisContext object: first eqeq: second];
-		hashBlock: [:object | thisContext simObjectIdentityHash: object];
+		equalBlock: [:first :second | Mirror object: first eqeq: second];
+		hashBlock: [:object | Mirror simObjectIdentityHash: object];
 		yourself.
 	hashes := objects copy.
 	stepCount := 0.
diff --git a/packages/SimulationStudio-Sandbox.package/Sandbox2.class/methodProperties.json b/packages/SimulationStudio-Sandbox.package/Sandbox2.class/methodProperties.json
@@ -6,7 +6,8 @@
 		"evaluate:" : "ct 11/13/2021 16:12",
 		"evaluate:ifFailed:" : "ct 11/13/2021 16:12",
 		"evaluate:on:do:" : "ct 11/13/2021 16:12",
-		"fromMemory:" : "ct 3/6/2021 01:39" },
+		"fromMemory:" : "ct 3/6/2021 01:39",
+		"initialize" : "ct 12/29/2024 21:14" },
 	"instance" : {
 		"access:indirectors:" : "ct 11/12/2021 23:58",
 		"addObject:" : "ct 3/22/2021 17:51",
@@ -45,7 +46,7 @@
 		"exportMemory" : "ct 3/6/2021 01:38",
 		"hashFor:" : "ct 1/10/2021 21:40",
 		"importMemory:" : "ct 3/6/2021 01:39",
-		"initialize" : "ct 12/29/2021 14:40",
+		"initialize" : "ct 12/29/2024 21:14",
 		"initializeContext:" : "ct 11/13/2021 00:18",
 		"operationForbidden:" : "ct 3/4/2021 23:48",
 		"patchObject:with:" : "ct 3/6/2021 13:25",

diff --git a/packages/SimulationStudio-Sandbox.package/Sandbox2.class/properties.json b/packages/SimulationStudio-Sandbox.package/Sandbox2.class/properties.json
@@ -3,7 +3,7 @@
 	"classinstvars" : [
 		 ],
 	"classvars" : [
-		 ],
+		"Mirror" ],
 	"commentStamp" : "ct 11/19/2022 01:36",
 	"instvars" : [
 		"stepLimit",