arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-19 09:42:11 +03:00
Code Activity

Fixing (I hope) race condition in Sizer.java that was preventing the file size from being determined.

Browse Source
This commit is contained in:
David A. Mellis
2009-05-12 13:37:51 +00:00
parent a2b3da7698
commit b11e25ecf2
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Sizer.java
View File

@ -57,17 +57,24 @@ public class Sizer implements MessageConsumer {
commandSize[1] = buildPath + File.separator + sketchName + ".hex";
int r = 0;
try {
exception = null;
size = -1;
firstLine = null;
Process process = Runtime.getRuntime().exec(commandSize);
new MessageSiphon(process.getInputStream(), this);
new MessageSiphon(process.getErrorStream(), this);
MessageSiphon in = new MessageSiphon(process.getInputStream(), this);
MessageSiphon err = new MessageSiphon(process.getErrorStream(), this);
boolean running = true;
while(running) {
try {
process.waitFor();
if (in.thread != null)
in.thread.join();
if (err.thread != null)
err.thread.join();
r = process.waitFor();
running = false;
} catch (InterruptedException intExc) { }
}
@ -76,7 +83,7 @@ public class Sizer implements MessageConsumer {
// some sub-class has overridden it to do so, thus we need to check for
// it. See: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1166589459
exception = new RunnerException(
(e.toString() == null) ? e.getClass().getName() : e.toString());
(e.toString() == null) ? e.getClass().getName() + r : e.toString() + r);
}
if (exception != null)