{"header":{"message":"Add Device, a threading helper for Driver","description":null,"timestamp":"2022-12-17T05:39:26.837336304Z","authors":[{}]},"hash":"34E7755B72Z4ABDZNRY7MT2AFDFP27NS5KPQT3XMGUK66KD6R4OAC","authors":[{"login":"jcdickinson","key":"5CaMTwtprkG3T8e4cE7ADWr9ixgB59R1J5aNBLfmY3u7"}],"deps":{"hashes":[["34E7755B72Z4ABDZNRY7MT2AFDFP27NS5KPQT3XMGUK66KD6R4OAC","Add Device, a threading helper for Driver"],["AA",null],["3ERBQOGMWDE3KH4SGF3MGNN2N7BSXY4EPPYSZGL4OY36DW3IUEMAC","Start work on driver"],["V3N7ZSMUNTM4CK6DPSL3R5QZTAAOI25ROQ5OFJME32WGSSO4B7EQC","Add basic z-wave serial functionality"],["26AB7MFFP3Y7GGZIMUTT3NOECEKWUSYFX6P4LZ2MGIEZNXO5XCMQC","Cleaning up some smelly code in driver"]],"deps":["3ERBQOGMWDE3KH4SGF3MGNN2N7BSXY4EPPYSZGL4OY36DW3IUEMAC"],"known":["V3N7ZSMUNTM4CK6DPSL3R5QZTAAOI25ROQ5OFJME32WGSSO4B7EQC","26AB7MFFP3Y7GGZIMUTT3NOECEKWUSYFX6P4LZ2MGIEZNXO5XCMQC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":2024},"path":"crates/zwave/src/main.rs","line":9,"ins":{"up_context":[{"change":2,"pos":33}],"down_context":[{"change":3,"pos":2124}],"flag":"BLOCK","start":0,"end":100,"inode":{"change":3,"pos":2024}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":33},"to":{"change":3,"start":2081,"end":2124},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2081},"to":{"change":3,"start":2081,"end":2124},"introduced_by":3}],"inode":{"change":3,"pos":2024}},"ins_contents":[{"Add":"use driver::{CommandSequenceContextExt, Driver, SerialDriverBuilder};"},{"Add":"use std::io::{self, BufRead};"}],"del_contents":[{"Del":"use driver::{Driver, SerialDriverBuilder};\n"}]}},{"Replacement":{"inode":{"change":3,"pos":2024},"path":"crates/zwave/src/main.rs","line":20,"ins":{"up_context":[{"change":2,"pos":69}],"down_context":[{"change":3,"pos":2448}],"flag":"BLOCK","start":101,"end":306,"inode":{"change":3,"pos":2024}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":69},"to":{"change":2,"start":69,"end":109},"introduced_by":2}],"inode":{"change":3,"pos":2024}},"ins_contents":[{"Add":" let (mut device, sender, complete) = Device::new(driver);"},{"Add":""},{"Add":" std::thread::spawn(move || {"},{"Add":" loop {"},{"Add":" match device.recv() {"},{"Add":" Ok(v) => println!(\"{:?}\", &v),"},{"Add":" Err(_) => {}"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" let mut device = Device::new(driver);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":2024},"path":"crates/zwave/src/main.rs","line":30,"ins":{"up_context":[{"change":3,"pos":2449}],"down_context":[{"change":3,"pos":2520}],"flag":"BLOCK","start":307,"end":447,"inode":{"change":3,"pos":2024}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2449},"to":{"change":2,"start":110,"end":127},"introduced_by":2}],"inode":{"change":3,"pos":2024}},"ins_contents":[{"Add":" println!(\"quit\");"},{"Add":" });"},{"Add":""},{"Add":" let stdin = io::stdin();"},{"Add":" stdin.lock().lines().next().unwrap().unwrap();"},{"Add":" drop(sender);"},{"Add":" complete.wait();"}],"del_contents":[{"Del":" device.join();\n"}]}},{"Edit":{"inode":{"change":3,"pos":2645},"path":"crates/zwave/src/driver.rs","line":39,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3505},"to":{"change":3,"start":3505,"end":3569},"introduced_by":3}],"inode":{"change":3,"pos":2645}}},"contents":[{"Del":" fn execute_command(&mut self, command: impl CommandSequence);\n"}]}},{"Edit":{"inode":{"change":3,"pos":2645},"path":"crates/zwave/src/driver.rs","line":47,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":3846}],"down_context":[{"change":3,"pos":3846}],"flag":"BLOCK","start":448,"end":553,"inode":{"change":3,"pos":2645}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"pub trait CommandSequenceContextExt {"},{"Add":" fn execute_command(&mut self, command: impl CommandSequence);"}]}},{"Edit":{"inode":{"change":3,"pos":2645},"path":"crates/zwave/src/driver.rs","line":53,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":3849}],"down_context":[{"change":3,"pos":3849}],"flag":"BLOCK","start":554,"end":853,"inode":{"change":3,"pos":2645}}},"contents":[{"Add":"impl CommandSequenceContextExt for T {"},{"Add":" fn execute_command(&mut self, mut command: impl CommandSequence) {"},{"Add":" loop {"},{"Add":" match command.execute(self) {"},{"Add":" Err(CommandSequenceError::Cancel) => break,"},{"Add":" Err(_) => {}"},{"Add":" Ok(_) => break,"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":"}"}]}},{"Edit":{"inode":{"change":3,"pos":6177},"path":"crates/zwave/src/driver/serial/serial_driver.rs","line":367,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":16776},"to":{"change":3,"start":16776,"end":17045},"introduced_by":3}],"inode":{"change":3,"pos":6177}}},"contents":[{"Del":"\n #[instrument(skip(self, command))]\n fn execute_command(&mut self, mut command: impl CommandSequence) {\n loop {\n match command.execute(self) {\n Err(CommandSequenceError::Cancel) => break,\n Err(_) => {}\n Ok(_) => break,\n }\n }\n }\n"}]}},{"FileAdd":{"meta":{"basename":"device.rs","metadata":0},"context":[{"change":3,"pos":361}],"contents":[{"Add":"use crossbeam::{"},{"Add":" channel::{Receiver, RecvError, Sender, TryRecvError},"},{"Add":" sync::WaitGroup,"},{"Add":"};"},{"Add":"use std::{"},{"Add":" marker::PhantomData,"},{"Add":" ops::Deref,"},{"Add":" sync::{Arc, Mutex},"},{"Add":" thread::JoinHandle,"},{"Add":"};"},{"Add":""},{"Add":"use tracing::{debug, trace};"},{"Add":""},{"Add":"use crate::{"},{"Add":" commands::{DeviceCommand, Frame, HostCommand, RawCommandData},"},{"Add":" driver::{CommandSequence, CommandSequenceContext, CommandSequenceError, Driver},"},{"Add":"};"},{"Add":""},{"Add":"pub struct Device"},{"Add":"where"},{"Add":" T: Driver,"},{"Add":"{"},{"Add":" worker_type: PhantomData,"},{"Add":" output_receiver: Receiver>,"},{"Add":"}"},{"Add":""},{"Add":"struct PendingFrame {"},{"Add":" frame: Frame,"},{"Add":" response: oneshot::Sender>,"},{"Add":"}"},{"Add":""},{"Add":"pub struct DeviceCommands(Sender);"},{"Add":""},{"Add":"impl<'a, T> Device"},{"Add":"where"},{"Add":" T: Driver + Send + CommandSequenceContext + 'static,"},{"Add":"{"},{"Add":" pub fn new(driver: T) -> (Self, DeviceCommands, WaitGroup) {"},{"Add":" let (sender, output_receiver) = crossbeam::channel::unbounded();"},{"Add":" let (send_sender, receiver) = crossbeam::channel::unbounded();"},{"Add":" let complete = WaitGroup::new();"},{"Add":" let child_complete = complete.clone();"},{"Add":" // TODO: Figure out if we can catch any panics"},{"Add":" std::thread::spawn(move || Self::execute(driver, sender, receiver, child_complete));"},{"Add":" ("},{"Add":" Self {"},{"Add":" output_receiver,"},{"Add":" worker_type: PhantomData::default(),"},{"Add":" },"},{"Add":" DeviceCommands(send_sender),"},{"Add":" complete,"},{"Add":" )"},{"Add":" }"},{"Add":""},{"Add":" fn execute("},{"Add":" mut driver: T,"},{"Add":" mut sender: Sender>,"},{"Add":" mut receiver: Receiver,"},{"Add":" _complete: WaitGroup,"},{"Add":" ) {"},{"Add":" loop {"},{"Add":" if let Ok(incoming) = driver.read_frame() {"},{"Add":" trace!(\"got frame on serial port: {:?}\", incoming);"},{"Add":" if sender.send(incoming).is_err() {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" match receiver.try_recv() {"},{"Add":" Ok(pending) => {"},{"Add":" if pending.response.send(driver.send(pending.frame)).is_err() {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" Err(TryRecvError::Disconnected) => break,"},{"Add":" _ => {}"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Deref for Device"},{"Add":"where"},{"Add":" T: Driver,"},{"Add":"{"},{"Add":" type Target = Receiver>;"},{"Add":""},{"Add":" fn deref(&self) -> &Self::Target {"},{"Add":" &self.output_receiver"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl CommandSequenceContext for DeviceCommands {"},{"Add":" fn send(&mut self, command: Frame) -> Result<(), crate::driver::CommandSequenceError>"},{"Add":" where"},{"Add":" T: Into,"},{"Add":" {"},{"Add":" let (response, wait) = oneshot::channel();"},{"Add":" self"},{"Add":" .0"},{"Add":" .send(PendingFrame {"},{"Add":" frame: match command {"},{"Add":" Frame::Request(r) => Frame::Request(r.into()),"},{"Add":" Frame::Response(r) => Frame::Response(r.into()),"},{"Add":" },"},{"Add":" response,"},{"Add":" })"},{"Add":" .map_err(|_| CommandSequenceError::Cancel)?;"},{"Add":""},{"Add":" wait.recv().map_err(|_| CommandSequenceError::Cancel)?"},{"Add":" }"},{"Add":"}"}]}}],"owner":"sockt","repo":"ecosystem-zwave","token":"RYYmoZ//Gk6VOe8/zS1wcD7Ka3mBEn7R2AZNUMCv8GY=","login":null}

…

Dependencies

Change contents