Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-23 16:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Removed broken code for flushing the output stream.

Browse Source
This commit is contained in:
akwizgran
2012-12-06 16:56:08 +00:00
parent 0b7ecde4c8
commit 5516503f67
6 changed files with 3 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
briar-core/src/net/sf/briar/plugins/modem/ModemImpl.java
View File

@@ -33,7 +33,7 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
private final Callback callback; private final Callback callback;
private final SerialPort port; private final SerialPort port;
private final AtomicBoolean initialised, connected; private final AtomicBoolean initialised, connected;
private final Semaphore offHook, writing; private final Semaphore offHook;
private final byte[] line; private final byte[] line;
private int lineLen = 0; private int lineLen = 0;
@@ -46,7 +46,6 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
port = new SerialPort(portName); port = new SerialPort(portName);
initialised = new AtomicBoolean(false); initialised = new AtomicBoolean(false);
offHook = new Semaphore(1); offHook = new Semaphore(1);
writing = new Semaphore(1);
connected = new AtomicBoolean(false); connected = new AtomicBoolean(false);
line = new byte[MAX_LINE_LENGTH]; line = new byte[MAX_LINE_LENGTH];
reliabilityLayer = new ReliabilityLayer(this); reliabilityLayer = new ReliabilityLayer(this);
@@ -152,28 +151,14 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
} }
public void handleWrite(byte[] b) throws IOException { 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 { try {
port.writeBytes(b); port.writeBytes(b);
} catch(SerialPortException e) { } catch(SerialPortException e) {
tryToClose(port); tryToClose(port);
throw new IOException(e.toString()); throw new IOException(e.toString());
} finally {
writing.release();
} }
} }
public void waitForWritesToComplete() throws InterruptedException {
writing.acquire();
writing.release();
}
public void serialEvent(SerialPortEvent ev) { public void serialEvent(SerialPortEvent ev) {
try { try {
if(ev.isRXCHAR()) { if(ev.isRXCHAR()) {

6
briar-core/src/net/sf/briar/plugins/modem/ReliabilityLayer.java
View File

@@ -27,6 +27,7 @@ class ReliabilityLayer implements ReadHandler, WriteHandler {
ReliabilityLayer(WriteHandler writeHandler) { ReliabilityLayer(WriteHandler writeHandler) {
this.writeHandler = writeHandler; this.writeHandler = writeHandler;
// FIXME: Don't let references to this escape the constructor
SlipEncoder encoder = new SlipEncoder(this); SlipEncoder encoder = new SlipEncoder(this);
Sender sender = new Sender(encoder); Sender sender = new Sender(encoder);
receiver = new Receiver(sender); receiver = new Receiver(sender);
@@ -90,9 +91,4 @@ class ReliabilityLayer implements ReadHandler, WriteHandler {
if(LOG.isLoggable(INFO)) LOG.info("Queueing " + b.length + " bytes"); if(LOG.isLoggable(INFO)) LOG.info("Queueing " + b.length + " bytes");
if(b.length > 0) writes.add(b); if(b.length > 0) writes.add(b);
} }
public void waitForWritesToComplete() throws InterruptedException {
if(writer != null) writer.join();
writeHandler.waitForWritesToComplete();
}
} }

4
briar-core/src/net/sf/briar/plugins/modem/Sender.java
View File

@@ -204,10 +204,6 @@ class Sender {
writeHandler.handleWrite(d.getBuffer()); writeHandler.handleWrite(d.getBuffer());
} }
void waitForWritesToComplete() throws InterruptedException {
writeHandler.waitForWritesToComplete();
}
private static class Outstanding { private static class Outstanding {
private final Data data; private final Data data;

7
briar-core/src/net/sf/briar/plugins/modem/SenderOutputStream.java
View File

@@ -23,12 +23,7 @@ class SenderOutputStream extends OutputStream {
@Override @Override
public void flush() throws IOException { public void flush() throws IOException {
if(offset > Data.HEADER_LENGTH) send(false); if(offset > Data.HEADER_LENGTH) send(false);
try { // FIXME: Wait for asynchronous writes to complete
sender.waitForWritesToComplete();
} catch(InterruptedException e) {
Thread.currentThread().interrupt();
throw new IOException("Interrupted while flushing output stream");
}
} }
@Override @Override

4
briar-core/src/net/sf/briar/plugins/modem/SlipEncoder.java
View File

@@ -35,8 +35,4 @@ class SlipEncoder implements WriteHandler {
encoded[encodedLength - 1] = END; encoded[encodedLength - 1] = END;
writeHandler.handleWrite(encoded); writeHandler.handleWrite(encoded);
} }
public void waitForWritesToComplete() throws InterruptedException {
writeHandler.waitForWritesToComplete();
}
} }

2
briar-core/src/net/sf/briar/plugins/modem/WriteHandler.java
View File

@@ -5,6 +5,4 @@ import java.io.IOException;
interface WriteHandler { interface WriteHandler {
void handleWrite(byte[] b) throws IOException; void handleWrite(byte[] b) throws IOException;
void waitForWritesToComplete() throws InterruptedException;
} }