diff options
| author | Kunal Mohan <kunalmohan99@gmail.com> | 2021-03-22 02:08:39 +0530 |
|---|---|---|
| committer | Kunal Mohan <kunalmohan99@gmail.com> | 2021-05-04 20:47:52 +0530 |
| commit | bc2345c413fb310628380ad06af9653eb9e12b9e (patch) | |
| tree | adba2a47157fbd886f5eea99ebffb3299becb73b /src/tests | |
| parent | increase snapshot time (diff) | |
| download | sl0ppij-bc2345c413fb310628380ad06af9653eb9e12b9e.tar.gz sl0ppij-bc2345c413fb310628380ad06af9653eb9e12b9e.tar.xz sl0ppij-bc2345c413fb310628380ad06af9653eb9e12b9e.zip | |
Hide server-side Ipc channels creation behind OsApis and some documentation fixes
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/fakes.rs | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/tests/fakes.rs b/src/tests/fakes.rs index 8621de71..80cf67b5 100644 --- a/src/tests/fakes.rs +++ b/src/tests/fakes.rs @@ -1,4 +1,5 @@ use crate::panes::PositionAndSize; +use ipmpsc::{Receiver as IpcReceiver, Result as IpcResult, SharedRingBuffer}; use std::collections::{HashMap, VecDeque}; use std::io::Write; use std::os::unix::io::RawFd; @@ -6,6 +7,7 @@ use std::path::PathBuf; use std::sync::{Arc, Condvar, Mutex}; use std::time::{Duration, Instant}; +use crate::common::{IpcSenderWithContext, IPC_BUFFER_SIZE}; use crate::os_input_output::{ClientOsApi, ServerOsApi}; use crate::tests::possible_tty_inputs::{get_possible_tty_inputs, Bytes}; use crate::utils::shared::default_palette; @@ -73,8 +75,8 @@ pub struct FakeInputOutput { win_sizes: Arc<Mutex<HashMap<RawFd, PositionAndSize>>>, possible_tty_inputs: HashMap<u16, Bytes>, last_snapshot_time: Arc<Mutex<Instant>>, - should_trigger_sigwinch: Arc<(Mutex<bool>, Condvar)>, - sigwinch_event: Option<PositionAndSize>, + started_reading_from_pty: Arc<AtomicBool>, + server_buffer: SharedRingBuffer, } impl FakeInputOutput { @@ -82,7 +84,9 @@ impl FakeInputOutput { let mut win_sizes = HashMap::new(); let last_snapshot_time = Arc::new(Mutex::new(Instant::now())); let stdout_writer = FakeStdoutWriter::new(last_snapshot_time.clone()); + let (_, server_buffer) = SharedRingBuffer::create_temp(IPC_BUFFER_SIZE).unwrap(); win_sizes.insert(0, winsize); // 0 is the current terminal + FakeInputOutput { read_buffers: Arc::new(Mutex::new(HashMap::new())), stdin_writes: Arc::new(Mutex::new(HashMap::new())), @@ -93,8 +97,8 @@ impl FakeInputOutput { io_events: Arc::new(Mutex::new(vec![])), win_sizes: Arc::new(Mutex::new(win_sizes)), possible_tty_inputs: get_possible_tty_inputs(), - should_trigger_sigwinch: Arc::new((Mutex::new(false), Condvar::new())), - sigwinch_event: None, + started_reading_from_pty: Arc::new(AtomicBool::new(false)), + server_buffer, } } pub fn with_tty_inputs(mut self, tty_inputs: HashMap<u16, Bytes>) -> Self { @@ -162,6 +166,9 @@ impl ClientOsApi for FakeInputOutput { fn get_stdout_writer(&self) -> Box<dyn Write> { Box::new(self.stdout_writer.clone()) } + fn get_server_sender(&self) -> IpcResult<IpcSenderWithContext> { + Ok(IpcSenderWithContext::new(self.server_buffer.clone())) + } } impl ServerOsApi for FakeInputOutput { @@ -222,15 +229,11 @@ impl ServerOsApi for FakeInputOutput { self.io_events.lock().unwrap().push(IoEvent::Kill(fd)); Ok(()) } - fn receive_sigwinch(&self, cb: Box<dyn Fn()>) { - if self.sigwinch_event.is_some() { - let (lock, cvar) = &*self.should_trigger_sigwinch; - let mut should_trigger_sigwinch = lock.lock().unwrap(); - while !*should_trigger_sigwinch { - should_trigger_sigwinch = cvar.wait(should_trigger_sigwinch).unwrap(); - } - cb(); - } + fn get_server_receiver(&self) -> IpcReceiver { + IpcReceiver::new(self.server_buffer.clone()) + } + fn get_server_sender(&self) -> IpcSenderWithContext { + IpcSenderWithContext::new(self.server_buffer.clone()) } fn load_palette(&self) -> Palette { default_palette() |
