Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for pausing an actor #325

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/som/primitives/actors/CreateActorPrim.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ public final SFarReference createActor(final VirtualFrame frame, final Object re
final SClass actorClass = (SClass) argument;
KomposTrace.activityCreation(ActivityType.ACTOR, actor.getId(),
actorClass.getName(), sourceSection);
//to keep all the created actors, this information is needed for example when pausing a running actor without specifying a breakpoint
TracingActor.saveActor(actor);
}
return ref;
}
Expand Down
19 changes: 14 additions & 5 deletions src/tools/concurrency/TracingActors.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
package tools.concurrency;

import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
import java.util.Queue;
import java.util.WeakHashMap;
import java.util.*;
import java.util.concurrent.ForkJoinPool;
import java.util.function.BiConsumer;

Expand Down Expand Up @@ -42,6 +38,11 @@ public static class TracingActor extends Actor {
*/
protected boolean stepToNextTurn;

/**
* Saves all ids and the instances of the actors created in the system.
*/
private static Map<Long, Actor> allActors = new HashMap<>();

public TracingActor(final VM vm) {
super(vm);
this.activityId = TracingActivityThread.newEntityId(vm);
Expand Down Expand Up @@ -120,6 +121,14 @@ public static void handleBreakpointsAndStepping(final EventualMessage msg,
public DeserializationBuffer getDeserializationBuffer() {
return null;
}

public static void saveActor(Actor actor) {
allActors.put(actor.getId(), actor);
}

public static Actor getActorById(long actorId){
return allActors.get(actorId);
}
}

public static final class ReplayActor extends TracingActor {
Expand Down
17 changes: 7 additions & 10 deletions src/tools/debugger/FrontendConnector.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import bd.source.SourceCoordinate;
import bd.source.TaggedSourceCoordinate;
import som.interpreter.actors.Actor;
import som.vm.VmSettings;
import som.vmobjects.SSymbol;
import tools.Tagging;
Expand All @@ -41,18 +42,10 @@
import tools.debugger.entities.SendOp;
import tools.debugger.entities.SteppingType;
import tools.debugger.frontend.Suspension;
import tools.debugger.message.InitializationResponse;
import tools.debugger.message.Message;
import tools.debugger.message.*;
import tools.debugger.message.Message.OutgoingMessage;
import tools.debugger.message.ProgramInfoResponse;
import tools.debugger.message.ScopesResponse;
import tools.debugger.message.SourceMessage;
import tools.debugger.message.SourceMessage.SourceData;
import tools.debugger.message.StackTraceResponse;
import tools.debugger.message.StoppedMessage;
import tools.debugger.message.SymbolMessage;
import tools.debugger.message.VariablesRequest.FilterType;
import tools.debugger.message.VariablesResponse;
import tools.debugger.session.Breakpoints;
import tools.debugger.session.LineBreakpoint;

Expand Down Expand Up @@ -320,7 +313,11 @@ public Suspension getSuspensionForGlobalId(final long globalId) {
return webDebugger.getSuspension(TraceData.getActivityIdFromGlobalValId(globalId));
}

static void log(final String str) {
public Actor getActorById(final long activityId) {
return webDebugger.getActorById(activityId);
}

public static void log(final String str) {
// Checkstyle: stop
System.out.println(str);
// Checkstyle: resume
Expand Down
18 changes: 2 additions & 16 deletions src/tools/debugger/RuntimeReflectionRegistration.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,9 @@
import com.google.gson.GsonBuilder;
import com.oracle.svm.core.annotate.AutomaticFeature;

import tools.debugger.message.InitializationResponse;
import tools.debugger.message.InitializeConnection;
import tools.debugger.message.*;
import tools.debugger.message.Message.IncommingMessage;
import tools.debugger.message.Message.OutgoingMessage;
import tools.debugger.message.ProgramInfoRequest;
import tools.debugger.message.ProgramInfoResponse;
import tools.debugger.message.ScopesRequest;
import tools.debugger.message.ScopesResponse;
import tools.debugger.message.SourceMessage;
import tools.debugger.message.StackTraceRequest;
import tools.debugger.message.StackTraceResponse;
import tools.debugger.message.StepMessage;
import tools.debugger.message.StoppedMessage;
import tools.debugger.message.SymbolMessage;
import tools.debugger.message.TraceDataRequest;
import tools.debugger.message.UpdateBreakpoint;
import tools.debugger.message.VariablesRequest;
import tools.debugger.message.VariablesResponse;
import tools.debugger.session.BreakpointInfo;
import tools.debugger.session.LineBreakpoint;
import tools.debugger.session.SectionBreakpoint;
Expand Down Expand Up @@ -91,6 +76,7 @@ public void register(final String name, final Class<?> klass) {
inMsgs.register(VariablesRequest.class);
inMsgs.register(ProgramInfoRequest.class);
inMsgs.register(TraceDataRequest.class);
inMsgs.register("pauseActorMessageReceiver", PauseActorRequest.class);

ClassGroup bps = new ClassGroup(BreakpointInfo.class, "type", true);
bps.register(LineBreakpoint.class);
Expand Down
6 changes: 6 additions & 0 deletions src/tools/debugger/WebDebugger.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@

import bd.source.SourceCoordinate;
import som.VM;
import som.interpreter.actors.Actor;
import som.vm.Activity;
import som.vm.Symbols;
import tools.TraceData;
import tools.concurrency.TracingActivityThread;
import tools.concurrency.TracingActors;
import tools.debugger.frontend.Suspension;
import tools.debugger.session.Breakpoints;

Expand Down Expand Up @@ -178,5 +180,9 @@ public Breakpoints getBreakpoints() {
return breakpoints;
}

public Actor getActorById(long actorId) {
return TracingActors.TracingActor.getActorById(actorId);
}

private static Gson jsonProcessor = RuntimeReflectionRegistration.createJsonProcessor();
}
25 changes: 25 additions & 0 deletions src/tools/debugger/message/PauseActorRequest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package tools.debugger.message;

import org.java_websocket.WebSocket;
import som.interpreter.actors.Actor;
import tools.debugger.FrontendConnector;

public class PauseActorRequest extends Message.IncommingMessage {
private final long actorId;

public PauseActorRequest() {
actorId = -1;
}

public PauseActorRequest(long actorId) {
this.actorId = actorId;
}

@Override
public void process(FrontendConnector connector, WebSocket conn) {
Actor actor = connector.getActorById(this.actorId);
assert actor != null : "Failed to get actor for activityId: " + this.actorId;
actor.setStepToNextTurn(true);
FrontendConnector.log("[DEBUGGER] Actor "+actor.getId() +" will pause before processing the next message.");
}
}