From 2615a073378bbce80e99c7412f8c5911a278bf85 Mon Sep 17 00:00:00 2001 From: Dominik Aumayr Date: Mon, 23 Jul 2018 11:31:24 +0200 Subject: [PATCH] Fix Packages and Imports --- src/som/interpreter/actors/Actor.java | 5 +---- src/som/interpreter/actors/ReceivedRootNode.java | 4 ++-- src/som/primitives/SystemPrims.java | 4 ++-- src/som/primitives/actors/CreateActorPrim.java | 2 +- src/tools/concurrency/TraceBuffer.java | 6 +++--- src/tools/concurrency/TracingBackend.java | 2 +- src/tools/replay/TwoDArrayWrapper.java | 8 ++++---- src/tools/replay/actors/ActorExecutionTrace.java | 2 +- .../nodes/RecordIdIdNode.java | 4 ++-- .../{concurrency => replay}/nodes/RecordIdNode.java | 4 ++-- .../nodes/TraceActorContextNode.java | 6 +++--- .../nodes/TraceActorCreationNode.java | 6 +++--- .../nodes/TraceMessageNode.java | 12 ++++++------ .../{concurrency => replay}/nodes/TraceNode.java | 4 ++-- 14 files changed, 33 insertions(+), 36 deletions(-) rename src/tools/{concurrency => replay}/nodes/RecordIdIdNode.java (95%) rename src/tools/{concurrency => replay}/nodes/RecordIdNode.java (94%) rename src/tools/{concurrency => replay}/nodes/TraceActorContextNode.java (80%) rename src/tools/{concurrency => replay}/nodes/TraceActorCreationNode.java (83%) rename src/tools/{concurrency => replay}/nodes/TraceMessageNode.java (91%) rename src/tools/{concurrency => replay}/nodes/TraceNode.java (76%) diff --git a/src/som/interpreter/actors/Actor.java b/src/som/interpreter/actors/Actor.java index 598c4bde3..c8800040d 100644 --- 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 index f0239588a..9f0aaa7a4 100644 --- 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 index 7dbb97f0c..1a40e6402 100644 --- 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 index 333f983fd..f70a50398 100644 --- 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 index 8932c7968..b8b0b1fa6 100644 --- 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 index e7ea27bf4..e57515fd2 100644 --- 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 index 035d77fb0..27b1d0901 100644 --- 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 index bd41608b9..9b517b4b0 100644 --- 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/src/tools/concurrency/nodes/RecordIdIdNode.java b/src/tools/replay/nodes/RecordIdIdNode.java similarity index 95% rename from src/tools/concurrency/nodes/RecordIdIdNode.java rename to src/tools/replay/nodes/RecordIdIdNode.java index 61d05e032..9791443d9 100644 --- a/src/tools/concurrency/nodes/RecordIdIdNode.java +++ b/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/src/tools/concurrency/nodes/RecordIdNode.java b/src/tools/replay/nodes/RecordIdNode.java similarity index 94% rename from src/tools/concurrency/nodes/RecordIdNode.java rename to src/tools/replay/nodes/RecordIdNode.java index fc44c641c..e497edb37 100644 --- a/src/tools/concurrency/nodes/RecordIdNode.java +++ b/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/src/tools/concurrency/nodes/TraceActorContextNode.java b/src/tools/replay/nodes/TraceActorContextNode.java similarity index 80% rename from src/tools/concurrency/nodes/TraceActorContextNode.java rename to src/tools/replay/nodes/TraceActorContextNode.java index 98d9ec8e3..bcbaadd0b 100644 --- a/src/tools/concurrency/nodes/TraceActorContextNode.java +++ b/src/tools/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/src/tools/concurrency/nodes/TraceActorCreationNode.java b/src/tools/replay/nodes/TraceActorCreationNode.java similarity index 83% rename from src/tools/concurrency/nodes/TraceActorCreationNode.java rename to src/tools/replay/nodes/TraceActorCreationNode.java index af705758e..6772b83d7 100644 --- a/src/tools/concurrency/nodes/TraceActorCreationNode.java +++ b/src/tools/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/src/tools/concurrency/nodes/TraceMessageNode.java b/src/tools/replay/nodes/TraceMessageNode.java similarity index 91% rename from src/tools/concurrency/nodes/TraceMessageNode.java rename to src/tools/replay/nodes/TraceMessageNode.java index d21a0d33c..2d53d3c33 100644 --- a/src/tools/concurrency/nodes/TraceMessageNode.java +++ b/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 b/src/tools/replay/nodes/TraceNode.java similarity index 76% rename from src/tools/concurrency/nodes/TraceNode.java rename to src/tools/replay/nodes/TraceNode.java index f8d2e234c..efa2f4d74 100644 --- a/src/tools/concurrency/nodes/TraceNode.java +++ b/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 {