elsanctum/tenquestionmarks
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

simplify loops, less work done in dispatcher thread

Browse Source
This commit is contained in:
Adrian Malacoda 2018-02-22 02:30:54 -06:00
parent 56ca5ae767
commit 055a323d64
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib.rs
View File

@ -75,9 +75,9 @@ impl Tenquestionmarks {
let mut dispatchers: BTreeMap<&str, Receiver<Envelope>> = BTreeMap::new(); let mut dispatchers: BTreeMap<&str, Receiver<Envelope>> = BTreeMap::new();
// Event loop threads. // Event loop threads.
// Event loop threads consume events passed in by dispatcher threads, and // Event loop threads consume events passed in by other modules' dispatcher threads,
// generate events through dispatcher threads. // and produce events through their own dispatcher threads.
let module_senders: BTreeMap<&str, Sender<Arc<Envelope>>> = self.modules.iter().map(|(key, module)| { let senders: BTreeMap<&str, Sender<Arc<Envelope>>> = self.modules.iter().map(|(key, module)| {
let from = key.clone(); let from = key.clone();
let (dispatcher_sender, dispatcher_receiver) = transformable_channels::mpsc::channel(); let (dispatcher_sender, dispatcher_receiver) = transformable_channels::mpsc::channel();
dispatchers.insert(key, dispatcher_receiver); dispatchers.insert(key, dispatcher_receiver);
@ -102,10 +102,9 @@ impl Tenquestionmarks {
// Dispatcher threads transmit events produced by parent modules to child modules. // Dispatcher threads transmit events produced by parent modules to child modules.
for (from, receiver) in dispatchers.into_iter() { for (from, receiver) in dispatchers.into_iter() {
if let Some(subscriptions) = self.subscriptions.get_vec(from) { if let Some(subscriptions) = self.subscriptions.get_vec(from) {
let senders: BTreeMap<&str, Sender<Arc<Envelope>>> = module_senders.iter().filter(|&(key, _)| { let dispatcher_senders: BTreeMap<&str, (&Subscription, Sender<Arc<Envelope>>)> = senders.iter().filter_map(|(key, value)| {
subscriptions.iter().any(|subscription| subscription.name == *key) subscriptions.iter().find(|subscription| subscription.name == *key)
}).map(|(key, value)| { .map(|subscription| (*key, (subscription, value.clone())))
(*key, value.clone())
}).collect(); }).collect();
info!("Spawning dispatcher thread for \"{}\"", from); info!("Spawning dispatcher thread for \"{}\"", from);
@ -114,12 +113,10 @@ impl Tenquestionmarks {
match receiver.recv() { match receiver.recv() {
Ok(envelope) => { Ok(envelope) => {
let arc_envelope = Arc::new(envelope); let arc_envelope = Arc::new(envelope);
for subscription in subscriptions { for (child_name, &(subscription, ref sender)) in dispatcher_senders.iter() {
if subscription.can_handle_event(&arc_envelope) { if subscription.can_handle_event(&arc_envelope) {
if let Some(sender) = senders.get(&*subscription.name) {
if let Err(err) = sender.send(arc_envelope.clone()) { if let Err(err) = sender.send(arc_envelope.clone()) {
debug!("Failed to dispatch event to module \"{}\": {:?}", subscription.name, err); debug!("Failed to dispatch event to module \"{}\": {:?}", child_name, err);
}
} }
} }
} }