Factor out output buffering for KISS sockets

diff --git a/m17app/src/lib.rs b/m17app/src/lib.rs
index 1881df33b94a19542938e7bbe813818d547f0cf2..8a98e79107728f7b10df18f4eff650b31ff03d81 100644 (file)
--- a/m17app/src/lib.rs
+++ b/m17app/src/lib.rs
@@ -9,6 +9,7 @@ pub mod serial;
 pub mod soundcard;
 pub mod soundmodem;
 pub mod tnc;
 pub mod soundcard;
 pub mod soundmodem;
 pub mod tnc;

+pub mod util;

 
 #[cfg(test)]
 mod test_util;
 
 #[cfg(test)]
 mod test_util;

diff --git a/m17app/src/soundmodem.rs b/m17app/src/soundmodem.rs
index 59b56c9c75d70583d042db91b469786e139f22a3..c0cbfbb3121480b2fa0ebf3264f2c0df757e2572 100644 (file)
--- a/m17app/src/soundmodem.rs
+++ b/m17app/src/soundmodem.rs
@@ -1,12 +1,13 @@
 use crate::error::{M17Error, SoundmodemError};
 use crate::tnc::{Tnc, TncError};
 use crate::error::{M17Error, SoundmodemError};
 use crate::tnc::{Tnc, TncError};

+use crate::util::out_buffer::OutBuffer;

 use m17core::kiss::MAX_FRAME_LEN;
 use m17core::modem::{Demodulator, Modulator, ModulatorAction, SoftDemodulator, SoftModulator};
 use m17core::tnc::SoftTnc;
 use std::collections::VecDeque;
 use std::fmt::Display;
 use std::fs::File;
 use m17core::kiss::MAX_FRAME_LEN;
 use m17core::modem::{Demodulator, Modulator, ModulatorAction, SoftDemodulator, SoftModulator};
 use m17core::tnc::SoftTnc;
 use std::collections::VecDeque;
 use std::fmt::Display;
 use std::fs::File;

-use std::io::{self, ErrorKind, Read, Write};
+use std::io::{self, Read, Write};

 use std::path::PathBuf;
 use std::sync::mpsc::{channel, sync_channel, Receiver, Sender, SyncSender, TryRecvError};
 use std::sync::RwLock;
 use std::path::PathBuf;
 use std::sync::mpsc::{channel, sync_channel, Receiver, Sender, SyncSender, TryRecvError};
 use std::sync::RwLock;


@@ -16,8 +17,7 @@ use thiserror::Error;
 
 pub struct Soundmodem {
     event_tx: SyncSender<SoundmodemEvent>,
 
 pub struct Soundmodem {
     event_tx: SyncSender<SoundmodemEvent>,

-    kiss_out_rx: Arc<Mutex<Receiver<Arc<[u8]>>>>,
-    partial_kiss_out: Arc<Mutex<Option<PartialKissOut>>>,
+    kiss_out: OutBuffer,

 }
 
 impl Soundmodem {
 }
 
 impl Soundmodem {


@@ -40,8 +40,7 @@ impl Soundmodem {
         );
         Self {
             event_tx,
         );
         Self {
             event_tx,

-            kiss_out_rx: Arc::new(Mutex::new(kiss_out_rx)),
-            partial_kiss_out: Arc::new(Mutex::new(None)),
+            kiss_out: OutBuffer::new(kiss_out_rx),

         }
     }
 }
         }
     }
 }


@@ -154,42 +153,9 @@ impl SoundmodemErrorSender {
     }
 }
 
     }
 }
 

