rust/sat-rs
rust/sat-rs
6
1
Fork 0
Code Issues 9 Pull Requests Projects Releases 24 Wiki Activity

sync channel now works as well

Browse Source
This commit is contained in:
Robin Müller 2024-02-22 17:31:10 +01:00
parent a354f8a76c
commit 508561d791
Signed by: muellerr
GPG Key ID: A649FB78196E3849
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
satrs/src/mode_tree.rs
View File

@ -137,6 +137,7 @@ impl<R: MessageReceiver<ModeReply>> ModeReplyReceiver for MessageReceiverWithId<
self.try_recv_message() self.try_recv_message()
} }
} }
impl<R: MessageReceiver<ModeRequest>> ModeRequestReceiver impl<R: MessageReceiver<ModeRequest>> ModeRequestReceiver
for MessageReceiverWithId<ModeRequest, R> for MessageReceiverWithId<ModeRequest, R>
{ {
@ -207,12 +208,20 @@ pub type MpscModeRequestHandlerConnector = ModeRequestHandlerConnector<
mpsc::Sender<MessageWithSenderId<ModeReply>>, mpsc::Sender<MessageWithSenderId<ModeReply>>,
mpsc::Receiver<MessageWithSenderId<ModeRequest>>, mpsc::Receiver<MessageWithSenderId<ModeRequest>>,
>; >;
pub type MpscBoundedModeRequestHandlerConnector = ModeRequestHandlerConnector<
mpsc::SyncSender<MessageWithSenderId<ModeReply>>,
mpsc::Receiver<MessageWithSenderId<ModeRequest>>,
>;
pub type ModeRequestorConnector<S, R> = MessageSenderAndReceiver<ModeRequest, ModeReply, S, R>; pub type ModeRequestorConnector<S, R> = MessageSenderAndReceiver<ModeRequest, ModeReply, S, R>;
pub type MpscModeRequestorConnector = ModeRequestorConnector< pub type MpscModeRequestorConnector = ModeRequestorConnector<
mpsc::Sender<MessageWithSenderId<ModeRequest>>, mpsc::Sender<MessageWithSenderId<ModeRequest>>,
mpsc::Receiver<MessageWithSenderId<ModeReply>>, mpsc::Receiver<MessageWithSenderId<ModeReply>>,
>; >;
pub type MpscBoundedModeRequestorConnector = ModeRequestorConnector<
mpsc::SyncSender<MessageWithSenderId<ModeRequest>>,
mpsc::Receiver<MessageWithSenderId<ModeReply>>,
>;
pub type ModeConnector<S0, R0, S1, R1> = pub type ModeConnector<S0, R0, S1, R1> =
RequestAndReplySenderAndReceiver<ModeRequest, ModeReply, S0, R0, S1, R1>; RequestAndReplySenderAndReceiver<ModeRequest, ModeReply, S0, R0, S1, R1>;
@ -222,6 +231,12 @@ pub type MpscModeConnector = ModeConnector<
mpsc::Sender<MessageWithSenderId<ModeReply>>, mpsc::Sender<MessageWithSenderId<ModeReply>>,
mpsc::Receiver<MessageWithSenderId<ModeRequest>>, mpsc::Receiver<MessageWithSenderId<ModeRequest>>,
>; >;
pub type MpscBoundedModeConnector = ModeConnector<
mpsc::SyncSender<MessageWithSenderId<ModeRequest>>,
mpsc::Receiver<MessageWithSenderId<ModeReply>>,
mpsc::SyncSender<MessageWithSenderId<ModeReply>>,
mpsc::Receiver<MessageWithSenderId<ModeRequest>>,
>;
impl< impl<
REPLY, REPLY,
@ -370,7 +385,7 @@ mod tests {
} }
struct PusModeService { struct PusModeService {
pub mode_node: MpscModeRequestorConnector, pub mode_node: MpscBoundedModeRequestorConnector,
} }
impl PusModeService { impl PusModeService {
@ -386,7 +401,7 @@ mod tests {
struct TestDevice { struct TestDevice {
pub name: String, pub name: String,
pub mode_node: MpscModeRequestHandlerConnector, pub mode_node: MpscBoundedModeRequestHandlerConnector,
pub mode_and_submode: ModeAndSubmode, pub mode_and_submode: ModeAndSubmode,
pub mode_req_commander: Option<ChannelId>, pub mode_req_commander: Option<ChannelId>,
} }
@ -447,7 +462,7 @@ mod tests {
} }
struct TestAssembly { struct TestAssembly {
pub mode_node: MpscModeConnector, pub mode_node: MpscBoundedModeConnector,
pub mode_req_commander: Option<ChannelId>, pub mode_req_commander: Option<ChannelId>,
pub mode_and_submode: ModeAndSubmode, pub mode_and_submode: ModeAndSubmode,
pub target_mode_and_submode: Option<ModeAndSubmode>, pub target_mode_and_submode: Option<ModeAndSubmode>,
@ -554,32 +569,32 @@ mod tests {
#[test] #[test]
fn basic_test() { fn basic_test() {
// All request channel handles. // All request channel handles.
let (request_sender_to_dev1, request_receiver_dev1) = mpsc::channel(); let (request_sender_to_dev1, request_receiver_dev1) = mpsc::sync_channel(10);
let (request_sender_to_dev2, request_receiver_dev2) = mpsc::channel(); let (request_sender_to_dev2, request_receiver_dev2) = mpsc::sync_channel(10);
let (request_sender_to_assy, request_receiver_assy) = mpsc::channel(); let (request_sender_to_assy, request_receiver_assy) = mpsc::sync_channel(10);
// All reply channel handles. // All reply channel handles.
let (reply_sender_to_assy, reply_receiver_assy) = mpsc::channel(); let (reply_sender_to_assy, reply_receiver_assy) = mpsc::sync_channel(10);
let (reply_sender_to_pus, reply_receiver_pus) = mpsc::channel(); let (reply_sender_to_pus, reply_receiver_pus) = mpsc::sync_channel(10);
// Mode requestors and handlers. // Mode requestors and handlers.
let mut mode_node_assy = MpscModeConnector::new( let mut mode_node_assy = MpscBoundedModeConnector::new(
TestChannelId::Assembly as u32, TestChannelId::Assembly as u32,
request_receiver_assy, request_receiver_assy,
reply_receiver_assy, reply_receiver_assy,
); );
// Mode requestors only. // Mode requestors only.
let mut mode_node_pus = MpscModeRequestorConnector::new( let mut mode_node_pus = MpscBoundedModeRequestorConnector::new(
TestChannelId::PusModeService as u32, TestChannelId::PusModeService as u32,
reply_receiver_pus, reply_receiver_pus,
); );
// Request handlers only. // Request handlers only.
let mut mode_node_dev1 = MpscModeRequestHandlerConnector::new( let mut mode_node_dev1 = MpscBoundedModeRequestHandlerConnector::new(
TestChannelId::Device1 as u32, TestChannelId::Device1 as u32,
request_receiver_dev1, request_receiver_dev1,
); );
let mut mode_node_dev2 = MpscModeRequestHandlerConnector::new( let mut mode_node_dev2 = MpscBoundedModeRequestHandlerConnector::new(
TestChannelId::Device2 as u32, TestChannelId::Device2 as u32,
request_receiver_dev2, request_receiver_dev2,
); );