skip multiple analyze commands within a short time span

Author: gerhard.kalab

src/org/scid/android/engine/PipedProcess.java

@@ -17,6 +17,7 @@ public class PipedProcess {
 	private BufferedReader reader = null;
 	private BufferedWriter writer = null;
 	private Process process;
+	private String nextAnalyzeCommand;
 
 	/** Start process. */
 	public final void initialize(EngineConfig engineConfig) {
@@ -31,6 +32,27 @@ public EngineConfig getEngineConfig() {
 		return engineConfig;
 	}
 
+	private void writeAnalyzeCommands(String cmd) {
+		writeLineToProcess("stop");
+		writeLineToProcess("isready");
+		writeLineToProcess(cmd);
+		writeLineToProcess("go infinite");
+	}
+
+	public synchronized void analyzeNext() {
+		if (this.nextAnalyzeCommand != null) {
+			writeAnalyzeCommands(nextAnalyzeCommand);
+			this.nextAnalyzeCommand = null;
+		}
+	}
+
+	/**
+	 * TODO: use a delayed queue instead (e.g. DelayQueue) or FutureTask?
+	 */
+	public synchronized void setNextAnalyzeCommand(String nextAnalyzeCommand) {
+		this.nextAnalyzeCommand = nextAnalyzeCommand;
+	}
+
 	public boolean isAlive() {
 		return processAlive && !isTerminated();
 	}
@@ -83,9 +105,9 @@ public final synchronized String readLineFromProcess() {
 		} catch (IOException e) {
 			Log.e(TAG, "Error reading from process");
 		}
-//		if (ret != null && ret.length() > 0) {
-//			Log.d("SCID", "Engine -> GUI: " + ret);
-//		}
+		// if (ret != null && ret.length() > 0) {
+		// Log.d("SCID", "Engine -> GUI: " + ret);
+		// }
 		return ret;
 	}
 
@@ -95,7 +117,7 @@ public final synchronized String readLineFromProcess() {
 	 * @throws IOException
 	 */
 	public final synchronized void writeLineToProcess(String data) {
-//		Log.d("SCID", "GUI -> Engine: " + data);
+		// Log.d("SCID", "GUI -> Engine: " + data);
 		try {
 			writeToProcess(data + "\n");
 		} catch (IOException e) {
@@ -106,7 +128,8 @@ public final synchronized void writeLineToProcess(String data) {
 
 	/** Start the child process. */
 	private final void startProcess(EngineConfig engineConfig) {
-		ProcessBuilder builder = new ProcessBuilder(engineConfig.getExecutablePath());
+		ProcessBuilder builder = new ProcessBuilder(
+				engineConfig.getExecutablePath());
 		builder.redirectErrorStream(true);
 		try {
 			Log.d(TAG, "starting process");

src/org/scid/android/engine/UciReadTask.java

@@ -56,17 +56,17 @@ protected Void doInBackground(Void... params) {
 			} catch (InterruptedException e) {
 				// ignore
 			}
-			if (line == null || line.length() == 0 || listener == null) {
-				continue;
-			}
-			String[] tokens = tokenize(line);
-			if (tokens[0].equals("info")) {
-				parseInfoCmd(tokens);
+			if (line != null && line.length() > 0 && listener != null) {
+				String[] tokens = tokenize(line);
+				if (tokens[0].equals("info")) {
+					parseInfoCmd(tokens);
+				}
 			}
 			if (!this.isCancelled()
-					&& System.currentTimeMillis() > (lastPublishedTime + 300)) {
+					&& System.currentTimeMillis() > (lastPublishedTime + 500)) {
 				publishProgress();
 				lastPublishedTime = System.currentTimeMillis();
+				engineProcess.analyzeNext();
 			}
 		}
 		engineProcess.writeLineToProcess("quit");
@@ -188,11 +188,8 @@ private final String[] tokenize(String cmdLine) {
 		return cmdLine.trim().split("\\s+");
 	}
 
-	public void setCurrentPosition(Position currentPosition) {
-		this.currentPosition = currentPosition;
-	}
-
-	public void setCurrentGame(Game game) {
+	public void setCurrentPosition(Game game, Position currentPosition) {
 		this.game = game;
+		this.currentPosition = currentPosition;
 	}
 }

src/org/scid/android/gamelogic/ChessController.java

@@ -324,12 +324,8 @@ private final synchronized void startAnalysis() {
 						}
 					}
 					PipedProcess process = computerPlayer.getEngine();
-					process.writeLineToProcess("stop");
-					process.writeLineToProcess("isready");
-					process.writeLineToProcess(posStr.toString());
-					process.writeLineToProcess("go infinite");
-					readTask.setCurrentPosition(currentPosition);
-					readTask.setCurrentGame(game);
+					process.setNextAnalyzeCommand(posStr.toString());
+					readTask.setCurrentPosition(game, currentPosition);
 				}
 				updateGUI();
 			}