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

Moved blocking operations off the serial port's event thread.

Browse Source
This commit is contained in:
akwizgran
2012-11-23 22:41:12 +00:00
parent f40abf1a18
commit 66c155e41c
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -29,6 +30,7 @@ class ModemImpl implements Modem, SerialPortEventListener {
private static final int OK_TIMEOUT = 5 * 1000; // Milliseconds private static final int OK_TIMEOUT = 5 * 1000; // Milliseconds
private static final int CONNECT_TIMEOUT = 60 * 1000; // Milliseconds private static final int CONNECT_TIMEOUT = 60 * 1000; // Milliseconds
private final Executor executor;
private final Callback callback; private final Callback callback;
private final SerialPort port; private final SerialPort port;
private final AtomicBoolean initialised, offHook, connected; private final AtomicBoolean initialised, offHook, connected;
@@ -38,7 +40,8 @@ class ModemImpl implements Modem, SerialPortEventListener {
private int lineLen = 0; private int lineLen = 0;
ModemImpl(Callback callback, String portName) { ModemImpl(Executor executor, Callback callback, String portName) {
this.executor = executor;
this.callback = callback; this.callback = callback;
port = new SerialPort(portName); port = new SerialPort(portName);
initialised = new AtomicBoolean(false); initialised = new AtomicBoolean(false);
@@ -187,8 +190,16 @@ class ModemImpl implements Modem, SerialPortEventListener {
initialised.notifyAll(); initialised.notifyAll();
} }
} else if(s.equals("RING")) { } else if(s.equals("RING")) {
// FIXME: Don't do this on the event thread executor.execute(new Runnable() {
answer(); public void run() {
try {
answer();
} catch(IOException e) {
if(LOG.isLoggable(WARNING))
LOG.warning(e.toString());
}
}
});
} }
} else { } else {
lineLen++; lineLen++;