Add process modes

ngallagher · ngallagher · commit c1d8dd869cb2 · 2017-01-29T11:58:32.000+11:00
diff --git a/snap-agent/src/main/java/org/snapscript/agent/ProcessAgent.java b/snap-agent/src/main/java/org/snapscript/agent/ProcessAgent.java
@@ -41,11 +41,11 @@ public ProcessAgent(URI root, String process, String level, int port, int thread
       this.port = port;
    }
    
-   public void start() throws Exception {
-      start(model);
+   public void start(ProcessMode mode) throws Exception {
+      start(mode, model);
    }
    
-   public void start(Model model) throws Exception {
+   public void start(ProcessMode mode, Model model) throws Exception {
       BreakpointMatcher matcher = context.getMatcher();
       SuspendController controller = context.getController();
       TraceInterceptor interceptor = context.getInterceptor();
@@ -57,7 +57,7 @@ public void start(Model model) throws Exception {
          ConsoleLogger logger = new ConsoleLogger(level);
          SystemValidator validator = new SystemValidator(context);
          ConnectionChecker checker = new ConnectionChecker(process, system);
-         ProcessEventReceiver listener = new ProcessEventReceiver(context, checker, model);
+         ProcessEventReceiver listener = new ProcessEventReceiver(context, mode, checker, model);
          ProcessEventTimer timer = new ProcessEventTimer(listener, logger);
          SocketEventClient client = new SocketEventClient(timer, logger);
          ProcessEventChannel channel = client.connect(host, port);
diff --git a/snap-agent/src/main/java/org/snapscript/agent/ProcessEventReceiver.java b/snap-agent/src/main/java/org/snapscript/agent/ProcessEventReceiver.java
@@ -1,33 +1,25 @@
 package org.snapscript.agent;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-
 import org.snapscript.agent.debug.BreakpointMatcher;
 import org.snapscript.agent.debug.ResumeType;
 import org.snapscript.agent.debug.SuspendController;
-import org.snapscript.agent.event.BreakpointsEvent;
-import org.snapscript.agent.event.BrowseEvent;
-import org.snapscript.agent.event.EvaluateEvent;
-import org.snapscript.agent.event.ExecuteData;
-import org.snapscript.agent.event.ExecuteEvent;
-import org.snapscript.agent.event.PingEvent;
-import org.snapscript.agent.event.ProcessEventAdapter;
-import org.snapscript.agent.event.ProcessEventChannel;
-import org.snapscript.agent.event.StepEvent;
+import org.snapscript.agent.event.*;
 import org.snapscript.core.Model;
 
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
 public class ProcessEventReceiver extends ProcessEventAdapter {
    
    private final AtomicReference<ExecuteData> reference;
    private final ConnectionChecker checker;
    private final ResourceExecutor executor;
    private final ProcessContext context;
    
-   public ProcessEventReceiver(ProcessContext context, ConnectionChecker checker, Model model) throws Exception {
+   public ProcessEventReceiver(ProcessContext context, ProcessMode mode, ConnectionChecker checker, Model model) throws Exception {
       this.reference = new AtomicReference<ExecuteData>();
-      this.executor = new ResourceExecutor(context, model);
+      this.executor = new ResourceExecutor(context, mode, model);
       this.checker = checker;
       this.context = context;
    }
diff --git a/snap-agent/src/main/java/org/snapscript/agent/ProcessMode.java b/snap-agent/src/main/java/org/snapscript/agent/ProcessMode.java
@@ -0,0 +1,16 @@
+package org.snapscript.agent;
+
+public enum ProcessMode {
+    DETACHED(true),
+    ATTACHED(false);
+
+    private final boolean async;
+
+    private ProcessMode(boolean async) {
+        this.async = async;
+    }
+
+    public boolean isAsync(){
+        return async;
+    }
+}
diff --git a/snap-agent/src/main/java/org/snapscript/agent/ProcessTask.java b/snap-agent/src/main/java/org/snapscript/agent/ProcessTask.java
@@ -18,16 +18,18 @@ public class ProcessTask implements Runnable {
    
    private final ProcessEventChannel client;
    private final ProcessContext context;
+   private final ProcessMode mode;
    private final String resource;
    private final String project;
    private final Model model;
    
-   public ProcessTask(ProcessEventChannel client, ProcessContext context, Model model, String project, String resource) {
+   public ProcessTask(ProcessEventChannel client, ProcessContext context, ProcessMode mode, Model model, String project, String resource) {
       this.client = client;
       this.resource = resource;
       this.project = project;
       this.context = context;
       this.model = model;
+      this.mode = mode;
    }
    
    @Override
@@ -85,13 +87,17 @@ public void run() {
             } catch(Exception e) {
                e.printStackTrace();
             } finally {
-               System.exit(0); // shutdown when finished  
+               if(!mode.isAsync()) {
+                  System.exit(0); // shutdown when finished
+               }
             }
          }
       } catch (Exception e) {
          System.err.println(ExceptionBuilder.build(e));
       } finally {
-         System.exit(0); // shutdown when finished  
+         if(!mode.isAsync()) {
+            System.exit(0); // shutdown when finished
+         }
       }
    }
 }
diff --git a/snap-agent/src/main/java/org/snapscript/agent/ResourceExecutor.java b/snap-agent/src/main/java/org/snapscript/agent/ResourceExecutor.java
@@ -9,17 +9,19 @@
 public class ResourceExecutor {
 
    private final ProcessContext context;
+   private final ProcessMode mode;
    private final ThreadFactory factory;
    private final Model model;
    
-   public ResourceExecutor(ProcessContext context, Model model) throws Exception {
+   public ResourceExecutor(ProcessContext context, ProcessMode mode, Model model) throws Exception {
       this.factory = new ThreadBuilder();
       this.context = context;
       this.model = model;
+      this.mode = mode;
    }
 
    public void execute(ProcessEventChannel channel, String project, String resource) throws Exception {
-      ProcessTask task = new ProcessTask(channel, context, model, project, resource);
+      ProcessTask task = new ProcessTask(channel, context, mode, model, project, resource);
       
       if(resource != null) {
          Thread thread = factory.newThread(task);
diff --git a/snap-agent/src/main/java/org/snapscript/agent/event/ProcessEventConnection.java b/snap-agent/src/main/java/org/snapscript/agent/event/ProcessEventConnection.java
@@ -8,18 +8,20 @@ public class ProcessEventConnection {
 
    private final MessageEnvelopReader consumer;
    private final MessageEnvelopeWriter producer;
+   private final ProcessEventExecutor executor;
    
-   public ProcessEventConnection(InputStream input, OutputStream output) {
+   public ProcessEventConnection(ProcessEventExecutor executor, InputStream input, OutputStream output) {
       this.consumer = new MessageEnvelopReader(input);
       this.producer = new MessageEnvelopeWriter(output);
+      this.executor = executor;
    }
    
    public ProcessEventConsumer getConsumer() throws IOException {
       return new ProcessEventConsumer(consumer);
    }
    
    public ProcessEventProducer getProducer() throws IOException {
-      return new ProcessEventProducer(producer);
+      return new ProcessEventProducer(executor, producer);
       
    }
 }
diff --git a/snap-agent/src/main/java/org/snapscript/agent/event/ProcessEventProducer.java b/snap-agent/src/main/java/org/snapscript/agent/event/ProcessEventProducer.java
@@ -14,10 +14,10 @@ public class ProcessEventProducer {
    private final CountDownLatch latch;
    private final Executor executor;
    
-   public ProcessEventProducer(MessageEnvelopeWriter writer) {
+   public ProcessEventProducer(ProcessEventExecutor executor, MessageEnvelopeWriter writer) {
       this.marshallers = new ConcurrentHashMap<Class, ProcessEventMarshaller>();
-      this.executor = new ProcessEventExecutor();
       this.latch = new CountDownLatch(1);
+      this.executor = executor;
       this.writer = writer;
    }
    
diff --git a/snap-agent/src/main/java/org/snapscript/agent/event/socket/SocketEventClient.java b/snap-agent/src/main/java/org/snapscript/agent/event/socket/SocketEventClient.java
@@ -7,35 +7,16 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.snapscript.agent.ConsoleLogger;
-import org.snapscript.agent.event.BeginEvent;
-import org.snapscript.agent.event.BreakpointsEvent;
-import org.snapscript.agent.event.BrowseEvent;
-import org.snapscript.agent.event.EvaluateEvent;
-import org.snapscript.agent.event.ExecuteEvent;
-import org.snapscript.agent.event.ExitEvent;
-import org.snapscript.agent.event.FaultEvent;
-import org.snapscript.agent.event.PingEvent;
-import org.snapscript.agent.event.PongEvent;
-import org.snapscript.agent.event.ProcessEvent;
-import org.snapscript.agent.event.ProcessEventChannel;
-import org.snapscript.agent.event.ProcessEventConnection;
-import org.snapscript.agent.event.ProcessEventConsumer;
-import org.snapscript.agent.event.ProcessEventListener;
-import org.snapscript.agent.event.ProcessEventProducer;
-import org.snapscript.agent.event.ProfileEvent;
-import org.snapscript.agent.event.RegisterEvent;
-import org.snapscript.agent.event.ScopeEvent;
-import org.snapscript.agent.event.StepEvent;
-import org.snapscript.agent.event.SyntaxErrorEvent;
-import org.snapscript.agent.event.WriteErrorEvent;
-import org.snapscript.agent.event.WriteOutputEvent;
+import org.snapscript.agent.event.*;
 
 public class SocketEventClient {
    
    private final ProcessEventListener listener;
+   private final ProcessEventExecutor executor;
    private final ConsoleLogger logger;
    
    public SocketEventClient(ProcessEventListener listener, ConsoleLogger logger) throws IOException {
+      this.executor = new ProcessEventExecutor();
       this.listener = listener;
       this.logger = logger;
    }
@@ -58,7 +39,7 @@ private class SocketConnection extends Thread implements ProcessEventChannel {
       private final Socket socket;
       
       public SocketConnection(Socket socket, InputStream input, OutputStream output) throws IOException {
-         this.connection = new ProcessEventConnection(input, output);
+         this.connection = new ProcessEventConnection(executor, input, output);
          this.open = new AtomicBoolean(true);
          this.socket = socket;
       }
diff --git a/snap-agent/src/main/java/org/snapscript/agent/event/socket/SocketEventServer.java b/snap-agent/src/main/java/org/snapscript/agent/event/socket/SocketEventServer.java
@@ -11,40 +11,21 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.snapscript.agent.ConsoleLogger;
-import org.snapscript.agent.event.BeginEvent;
-import org.snapscript.agent.event.BreakpointsEvent;
-import org.snapscript.agent.event.BrowseEvent;
-import org.snapscript.agent.event.EvaluateEvent;
-import org.snapscript.agent.event.ExecuteEvent;
-import org.snapscript.agent.event.ExitEvent;
-import org.snapscript.agent.event.FaultEvent;
-import org.snapscript.agent.event.PingEvent;
-import org.snapscript.agent.event.PongEvent;
-import org.snapscript.agent.event.ProcessEvent;
-import org.snapscript.agent.event.ProcessEventChannel;
-import org.snapscript.agent.event.ProcessEventConnection;
-import org.snapscript.agent.event.ProcessEventConsumer;
-import org.snapscript.agent.event.ProcessEventListener;
-import org.snapscript.agent.event.ProcessEventProducer;
-import org.snapscript.agent.event.ProfileEvent;
-import org.snapscript.agent.event.RegisterEvent;
-import org.snapscript.agent.event.ScopeEvent;
-import org.snapscript.agent.event.StepEvent;
-import org.snapscript.agent.event.SyntaxErrorEvent;
-import org.snapscript.agent.event.WriteErrorEvent;
-import org.snapscript.agent.event.WriteOutputEvent;
+import org.snapscript.agent.event.*;
 import org.snapscript.common.ThreadBuilder;
 
 public class SocketEventServer implements ProcessEventChannel {
 
    private final Map<String, ProcessEventChannel> receivers;
    private final ProcessEventListener listener;
+   private final ProcessEventExecutor executor;
    private final SocketAcceptor acceptor;
    private final ConsoleLogger logger;
    private final ThreadFactory factory;
    
    public SocketEventServer(ProcessEventListener listener, ConsoleLogger logger, int port) throws IOException {
       this.receivers = new ConcurrentHashMap<String, ProcessEventChannel>();
+      this.executor = new ProcessEventExecutor();
       this.acceptor = new SocketAcceptor(port);
       this.factory = new ThreadBuilder();
       this.listener = listener;
@@ -140,7 +121,7 @@ private class SocketConnection implements ProcessEventChannel, Runnable {
       private final Socket socket;
       
       public SocketConnection(Socket socket, InputStream input, OutputStream output) throws IOException {
-         this.connection = new ProcessEventConnection(input, output);
+         this.connection = new ProcessEventConnection(executor, input, output);
          this.open = new AtomicBoolean(true);
          this.active = new AtomicBoolean();
          this.socket = socket;
diff --git a/snap-develop/src/main/java/org/snapscript/develop/ProcessRunner.java b/snap-develop/src/main/java/org/snapscript/develop/ProcessRunner.java
@@ -3,6 +3,9 @@
 import java.net.URI;
 
 import org.snapscript.agent.ProcessAgent;
+import org.snapscript.agent.ProcessMode;
+
+import static org.snapscript.agent.ProcessMode.ATTACHED;
 
 public class ProcessRunner {
 
@@ -17,6 +20,6 @@ public static void main(String[] list) throws Exception {
    
    public static void start(URI resources, String process, String level, int port) throws Exception {
       ProcessAgent agent = new ProcessAgent(resources, process, level, port);
-      agent.start();
+      agent.start(ATTACHED);
    }
 }
diff --git a/snap-develop/work/android/snake/Game.snap b/snap-develop/work/android/snake/Game.snap
@@ -1,4 +1,3 @@
 // https://github.com/ferrolho/android-snake
 var panel = new GamePanel(context);
-agent.onStart(panel);
-sleep(Integer.MAX_VALUE);
+game.start(panel);
diff --git a/snap-develop/work/android/snake/ImageStore.snap b/snap-develop/work/android/snake/ImageStore.snap
@@ -6,6 +6,7 @@ module ImageStore {
 
    loadImage(resource) {
       var stream = this.getResource(resource);
+      println("Loaded ${resource}");
       return BitmapFactory.decodeStream(stream);
    }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,18 +8,20 @@ public class ProcessEventConnection {`
`8`	`8`
`9`	`9`	`private final MessageEnvelopReader consumer;`
`10`	`10`	`private final MessageEnvelopeWriter producer;`
	`11`	`+ private final ProcessEventExecutor executor;`
`11`	`12`
`12`		`- public ProcessEventConnection(InputStream input, OutputStream output) {`
	`13`	`+ public ProcessEventConnection(ProcessEventExecutor executor, InputStream input, OutputStream output) {`
`13`	`14`	`this.consumer = new MessageEnvelopReader(input);`
`14`	`15`	`this.producer = new MessageEnvelopeWriter(output);`
	`16`	`+ this.executor = executor;`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`public ProcessEventConsumer getConsumer() throws IOException {`
`18`	`20`	`return new ProcessEventConsumer(consumer);`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`public ProcessEventProducer getProducer() throws IOException {`
`22`		`- return new ProcessEventProducer(producer);`
	`24`	`+ return new ProcessEventProducer(executor, producer);`
`23`	`25`
`24`	`26`	`}`
`25`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@`
`3`	`3`	`import java.net.URI;`
`4`	`4`
`5`	`5`	`import org.snapscript.agent.ProcessAgent;`
	`6`	`+import org.snapscript.agent.ProcessMode;`
	`7`	`+`
	`8`	`+import static org.snapscript.agent.ProcessMode.ATTACHED;`
`6`	`9`
`7`	`10`	`public class ProcessRunner {`
`8`	`11`
`@@ -17,6 +20,6 @@ public static void main(String[] list) throws Exception {`
`17`	`20`
`18`	`21`	`public static void start(URI resources, String process, String level, int port) throws Exception {`
`19`	`22`	`ProcessAgent agent = new ProcessAgent(resources, process, level, port);`
`20`		`- agent.start();`
	`23`	`+ agent.start(ATTACHED);`
`21`	`24`	`}`
`22`	`25`	`}`