deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

avoid using additional threads for writing to message list

Browse source
This commit is contained in:
fros4943 2008-09-20 08:53:20 +00:00
parent ec159b92d5
commit 43fe1882f9
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: MspMoteType.java,v 1.9 2008/09/20 08:05:07 fros4943 Exp $ * $Id: MspMoteType.java,v 1.10 2008/09/20 08:53:20 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote; package se.sics.cooja.mspmote;
@ -444,7 +444,7 @@ public abstract class MspMoteType implements MoteType {
protected void compileFirmware(final File sourceFile, protected void compileFirmware(final File sourceFile,
final Action successAction, final Action failAction, final Action successAction, final Action failAction,
MessageList compilationOutput, boolean synchronous) throws Exception { final MessageList compilationOutput, boolean synchronous) throws Exception {
final File parentDirectory = sourceFile.getParentFile(); final File parentDirectory = sourceFile.getParentFile();
final String filenameNoExtension = sourceFile.getName().substring(0, final String filenameNoExtension = sourceFile.getName().substring(0,
sourceFile.getName().length() - 2); sourceFile.getName().length() - 2);
@ -466,14 +466,11 @@ public abstract class MspMoteType implements MoteType {
final BufferedReader processError = new BufferedReader( final BufferedReader processError = new BufferedReader(
new InputStreamReader(compileProcess.getErrorStream())); new InputStreamReader(compileProcess.getErrorStream()));
final PrintStream listNormal = compilationOutput.getInputStream(MessageList.NORMAL);
final PrintStream listError = compilationOutput.getInputStream(MessageList.ERROR);
final File ELFFile = new File(parentDirectory, filenameNoExtension + firmwareFileExtension); final File ELFFile = new File(parentDirectory, filenameNoExtension + firmwareFileExtension);
if (ELFFile.exists()) { if (ELFFile.exists()) {
ELFFile.delete(); ELFFile.delete();
if (ELFFile.exists()) { if (ELFFile.exists()) {
listError.println("Error when deleting old " + ELFFile.getName()); compilationOutput.addMessage("Error when deleting old " + ELFFile.getName(), MessageList.ERROR);
if (failAction != null) { if (failAction != null) {
failAction.actionPerformed(null); failAction.actionPerformed(null);
} }
@ -487,7 +484,7 @@ public abstract class MspMoteType implements MoteType {
try { try {
String readLine; String readLine;
while ((readLine = processNormal.readLine()) != null) { while ((readLine = processNormal.readLine()) != null) {
listNormal.println(readLine); compilationOutput.addMessage(readLine, MessageList.NORMAL);
} }
} catch (IOException e) { } catch (IOException e) {
logger.warn("Error while reading from process"); logger.warn("Error while reading from process");
@ -500,7 +497,7 @@ public abstract class MspMoteType implements MoteType {
try { try {
String readLine; String readLine;
while ((readLine = processError.readLine()) != null) { while ((readLine = processError.readLine()) != null) {
listError.println(readLine); compilationOutput.addMessage(readLine, MessageList.ERROR);
} }
} catch (IOException e) { } catch (IOException e) {
logger.warn("Error while reading from process"); logger.warn("Error while reading from process");
@ -508,8 +505,8 @@ public abstract class MspMoteType implements MoteType {
} }
}, "read input stream thread"); }, "read input stream thread");
final MoteTypeCreationException syncException = new MoteTypeCreationException( final MoteTypeCreationException syncException =
""); new MoteTypeCreationException("");
Thread handleCompilationResultThread = new Thread(new Runnable() { Thread handleCompilationResultThread = new Thread(new Runnable() {
public void run() { public void run() {
@ -517,7 +514,7 @@ public abstract class MspMoteType implements MoteType {
try { try {
compileProcess.waitFor(); compileProcess.waitFor();
} catch (Exception e) { } catch (Exception e) {
listError.println(e.getMessage()); compilationOutput.addMessage(e.getMessage(), MessageList.ERROR);
syncException.setCompilationOutput(new MessageList()); syncException.setCompilationOutput(new MessageList());
syncException.fillInStackTrace(); syncException.fillInStackTrace();
return; return;
@ -525,7 +522,7 @@ public abstract class MspMoteType implements MoteType {
/* Check return value */ /* Check return value */
if (compileProcess.exitValue() != 0) { if (compileProcess.exitValue() != 0) {
listError.println("Process returned error code " + compileProcess.exitValue()); compilationOutput.addMessage("Process returned error code " + compileProcess.exitValue(), MessageList.ERROR);
if (failAction != null) { if (failAction != null) {
failAction.actionPerformed(null); failAction.actionPerformed(null);
} }
@ -535,7 +532,7 @@ public abstract class MspMoteType implements MoteType {
} }
if (!ELFFile.exists()) { if (!ELFFile.exists()) {
listError.println("Can't locate output file " + ELFFile); compilationOutput.addMessage("Can't locate output file " + ELFFile, MessageList.ERROR);
if (failAction != null) { if (failAction != null) {
failAction.actionPerformed(null); failAction.actionPerformed(null);
} }
@ -544,8 +541,8 @@ public abstract class MspMoteType implements MoteType {
return; return;
} }
listNormal.println(""); compilationOutput.addMessage("", MessageList.NORMAL);
listNormal.println("Compilation succeded"); compilationOutput.addMessage("Compilation succeded", MessageList.NORMAL);
MspELFCompiler.this.lastCompileCommand = command; MspELFCompiler.this.lastCompileCommand = command;
MspELFCompiler.this.sourceFile = sourceFile; MspELFCompiler.this.sourceFile = sourceFile;
MspELFCompiler.this.ELFFile = ELFFile; MspELFCompiler.this.ELFFile = ELFFile;
@ -553,7 +550,7 @@ public abstract class MspMoteType implements MoteType {
successAction.actionPerformed(null); successAction.actionPerformed(null);
} }
} }
}, "enable create button thread"); }, "handle compilation results");
readInput.start(); readInput.start();
readError.start(); readError.start();