### Eclipse Workspace Patch 1.0
#P sophie
Index: dev-tools/author.FakeAuthorMain.launch
===================================================================
--- dev-tools/author.FakeAuthorMain.launch (revision 8567)
+++ dev-tools/author.FakeAuthorMain.launch (working copy)
@@ -1,21 +1,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: dev-tools/author.TrueAuthorMain.launch
===================================================================
--- dev-tools/author.TrueAuthorMain.launch (revision 8567)
+++ dev-tools/author.TrueAuthorMain.launch (working copy)
@@ -1,19 +1,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: modules/org.sophie2.base.natlib/src/main/java/org/sophie2/base/natlib/NativeBridge.java
===================================================================
--- modules/org.sophie2.base.natlib/src/main/java/org/sophie2/base/natlib/NativeBridge.java (revision 8567)
+++ modules/org.sophie2.base.natlib/src/main/java/org/sophie2/base/natlib/NativeBridge.java (working copy)
@@ -28,8 +28,10 @@
public abstract class NativeBridge {
private Process nativeProcess = null;
- private BufferedReader nativeStderr = null;
private boolean started = false;
+ private ErrorDumper dumper = null;
+
+
/**
* The default constructor
@@ -50,8 +52,8 @@
try {
SophieLog.debug(getExecutableString());
this.nativeProcess = Runtime.getRuntime().exec(new String[] { getExecutableString() });
- this.nativeStderr = new BufferedReader(new InputStreamReader(this.nativeProcess
- .getErrorStream()));
+ this.dumper = new ErrorDumper(this.nativeProcess.getErrorStream());
+ this.dumper.start();
// SophieLog.trace("sending start-command...");
try {
int exit = this.nativeProcess.exitValue();
@@ -71,7 +73,7 @@
this.nativeProcess.destroy();
}
this.nativeProcess = null;
- this.nativeStderr = null;
+ this.dumper = null;
}
}
SophieLog.debug("NativeBridge started = " + this.started);
@@ -83,7 +85,6 @@
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
- dumpError();
}
@@ -96,14 +97,13 @@
try {
sendCommand(CommonMessages.createStop(), Response.class);
- dumpError();
} catch (RuntimeException e) {
SophieLog.info("Problem while stopping native process : ", e);
}
this.started = false;
this.nativeProcess.destroy();
this.nativeProcess = null;
- this.nativeStderr = null;
+ this.dumper = null;
}
@@ -252,41 +252,6 @@
}
/**
- * Dumps to the log any pending output from the native process stderr.
- *
- * NOTE the native stderr should be flushed line by line.
- * Unless a whole line is available, this method may block forever.
- */
- public final void dumpError() {
- // SophieLog.trace("dump");
- try {
- while (this.nativeStderr.ready()) {
- // SophieLog.trace("ready");
- SophieLog.info("[native-err] " + this.nativeStderr.readLine());
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- // SophieLog.trace("end-dump");
- }
-
- /**
- * Dumps error after a short delay.
- *
- * Useful if an exception has occurred, and you may ensure that you have an
- * native output. Do not call this method if no exception has occured,
- * because it is slow!
- */
- public final void dumpErrorDelayed() {
- try {
- Thread.sleep(50);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- dumpError();
- }
-
- /**
* Sends a {@link Command} to the native process. Every command has a
* {@link Response} that is expected to be returned
*
@@ -302,7 +267,6 @@
assert isRunning();
writeCommand(command);
// SophieLog.trace("Sent " + command);
- dumpError();
return readResponse(expectedClass);
}
@@ -329,9 +293,7 @@
command.getData().writeTo(getNativeStdin());
getNativeStdin().flush();
// SophieLog.trace("data sent");
- dumpError();
} catch (IOException e) {
- dumpErrorDelayed();
throw new RuntimeException(e);
}
}
@@ -350,7 +312,6 @@
assert isRunning();
try {
BinData data = Message.readData(getNativeStdout());
- dumpError();
Response res = createResponse(data);
if (!expectedClass.isInstance(res)) {
throw new RuntimeException("Expected " + expectedClass.getSimpleName()
@@ -358,7 +319,6 @@
}
return expectedClass.cast(res);
} catch (IOException e) {
- dumpErrorDelayed();
throw new RuntimeException(e);
}
}
@@ -371,4 +331,30 @@
public boolean hasStarted() {
return this.started;
}
+
+ private static class ErrorDumper extends Thread {
+ private final BufferedReader nativeStderr;
+
+ public ErrorDumper(InputStream errorStream) {
+ setDaemon(true);
+ this.nativeStderr = new BufferedReader(new InputStreamReader(errorStream));
+ }
+
+ @Override
+ public void run() {
+ //The read until exception pattern
+ try {
+ String line = null;
+ do {
+ line = this.nativeStderr.readLine();
+ SophieLog.info("[native-err] " + line);
+ }
+ while(line != null);
+ } catch (IOException e) {
+ SophieLog.error("ErrorDumper terminated", e);
+ }
+ SophieLog.info("ErrorDumper exiting");
+ }
+
+ }
}
Index: modules/org.sophie2.main.media.natlib/src/main/java/org/sophie2/main/media/natlib/input/NativeInputBridge.java
===================================================================
--- modules/org.sophie2.main.media.natlib/src/main/java/org/sophie2/main/media/natlib/input/NativeInputBridge.java (revision 8567)
+++ modules/org.sophie2.main.media.natlib/src/main/java/org/sophie2/main/media/natlib/input/NativeInputBridge.java (working copy)
@@ -82,7 +82,6 @@
@Override
protected Response createResponse(int messageId, BinReader reader) {
- dumpError();
if (messageId == STOP_RECORDING_ID) {
SophieLog.debugf("Recieved StopRecordingResponse: \n\t%d:%s\n", reader.getData().getSize() ,reader.getData().toString());
return new StopRecordingResponse(reader);