getting sketch process to run concurrently with main process

Author: kazimuth

release/PythonMode.zip

@@ -4,7 +4,7 @@
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
+import java.io.PrintWriter;
 
 import processing.app.exec.StreamRedirectThread;
 import processing.core.PApplet;
@@ -15,14 +15,15 @@
  * Handles sending messages to and recieving messages from
  *
  */
+
 public class Communicator {
 	private PythonEditor editor;
 	private Process sketchProcess;
 
 	private StreamRedirectThread outThread;
 	private MessageReceiverThread errThread;
 
-	private OutputStream toSketch;
+	private PrintWriter toSketch;
 
 	public Communicator (Process sketchProcess, PythonEditor editor){
 		this.sketchProcess = sketchProcess;
@@ -31,7 +32,7 @@ public Communicator (Process sketchProcess, PythonEditor editor){
 		outThread = new StreamRedirectThread("JVM Stdout Reader", sketchProcess.getInputStream(), System.out);
 		errThread = new MessageReceiverThread(sketchProcess.getErrorStream(), editor);
 
-		toSketch = sketchProcess.getOutputStream();
+		toSketch = new PrintWriter(sketchProcess.getOutputStream());
 
 		outThread.start();
 		errThread.start();
@@ -41,8 +42,34 @@ public void close(){
 		errThread.running = false;
 		errThread = null;
 		outThread = null;
+		toSketch.close();
+		toSketch = null;
+	}
+	
+	
+	// communication methods
+	
+	/*
+	 * Tell sketch to close
+	 */
+	public void sendClose(){
+		toSketch.println("__STOP__"); //hard-coded, what the hell
+		toSketch.flush();
 	}
 
+	/*
+	 * Send a new sketch
+	 */
+	public void sendSketch(String[] args){
+		StringBuilder out = new StringBuilder("__SKETCH__");
+		for(String a : args){
+			out.append(" "+a);
+		}
+		
+		
+		toSketch.println(out.toString());
+		
+	}
 
 	//private class to handle doing things when the sketch process sends us a message via system.err
 	private class MessageReceiverThread extends Thread{

src/info/sansgills/mode/python/Communicator.java

@@ -2,12 +2,10 @@
 
 import java.awt.Point;
 import java.io.File;
-import java.io.InputStream;
 import java.util.ArrayList;
 
 import processing.app.Base;
 import processing.app.Preferences;
-import processing.app.exec.StreamRedirectThread;
 import processing.core.PApplet;
 
 /**
@@ -45,6 +43,7 @@ public void launch(boolean present) {
 	 * Construct the command-line command to start the sketch with
 	 * 
 	 * TODO add proper machine detection & whatnot from Java Mode
+	 * 
 	 */
 	private String[] buildArgs(boolean present){
 		ArrayList<String> args = new ArrayList<String>();
@@ -63,15 +62,7 @@ private String[] buildArgs(boolean present){
 		appendSketchArgs(args, present);
 
 		String[] out = args.toArray(new String[0]);
-		
-		/*{//debugging
-			String cmd = "";
-			for (String c : out) {
-				cmd += c + " ";
-			}
-			System.out.println("command: " + cmd);
-		}*/
-		
+				
 		return out;
 	}
 
@@ -152,7 +143,9 @@ private void appendSketchArgs(ArrayList<String> args, boolean present){
 			args.add(PApplet.ARGS_STOP_COLOR + "=" + Preferences.get("run.present.stop.color"));
 			args.add(PApplet.ARGS_BGCOLOR + "=" + Preferences.get("run.present.bgcolor"));
 		}
-
+		
+		
+		args.add(PApplet.ARGS_EXTERNAL);
 		args.add(build.getClassName()); // sketch name
 	}
 
@@ -178,10 +171,6 @@ public void run(){
 	 * Kill the code.
 	 */
 	public void close() {
-		communicator.close();
-		if(sketchProcess != null){
-			sketchProcess.destroy();
-			sketchProcess = null;
-		}
+		communicator.sendClose();
 	}
 }

src/info/sansgills/mode/python/PythonRunner.java

@@ -1,12 +1,20 @@
 package info.sansgills.mode.python.wrapper;
 
+import info.sansgills.mode.python.PythonEditor;
+
 import java.awt.GraphicsDevice;
+import java.awt.Point;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.Arrays;
 import java.util.Scanner;
 
 import org.python.core.*;
 import org.python.util.InteractiveConsole;
 
+import processing.core.PApplet;
+
 /**
  * 
  * Class to handle running jython sketches. Packaged separately from the main mode for easy export.
@@ -39,22 +47,38 @@ public class ProcessingJythonWrapper {
 			"mouseReleased", "mouseClicked", "mouseWheel", "mouseMoved",
 			"mouseDragged", "keyPressed", "keyReleased", "keyTyped" };
 
+	static MessageReceiverThread receiver;
+	
 	static InteractiveConsole interp;		// python interpreter to feed things to
 	static PySystemState sys;				// for modifying python classpath, as yet
 	static PythonPApplet constructedApplet;	// Applet we pull from the interpreter
 
 	static final String objname = "__applet__";
 
+	static boolean parallel;
+	
 	/**
 	 * 
-	 * First argument is the path to the script; the rest are things to pass to PApplet.
+	 * First argument is the path to the script; the rest are things to pass to
+	 * PApplet.
 	 * 
 	 */
 	public static void main(String[] args) {
-		String scriptPath = args[0];
-		String[] params = Arrays.copyOfRange(args, 1, args.length);
-		prepare();
-		run(scriptPath, params);
+		if (args[0].indexOf("__PARALLEL__") != -1) {
+			parallel = true;
+			receiver = new MessageReceiverThread(System.in);
+			receiver.start();
+			// running from PDE
+		} else {
+			parallel = false;
+			String scriptPath = args[0];
+			String[] params = Arrays.copyOfRange(args, 1, args.length);
+			receiver = new MessageReceiverThread(System.in);
+			receiver.start();
+
+			prepare();
+			run(scriptPath, params);
+		}
 	}
 
 	public static void prepare() {
@@ -68,7 +92,21 @@ public static void prepare() {
 		PySystemState.add_package("processing.opengl");
 	}
 
-	
+	/*
+	 * Called by PythonPApplet when it's exiting
+	 * Get rid of all references to our applet
+	 * 
+	 * ...this tangle of callbacks probably makes me a bad person
+	 */
+	static void sketchExiting(){
+		if (parallel) {
+			scrub();
+			constructedApplet = null;
+			sys = null;
+		} else {
+			System.exit(0);
+		}
+	}
 
 	/*
 	 * Run.
@@ -95,27 +133,57 @@ public static void run(String scriptPath, String[] params){
 			for (String name : sketchFunctions){
 				PyFunction function = (PyFunction) interp.get(name);
 				if(function != null){
-					System.out.println("found "+name);
 					constructedApplet.inject(name, function);
 				}
 			}
 
 			//run the sketch!
-			PythonPApplet.runSketch(params, constructedApplet);
+			PythonPApplet.runSketchOpen(params, constructedApplet);
 
 		} catch (Exception e){
 			System.err.println("Error running sketch: " + e.getMessage()); //TODO
 			e.printStackTrace();
-			System.exit(1);
+			if(constructedApplet != null){
+				constructedApplet.exit();
+			}
 		}
 	}
 
 	public static void scrub(){
 		interp.exec(scrub);
 	}
 
-	public static void runSketch(String[] params, PythonPApplet constructedApplet){
-		GraphicsDevice displayDevice;
+	
+	
+	/*
+	 * Class to handle receiving messages from the PDE
+	 * not to be confused with Communicator.MessageReceiverThread; same idea, different location
+	 */
+	private static class MessageReceiverThread extends Thread{
+		BufferedReader messageReader;
+		public boolean running;
 
+		public MessageReceiverThread(InputStream messageStream){
+			this.messageReader = new BufferedReader(new InputStreamReader(messageStream));
+			this.running = true;
+		}
+		
+		public void run() {
+			try {
+				String currentLine;
+
+				// continually read messages
+				while ((currentLine = messageReader.readLine()) != null && running) {
+					try {
+						if (currentLine.indexOf("__STOP__") != -1) {
+							// PDE is telling us to kill the applet
+							if (constructedApplet != null) {
+								constructedApplet.exit();
+							}
+						}
+					} catch (Exception e) {}
+				}
+			} catch (Exception e) {}
+		}
 	}
 }