Fix Packages and Imports

smarr · Jul 23, 2018 · 2615a07 · 2615a07
1 parent d174fd0
commit 2615a07
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 36 deletions.
diff --git a/src/som/interpreter/actors/Actor.java b/src/som/interpreter/actors/Actor.java
@@ -28,11 +28,11 @@
 import tools.concurrency.TracingActivityThread;
 import tools.concurrency.TracingActors.ReplayActor;
 import tools.concurrency.TracingActors.TracingActor;
-import tools.concurrency.nodes.TraceActorContextNode;
 import tools.debugger.WebDebugger;
 import tools.debugger.entities.ActivityType;
 import tools.debugger.entities.DynamicScopeType;
 import tools.replay.actors.ActorExecutionTrace;
+import tools.replay.nodes.TraceActorContextNode;
 
 
 /**
@@ -302,9 +302,6 @@ private void execute(final EventualMessage msg,
         if (VmSettings.KOMPOS_TRACING) {
           KomposTrace.scopeEnd(DynamicScopeType.TURN);
         }
-        if (VmSettings.ACTOR_TRACING) {
-          ActorExecutionTrace.recordMessage(msg);
-        }
       }
     }
 

diff --git a/src/som/interpreter/actors/ReceivedRootNode.java b/src/som/interpreter/actors/ReceivedRootNode.java
@@ -12,10 +12,10 @@
 import som.interpreter.actors.SPromise.SResolver;
 import som.vm.VmSettings;
 import tools.concurrency.KomposTrace;
-import tools.concurrency.nodes.TraceMessageNode;
-import tools.concurrency.nodes.TraceMessageNodeGen;
 import tools.debugger.WebDebugger;
 import tools.debugger.entities.DynamicScopeType;
+import tools.replay.nodes.TraceMessageNode;
+import tools.replay.nodes.TraceMessageNodeGen;
 
 
 public abstract class ReceivedRootNode extends RootNode {

diff --git a/src/som/primitives/SystemPrims.java b/src/som/primitives/SystemPrims.java
@@ -53,10 +53,10 @@
 import som.vmobjects.SObjectWithClass;
 import som.vmobjects.SSymbol;
 import tools.SourceCoordinate;
-import tools.concurrency.ActorExecutionTrace;
 import tools.concurrency.TraceParser;
 import tools.concurrency.TracingBackend;
-import tools.concurrency.nodes.TraceActorContextNode;
+import tools.replay.actors.ActorExecutionTrace;
+import tools.replay.nodes.TraceActorContextNode;
 
 
 public final class SystemPrims {

diff --git a/src/som/primitives/actors/CreateActorPrim.java b/src/som/primitives/actors/CreateActorPrim.java
@@ -18,9 +18,9 @@
 import tools.concurrency.KomposTrace;
 import tools.concurrency.Tags.ExpressionBreakpoint;
 import tools.concurrency.TracingActors.TracingActor;
-import tools.concurrency.nodes.TraceActorCreationNode;
 import tools.debugger.entities.ActivityType;
 import tools.replay.actors.ActorExecutionTrace;
+import tools.replay.nodes.TraceActorCreationNode;
 
 
 @GenerateNodeFactory

diff --git a/src/tools/concurrency/TraceBuffer.java b/src/tools/concurrency/TraceBuffer.java
@@ -7,7 +7,7 @@
 import som.vm.VmSettings;
 import sun.misc.Unsafe;
 import tools.replay.actors.ActorExecutionTrace.ActorTraceBuffer;
-import tools.concurrency.nodes.TraceActorContext;
+import tools.replay.nodes.TraceActorContextNode;
 
 
 public abstract class TraceBuffer {
@@ -21,8 +21,8 @@ public static TraceBuffer create(final long threadId) {
     }
   }
 
-  static final Unsafe UNSAFE;
-  static final long   BYTE_ARR_BASE_OFFSET;
+  public static final Unsafe UNSAFE;
+  public static final long   BYTE_ARR_BASE_OFFSET;
 
   private static Unsafe loadUnsafe() {
     try {

diff --git a/src/tools/concurrency/TracingBackend.java b/src/tools/concurrency/TracingBackend.java
@@ -357,7 +357,7 @@ private void writeExternalData(final FileOutputStream edfos) throws IOException
 
     private void writeArray(final TwoDArrayWrapper aw, final FileOutputStream edfos)
         throws IOException {
-      SImmutableArray sia = aw.ia;
+      SImmutableArray sia = aw.immArray;
 
       Object[] outer = sia.getObjectStorage(SArray.ObjectStorageType);
       byte[][][] bouter = new byte[outer.length][][];

diff --git a/src/tools/replay/TwoDArrayWrapper.java b/src/tools/replay/TwoDArrayWrapper.java
@@ -4,13 +4,13 @@
 
 
 public class TwoDArrayWrapper {
-  final SImmutableArray ia;
-  public final int      actorId;
-  final int             dataId;
+  public final SImmutableArray immArray;
+  public final int             actorId;
+  public final int             dataId;
 
   public TwoDArrayWrapper(final SImmutableArray ia, final int actorId, final int dataId) {
     super();
-    this.ia = ia;
+    this.immArray = ia;
     this.actorId = actorId;
     this.dataId = dataId;
   }

diff --git a/src/tools/replay/actors/ActorExecutionTrace.java b/src/tools/replay/actors/ActorExecutionTrace.java
@@ -11,7 +11,7 @@
 import tools.concurrency.TracingActivityThread;
 import tools.concurrency.TracingActors.TracingActor;
 import tools.replay.StringWrapper;
-import tools.concurrency.nodes.TraceActorContextNode;
+import tools.replay.nodes.TraceActorContextNode;
 
 
 public class ActorExecutionTrace {

diff --git a/...ols/concurrency/nodes/RecordIdIdNode.java → src/tools/replay/nodes/RecordIdIdNode.java b/...ols/concurrency/nodes/RecordIdIdNode.java → src/tools/replay/nodes/RecordIdIdNode.java
@@ -1,10 +1,10 @@
-package tools.concurrency.nodes;
+package tools.replay.nodes;
 
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 
 import som.vm.VmSettings;
-import tools.concurrency.ActorExecutionTrace.ActorTraceBuffer;
+import tools.replay.actors.ActorExecutionTrace.ActorTraceBuffer;
 
 
 public abstract class RecordIdIdNode extends Node {

diff --git a/...tools/concurrency/nodes/RecordIdNode.java → src/tools/replay/nodes/RecordIdNode.java b/...tools/concurrency/nodes/RecordIdNode.java → src/tools/replay/nodes/RecordIdNode.java
@@ -1,10 +1,10 @@
-package tools.concurrency.nodes;
+package tools.replay.nodes;
 
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 
 import som.vm.VmSettings;
-import tools.concurrency.ActorExecutionTrace.ActorTraceBuffer;
+import tools.replay.actors.ActorExecutionTrace.ActorTraceBuffer;
 
 
 public abstract class RecordIdNode extends Node {

diff --git a/...currency/nodes/TraceActorContextNode.java → ...s/replay/nodes/TraceActorContextNode.java b/...currency/nodes/TraceActorContextNode.java → ...s/replay/nodes/TraceActorContextNode.java
@@ -1,8 +1,8 @@
-package tools.concurrency.nodes;
+package tools.replay.nodes;
 
-import tools.concurrency.ActorExecutionTrace;
-import tools.concurrency.ActorExecutionTrace.ActorTraceBuffer;
 import tools.concurrency.TracingActors.TracingActor;
+import tools.replay.actors.ActorExecutionTrace;
+import tools.replay.actors.ActorExecutionTrace.ActorTraceBuffer;
 
 
 public final class TraceActorContextNode extends TraceNode {

diff --git a/...urrency/nodes/TraceActorCreationNode.java → .../replay/nodes/TraceActorCreationNode.java b/...urrency/nodes/TraceActorCreationNode.java → .../replay/nodes/TraceActorCreationNode.java
@@ -1,8 +1,8 @@
-package tools.concurrency.nodes;
+package tools.replay.nodes;
 
-import tools.concurrency.ActorExecutionTrace;
-import tools.concurrency.ActorExecutionTrace.ActorTraceBuffer;
 import tools.concurrency.TracingActors.TracingActor;
+import tools.replay.actors.ActorExecutionTrace;
+import tools.replay.actors.ActorExecutionTrace.ActorTraceBuffer;
 
 
 public final class TraceActorCreationNode extends TraceNode {

diff --git a/...s/concurrency/nodes/TraceMessageNode.java → src/tools/replay/nodes/TraceMessageNode.java b/...s/concurrency/nodes/TraceMessageNode.java → src/tools/replay/nodes/TraceMessageNode.java
@@ -1,19 +1,19 @@
-package tools.concurrency.nodes;
+package tools.replay.nodes;
 
 import com.oracle.truffle.api.dsl.Specialization;
 
 import som.interpreter.actors.EventualMessage;
 import som.interpreter.actors.EventualMessage.DirectMessage;
-import som.interpreter.actors.EventualMessage.ExternalDirectMessage;
-import som.interpreter.actors.EventualMessage.ExternalPromiseCallbackMessage;
-import som.interpreter.actors.EventualMessage.ExternalPromiseSendMessage;
 import som.interpreter.actors.EventualMessage.PromiseCallbackMessage;
 import som.interpreter.actors.EventualMessage.PromiseMessage;
 import som.interpreter.actors.EventualMessage.PromiseSendMessage;
 import som.interpreter.actors.SPromise.STracingPromise;
-import tools.concurrency.ActorExecutionTrace;
-import tools.concurrency.ActorExecutionTrace.ActorTraceBuffer;
 import tools.concurrency.TracingActors.TracingActor;
+import tools.replay.actors.ActorExecutionTrace;
+import tools.replay.actors.ActorExecutionTrace.ActorTraceBuffer;
+import tools.replay.actors.ExternalEventualMessage.ExternalDirectMessage;
+import tools.replay.actors.ExternalEventualMessage.ExternalPromiseCallbackMessage;
+import tools.replay.actors.ExternalEventualMessage.ExternalPromiseSendMessage;
 
 
 public abstract class TraceMessageNode extends TraceNode {

diff --git a/src/tools/concurrency/nodes/TraceNode.java → src/tools/replay/nodes/TraceNode.java b/src/tools/concurrency/nodes/TraceNode.java → src/tools/replay/nodes/TraceNode.java
@@ -1,9 +1,9 @@
-package tools.concurrency.nodes;
+package tools.replay.nodes;
 
 import com.oracle.truffle.api.nodes.Node;
 
-import tools.concurrency.ActorExecutionTrace.ActorTraceBuffer;
 import tools.concurrency.TracingActivityThread;
+import tools.replay.actors.ActorExecutionTrace.ActorTraceBuffer;
 
 
 public abstract class TraceNode extends Node {