Avoid initializing TraceActorCreationNode if tracing is not enabled

Signed-off-by: Stefan Marr <git@stefan-marr.de>
smarr · Apr 15, 2020 · f21d959 · f21d959
1 parent 4122590
commit f21d959
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/som/primitives/actors/CreateActorPrim.java b/src/som/primitives/actors/CreateActorPrim.java
@@ -30,7 +30,8 @@
 public abstract class CreateActorPrim extends BinarySystemOperation {
   @Child protected IsValue                isValue = IsValueNodeGen.createSubNode();
   @Child protected ExceptionSignalingNode notAValue;
-  @Child protected TraceActorCreationNode trace   = new TraceActorCreationNode();
+
+  @Child protected TraceActorCreationNode trace = TraceActorCreationNode.create();
 
   @Override
   public final CreateActorPrim initialize(final VM vm) {

diff --git a/src/tools/replay/nodes/TraceActorCreationNode.java b/src/tools/replay/nodes/TraceActorCreationNode.java
@@ -1,5 +1,6 @@
 package tools.replay.nodes;
 
+import som.vm.VmSettings;
 import tools.concurrency.TracingActors.TracingActor;
 import tools.replay.TraceRecord;
 import tools.replay.nodes.RecordEventNodes.RecordOneEvent;
@@ -9,7 +10,17 @@ public final class TraceActorCreationNode extends TraceNode {
   @Child protected RecordOneEvent roe =
       new RecordOneEvent(TraceRecord.ACTOR_CREATION);
 
+  private TraceActorCreationNode() {}
+
   public void trace(final TracingActor actor) {
     roe.record(actor.getId());
   }
+
+  public static TraceActorCreationNode create() {
+    if (VmSettings.ACTOR_TRACING) {
+      return new TraceActorCreationNode();
+    } else {
+      return null;
+    }
+  }
 }