-struct PartialKissOut {
-    output: Arc<[u8]>,
-    idx: usize,
-}
-

 impl Read for Soundmodem {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
 impl Read for Soundmodem {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {

-        {
-            let mut partial_kiss_out = self.partial_kiss_out.lock().unwrap();
-            if let Some(partial) = partial_kiss_out.as_mut() {
-                let remaining = partial.output.len() - partial.idx;
-                let to_write = remaining.min(buf.len());
-                buf[0..to_write]
-                    .copy_from_slice(&partial.output[partial.idx..(partial.idx + to_write)]);
-                if to_write == remaining {
-                    *partial_kiss_out = None;
-                } else {
-                    partial.idx += to_write;
-                }
-                return Ok(to_write);
-            }
-        }
-        let output = {
-            let rx = self.kiss_out_rx.lock().unwrap();
-            rx.recv()
-                .map_err(|s| io::Error::new(ErrorKind::Other, format!("{:?}", s)))?
-        };
-        let to_write = output.len().min(buf.len());
-        buf[0..to_write].copy_from_slice(&output[0..to_write]);
-        if to_write != output.len() {
-            *self.partial_kiss_out.lock().unwrap() = Some(PartialKissOut {
-                output,
-                idx: to_write,
-            })
-        }
-        Ok(to_write)
+        self.kiss_out.read(buf)

     }
 }
 
     }
 }
 


@@ -208,8 +174,7 @@ impl Tnc for Soundmodem {
     fn try_clone(&mut self) -> Result<Self, TncError> {
         Ok(Self {
             event_tx: self.event_tx.clone(),
     fn try_clone(&mut self) -> Result<Self, TncError> {
         Ok(Self {
             event_tx: self.event_tx.clone(),

-            kiss_out_rx: self.kiss_out_rx.clone(),
-            partial_kiss_out: self.partial_kiss_out.clone(),
+            kiss_out: self.kiss_out.clone(),

         })
     }
 
         })
     }
 

diff --git a/m17app/src/util/mod.rs b/m17app/src/util/mod.rs
new file mode 100644 (file)
index 0000000..01de5c7
--- /dev/null
+++ b/m17app/src/util/mod.rs
@@ -0,0 +1 @@
+pub mod out_buffer;

diff --git a/m17app/src/util/out_buffer.rs b/m17app/src/util/out_buffer.rs
new file mode 100644 (file)
index 0000000..c24e0a9
--- /dev/null
+++ b/m17app/src/util/out_buffer.rs
@@ -0,0 +1,64 @@
+//! Buffer between `read()` calls
+
+use std::{
+    io::{self, ErrorKind, Read},
+    sync::{mpsc::Receiver, Arc, Mutex},
+};
+
+#[derive(Clone)]
+struct PartialOut {
+    output: Arc<[u8]>,
+    idx: usize,
+}
+
+/// Buffer binary chunks from an MPSC receiver, feeding arbitrary chunks to `read()` calls.
+///
+/// Can be cloned, but should only be read from once at a time.
+#[derive(Clone)]
+pub struct OutBuffer {
+    rx: Arc<Mutex<Receiver<Arc<[u8]>>>>,
+    partial_out: Arc<Mutex<Option<PartialOut>>>,
+}
+
+impl OutBuffer {
+    pub fn new(rx: Receiver<Arc<[u8]>>) -> Self {
+        Self {
+            rx: Arc::new(Mutex::new(rx)),
+            partial_out: Arc::new(Mutex::new(None)),
+        }
+    }
+}
+
+impl Read for OutBuffer {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        {
+            let mut partial_out = self.partial_out.lock().unwrap();
+            if let Some(partial) = partial_out.as_mut() {
+                let remaining = partial.output.len() - partial.idx;
+                let to_write = remaining.min(buf.len());
+                buf[0..to_write]
+                    .copy_from_slice(&partial.output[partial.idx..(partial.idx + to_write)]);
+                if to_write == remaining {
+                    *partial_out = None;
+                } else {
+                    partial.idx += to_write;
+                }
+                return Ok(to_write);
+            }
+        }
+        let output = {
+            let rx = self.rx.lock().unwrap();
+            rx.recv()
+                .map_err(|s| io::Error::new(ErrorKind::Other, format!("{:?}", s)))?
+        };
+        let to_write = output.len().min(buf.len());
+        buf[0..to_write].copy_from_slice(&output[0..to_write]);
+        if to_write != output.len() {
+            *self.partial_out.lock().unwrap() = Some(PartialOut {
+                output,
+                idx: to_write,
+            })
+        }
+        Ok(to_write)
+    }
+}