diff --git a/briar-core/src/net/sf/briar/plugins/modem/ModemImpl.java b/briar-core/src/net/sf/briar/plugins/modem/ModemImpl.java index bde47d9eafae19c4c3cbae270f8b92d43a661f3d..f389b7dfa29b9db17a1dac789ed1991117d52224 100644 --- a/briar-core/src/net/sf/briar/plugins/modem/ModemImpl.java +++ b/briar-core/src/net/sf/briar/plugins/modem/ModemImpl.java @@ -33,7 +33,7 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener { private final Callback callback; private final SerialPort port; private final AtomicBoolean initialised, connected; - private final Semaphore offHook, writing; + private final Semaphore offHook; private final byte[] line; private int lineLen = 0; @@ -46,7 +46,6 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener { port = new SerialPort(portName); initialised = new AtomicBoolean(false); offHook = new Semaphore(1); - writing = new Semaphore(1); connected = new AtomicBoolean(false); line = new byte[MAX_LINE_LENGTH]; reliabilityLayer = new ReliabilityLayer(this); @@ -152,28 +151,14 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener { } public void handleWrite(byte[] b) throws IOException { - try { - writing.acquire(); - } catch(InterruptedException e) { - tryToClose(port); - Thread.currentThread().interrupt(); - throw new IOException("Interrupted while waiting to write"); - } try { port.writeBytes(b); } catch(SerialPortException e) { tryToClose(port); throw new IOException(e.toString()); - } finally { - writing.release(); } } - public void waitForWritesToComplete() throws InterruptedException { - writing.acquire(); - writing.release(); - } - public void serialEvent(SerialPortEvent ev) { try { if(ev.isRXCHAR()) { diff --git a/briar-core/src/net/sf/briar/plugins/modem/ReliabilityLayer.java b/briar-core/src/net/sf/briar/plugins/modem/ReliabilityLayer.java index 197709ec9def6f76f66f72e524f892cc11fade20..e61748ab90bae6c38795cb4c41b48e87164f2095 100644 --- a/briar-core/src/net/sf/briar/plugins/modem/ReliabilityLayer.java +++ b/briar-core/src/net/sf/briar/plugins/modem/ReliabilityLayer.java @@ -27,6 +27,7 @@ class ReliabilityLayer implements ReadHandler, WriteHandler { ReliabilityLayer(WriteHandler writeHandler) { this.writeHandler = writeHandler; + // FIXME: Don't let references to this escape the constructor SlipEncoder encoder = new SlipEncoder(this); Sender sender = new Sender(encoder); receiver = new Receiver(sender); @@ -90,9 +91,4 @@ class ReliabilityLayer implements ReadHandler, WriteHandler { if(LOG.isLoggable(INFO)) LOG.info("Queueing " + b.length + " bytes"); if(b.length > 0) writes.add(b); } - - public void waitForWritesToComplete() throws InterruptedException { - if(writer != null) writer.join(); - writeHandler.waitForWritesToComplete(); - } } diff --git a/briar-core/src/net/sf/briar/plugins/modem/Sender.java b/briar-core/src/net/sf/briar/plugins/modem/Sender.java index 3217482ad6ecf8f92d6fd675e0ff3b7e6fbfccd3..9c8ef82af4d442ce5be46e03fccc5ce7ef200bf1 100644 --- a/briar-core/src/net/sf/briar/plugins/modem/Sender.java +++ b/briar-core/src/net/sf/briar/plugins/modem/Sender.java @@ -204,10 +204,6 @@ class Sender { writeHandler.handleWrite(d.getBuffer()); } - void waitForWritesToComplete() throws InterruptedException { - writeHandler.waitForWritesToComplete(); - } - private static class Outstanding { private final Data data; diff --git a/briar-core/src/net/sf/briar/plugins/modem/SenderOutputStream.java b/briar-core/src/net/sf/briar/plugins/modem/SenderOutputStream.java index 531fa0417c3b6880f1163c58db89263f61d3ecb0..e2da6bd1acd60357180849eeb82c3d7045099684 100644 --- a/briar-core/src/net/sf/briar/plugins/modem/SenderOutputStream.java +++ b/briar-core/src/net/sf/briar/plugins/modem/SenderOutputStream.java @@ -23,12 +23,7 @@ class SenderOutputStream extends OutputStream { @Override public void flush() throws IOException { if(offset > Data.HEADER_LENGTH) send(false); - try { - sender.waitForWritesToComplete(); - } catch(InterruptedException e) { - Thread.currentThread().interrupt(); - throw new IOException("Interrupted while flushing output stream"); - } + // FIXME: Wait for asynchronous writes to complete } @Override diff --git a/briar-core/src/net/sf/briar/plugins/modem/SlipEncoder.java b/briar-core/src/net/sf/briar/plugins/modem/SlipEncoder.java index e106d66dec70a9b98b0ce5ec83cf9941396e263e..0fc327a43f07687b01216eb3f0342c0368ab93e8 100644 --- a/briar-core/src/net/sf/briar/plugins/modem/SlipEncoder.java +++ b/briar-core/src/net/sf/briar/plugins/modem/SlipEncoder.java @@ -35,8 +35,4 @@ class SlipEncoder implements WriteHandler { encoded[encodedLength - 1] = END; writeHandler.handleWrite(encoded); } - - public void waitForWritesToComplete() throws InterruptedException { - writeHandler.waitForWritesToComplete(); - } } diff --git a/briar-core/src/net/sf/briar/plugins/modem/WriteHandler.java b/briar-core/src/net/sf/briar/plugins/modem/WriteHandler.java index f4780ffac17e54f79eafa6bfe8bde7133d13149a..fdf4d2c153cecd7ea792de01c52d2a2f66b83849 100644 --- a/briar-core/src/net/sf/briar/plugins/modem/WriteHandler.java +++ b/briar-core/src/net/sf/briar/plugins/modem/WriteHandler.java @@ -5,6 +5,4 @@ import java.io.IOException; interface WriteHandler { void handleWrite(byte[] b) throws IOException; - - void waitForWritesToComplete() throws InterruptedException; }