recordStartupStamp during startup and minor edits

hpi-swa · Jul 20, 2021 · a1bb0ad · a1bb0ad
1 parent bcd23da
commit a1bb0ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageContext.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageContext.java
@@ -196,14 +196,18 @@ public void ensureLoaded() {
                 printToStdOut("Skipping startup routine...");
                 return;
             }
+            /*
+             * TODO: Move setup instructions into a single .st file and evaluate that (similar to
+             * how its done in SqueakSUnitTest.
+             */
             printToStdOut("Preparing image for headless execution...");
             // Remove active context.
             GetActiveProcessNode.getSlow(this).instVarAtPut0Slow(PROCESS.SUSPENDED_CONTEXT, NilObject.SINGLETON);
             // Modify StartUpList for headless execution.
             evaluate("{EventSensor. Project} do: [:ea | Smalltalk removeFromStartUpList: ea]");
             try {
                 /** See SmalltalkImage>>#snapshot:andQuit:withExitCode:embedded:. */
-                evaluate("[Smalltalk clearExternalObjects. Smalltalk processStartUpList: true. Smalltalk setPlatformPreferences] value");
+                evaluate("[Smalltalk clearExternalObjects. Smalltalk processStartUpList: true. Smalltalk setPlatformPreferences; recordStartupStamp] value");
             } catch (final Exception e) {
                 printToStdErr("startUpList failed:");
                 printToStdErr(e);

diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/ClassObject.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/ClassObject.java
@@ -634,7 +634,7 @@ public void trace(final SqueakImageWriter writer) {
     @Override
     public void write(final SqueakImageWriter writer) {
         if (!writeHeader(writer)) {
-            throw SqueakException.create("BlockClosureObject must have slots:", this);
+            throw SqueakException.create("ClassObject must have slots:", this);
         }
         writer.writeObject(getSuperclass());
         writer.writeObject(getMethodDict());