Add initial driver implementation
This commit is contained in:
parent
267a99d6b9
commit
6bc88ef6b0
|
@ -40,10 +40,9 @@ impl Adaptor for FakeAdaptor {
|
||||||
fn run(&mut self) -> Receiver<TallyState> {
|
fn run(&mut self) -> Receiver<TallyState> {
|
||||||
println!("arse");
|
println!("arse");
|
||||||
let (tx, rx): (Sender<TallyState>, Receiver<TallyState>) = mpsc::channel();
|
let (tx, rx): (Sender<TallyState>, Receiver<TallyState>) = mpsc::channel();
|
||||||
let thread_tx = tx.clone();
|
|
||||||
let thread_numchannels = self.numchannels.clone();
|
let thread_numchannels = self.numchannels.clone();
|
||||||
self.thread = Some(thread::spawn(move || {
|
self.thread = Some(thread::spawn(move || {
|
||||||
FakeAdaptor::_run(thread_numchannels, thread_tx);
|
FakeAdaptor::_run(thread_numchannels, tx);
|
||||||
}));
|
}));
|
||||||
return rx;
|
return rx;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,40 @@
|
||||||
|
use crate::TallyState;
|
||||||
|
|
||||||
|
use std::sync::mpsc;
|
||||||
|
use std::sync::mpsc::{Sender, Receiver};
|
||||||
|
use std::thread;
|
||||||
|
|
||||||
|
/// A Driver displays the Tallies on a physical tally system.
|
||||||
|
pub trait Driver {
|
||||||
|
/// Run the driver, returning a channel sender which takes TallyStates
|
||||||
|
fn run(&mut self) -> Sender<TallyState>;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct FakeDriver {
|
||||||
|
thread: Option<thread::JoinHandle<()>>
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Driver for FakeDriver {
|
||||||
|
fn run(&mut self) -> Sender<TallyState> {
|
||||||
|
let (tx, rx): (Sender<TallyState>, Receiver<TallyState>) = mpsc::channel();
|
||||||
|
self.thread = Some(thread::spawn(move || {
|
||||||
|
FakeDriver::_run(rx);
|
||||||
|
}));
|
||||||
|
return tx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FakeDriver {
|
||||||
|
pub fn new() -> FakeDriver {
|
||||||
|
FakeDriver{
|
||||||
|
thread: None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn _run(rx: Receiver<TallyState>) {
|
||||||
|
loop {
|
||||||
|
let state = rx.recv().unwrap();
|
||||||
|
println!("{}", state);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
12
src/main.rs
12
src/main.rs
|
@ -1,5 +1,7 @@
|
||||||
mod adaptors;
|
mod adaptors;
|
||||||
|
mod drivers;
|
||||||
use crate::adaptors::{Adaptor,FakeAdaptor};
|
use crate::adaptors::{Adaptor,FakeAdaptor};
|
||||||
|
use crate::drivers::{Driver, FakeDriver};
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
|
@ -26,16 +28,17 @@ impl fmt::Display for TallyState {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct Server<T:Adaptor> {
|
struct Server<T:Adaptor,U:Driver> {
|
||||||
adaptor: T,
|
adaptor: T,
|
||||||
|
driver: U,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<T:Adaptor> Server<T> {
|
impl<T:Adaptor,U:Driver> Server<T,U> {
|
||||||
fn run(&mut self) {
|
fn run(&mut self) {
|
||||||
let rx = self.adaptor.run();
|
let rx = self.adaptor.run();
|
||||||
|
let tx = self.driver.run();
|
||||||
loop{
|
loop{
|
||||||
let newstate = rx.recv().unwrap();
|
tx.send(rx.recv().unwrap()).unwrap();
|
||||||
println!("{}", newstate);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -43,6 +46,7 @@ impl<T:Adaptor> Server<T> {
|
||||||
fn main() {
|
fn main() {
|
||||||
let mut s = Server{
|
let mut s = Server{
|
||||||
adaptor: FakeAdaptor::new(8),
|
adaptor: FakeAdaptor::new(8),
|
||||||
|
driver: FakeDriver::new(),
|
||||||
};
|
};
|
||||||
|
|
||||||
s.run();
|
s.run();
|
||||||
|
|
Loading…
Reference in New Issue