altosui: Clean up serial close handling
[fw/altos] / altosui / AltosSerial.java
index 8b60dd547e3f0f4bc3a3c4d267a5e86df84fbbff..491b6e81f3c9f64649537af1ee6cd53949310cfb 100644 (file)
 
 package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.util.concurrent.*;
 import java.util.*;
-import java.text.*;
 import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altosuilib_1.*;
 
 import libaltosJNI.*;
 
@@ -41,7 +36,7 @@ import libaltosJNI.*;
  * threads.
  */
 
-public class AltosSerial extends AltosLink implements Runnable {
+public class AltosSerial extends AltosLink  {
 
        static java.util.List<String> devices_opened = Collections.synchronizedList(new LinkedList<String>());
 
@@ -53,77 +48,28 @@ public class AltosSerial extends AltosLink implements Runnable {
        int line_count;
        Frame frame;
 
-       public void run () {
-               int c;
-               byte[] line_bytes = null;
-               int line_count = 0;
-
-               try {
-                       for (;;) {
-                               c = libaltos.altos_getchar(altos, 0);
-                               if (Thread.interrupted())
-                                       break;
-                               if (c == libaltosConstants.LIBALTOS_ERROR) {
-                                       add_telem (new AltosLine());
-                                       add_reply (new AltosLine());
-                                       break;
-                               }
-                               if (c == libaltosConstants.LIBALTOS_TIMEOUT)
-                                       continue;
-                               if (c == '\r')
-                                       continue;
-                               synchronized(this) {
-                                       if (c == '\n') {
-                                               if (line_count != 0) {
-                                                       add_bytes(line_bytes, line_count);
-                                                       line_count = 0;
-                                               }
-                                       } else {
-                                               if (line_bytes == null) {
-                                                       line_bytes = new byte[256];
-                                               } else if (line_count == line_bytes.length) {
-                                                       byte[] new_line_bytes = new byte[line_count * 2];
-                                                       System.arraycopy(line_bytes, 0, new_line_bytes, 0, line_count);
-                                                       line_bytes = new_line_bytes;
-                                               }
-                                               line_bytes[line_count] = (byte) c;
-                                               line_count++;
-                                       }
-                               }
-                       }
-               } catch (InterruptedException e) {
-               }
+       public int getchar() {
+               if (altos == null)
+                       return ERROR;
+               return libaltos.altos_getchar(altos, 0);
        }
 
        public void flush_output() {
                super.flush_output();
                if (altos != null) {
-                       libaltos.altos_flush(altos);
+                       if (libaltos.altos_flush(altos) != 0)
+                               close_serial();
                }
        }
 
-       boolean         abort;
        JDialog         timeout_dialog;
-       boolean timeout_started = false;
-
-       private void stop_timeout_dialog() {
-               if (timeout_started) {
-                       timeout_started = false;
-                       Runnable r = new Runnable() {
-                                       public void run() {
-                                               timeout_dialog.setVisible(false);
-                                       }
-                               };
-                       SwingUtilities.invokeLater(r);
-               }
-       }
 
        private void start_timeout_dialog_internal() {
 
                Object[] options = { "Cancel" };
 
                JOptionPane     pane = new JOptionPane();
-               pane.setMessage(String.format("Connecting to %s, %7.3f MHz", device.toShortString(), frequency));
+               pane.setMessage(String.format("Connecting to %s, %7.3f MHz as %s", device.toShortString(), frequency, callsign));
                pane.setOptions(options);
                pane.setInitialValue(null);
 
@@ -135,69 +81,53 @@ public class AltosSerial extends AltosLink implements Runnable {
                if (o == null)
                        return;
                if (options[0].equals(o))
-                       abort = true;
+                       reply_abort = true;
                timeout_dialog.dispose();
                timeout_dialog = null;
        }
 
-       private boolean check_timeout() {
-               if (!timeout_started && frame != null) {
-                       if (!SwingUtilities.isEventDispatchThread()) {
-                               timeout_started = true;
-                               Runnable r = new Runnable() {
-                                               public void run() {
-                                                       start_timeout_dialog_internal();
-                                               }
-                                       };
-                               SwingUtilities.invokeLater(r);
-                       }
-               }
-               return abort;
-       }
+       /*
+        * These are required by the AltosLink implementation
+        */
 
-       public void flush_input() throws InterruptedException {
-               if (remote)
-                       flush_input(500);
-               else
-                       flush_input(100);
+       public boolean can_cancel_reply() {
+               /*
+                * Can cancel any replies not called from the dispatch thread
+                */
+               return !SwingUtilities.isEventDispatchThread();
        }
 
-       int     in_reply;
-
-       public String get_reply(int timeout) throws InterruptedException {
-               boolean can_cancel = true;
-               String  reply = null;
-
-               try {
-                       ++in_reply;
+       public boolean show_reply_timeout() {
+               if (!SwingUtilities.isEventDispatchThread() && frame != null) {
+                       Runnable r = new Runnable() {
+                                       public void run() {
+                                               start_timeout_dialog_internal();
+                                       }
+                               };
+                       SwingUtilities.invokeLater(r);
+                       return true;
+               }
+               return false;
+       }
 
-                       if (SwingUtilities.isEventDispatchThread()) {
-                               can_cancel = false;
-                               if (remote)
-                                       System.out.printf("Uh-oh, reading remote serial device from swing thread\n");
-                       }
-                       flush_output();
-                       if (remote && can_cancel) {
-                               timeout = 500;
-                       }
-                       abort = false;
-                       timeout_started = false;
-                       for (;;) {
-                               AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
-                               if (line != null) {
-                                       stop_timeout_dialog();
-                                       reply = line.line;
-                                       break;
+       public void hide_reply_timeout() {
+               Runnable r = new Runnable() {
+                               public void run() {
+                                       timeout_dialog.setVisible(false);
                                }
-                               if (!remote || !can_cancel || check_timeout()) {
-                                       reply = null;
-                                       break;
-                               }
-                       }
-               } finally {
-                       --in_reply;
+                       };
+               SwingUtilities.invokeLater(r);
+       }
+
+       private void close_serial() {
+               synchronized (devices_opened) {
+                       devices_opened.remove(device.getPath());
+               }
+               if (altos != null) {
+                       libaltos.altos_free(altos);
+                       altos = null;
                }
-               return reply;
+               abort_reply();
        }
 
        public void close() {
@@ -210,9 +140,8 @@ public class AltosSerial extends AltosLink implements Runnable {
                if (in_reply != 0)
                        System.out.printf("Uh-oh. Closing active serial device\n");
 
-               if (altos != null) {
-                       libaltos.altos_close(altos);
-               }
+               close_serial();
+
                if (input_thread != null) {
                        try {
                                input_thread.interrupt();
@@ -221,20 +150,15 @@ public class AltosSerial extends AltosLink implements Runnable {
                        }
                        input_thread = null;
                }
-               if (altos != null) {
-                       libaltos.altos_free(altos);
-                       altos = null;
-               }
-               synchronized (devices_opened) {
-                       devices_opened.remove(device.getPath());
-               }
                if (debug)
                        System.out.printf("Closing %s\n", device.getPath());
        }
 
        private void putc(char c) {
                if (altos != null)
-                       libaltos.altos_putchar(altos, c);
+                       if (libaltos.altos_putchar(altos, c) != 0) {
+                               close_serial();
+                       }
        }
 
        public void print(String data) {