Remove Event

Signed-off-by: Moritz Hoffmann <[email protected]>

Author: antiguru

communication/src/allocator/counters.rs

@@ -4,7 +4,6 @@ use std::rc::Rc;
 use std::cell::RefCell;
 
 use crate::{Push, Pull};
-use crate::allocator::Event;
 
 /// The push half of an intra-thread channel.
 pub struct Pusher<T, P: Push<T>> {
@@ -58,15 +57,15 @@ use crossbeam_channel::Sender;
 pub struct ArcPusher<T, P: Push<T>> {
     index: usize,
     // count: usize,
-    events: Sender<(usize, Event)>,
+    events: Sender<usize>,
     pusher: P,
     phantom: ::std::marker::PhantomData<T>,
     buzzer: crate::buzzer::Buzzer,
 }
 
 impl<T, P: Push<T>>  ArcPusher<T, P> {
     /// Wraps a pusher with a message counter.
-    pub fn new(pusher: P, index: usize, events: Sender<(usize, Event)>, buzzer: crate::buzzer::Buzzer) -> Self {
+    pub fn new(pusher: P, index: usize, events: Sender<usize>, buzzer: crate::buzzer::Buzzer) -> Self {
         ArcPusher {
             index,
             // count: 0,
@@ -98,7 +97,7 @@ impl<T, P: Push<T>> Push<T> for ArcPusher<T, P> {
         // and finally awaken the thread. Other orders are defective when
         // multiple threads are involved.
         self.pusher.push(element);
-        let _ = self.events.send((self.index, Event::Pushed(1)));
+        let _ = self.events.send(self.index);
             // TODO : Perhaps this shouldn't be a fatal error (e.g. in shutdown).
             // .expect("Failed to send message count");
         self.buzzer.buzz();

communication/src/allocator/mod.rs

@@ -91,11 +91,3 @@ pub trait Allocate {
         thread::Thread::new_from(identifier, self.events().clone())
     }
 }
-
-/// A communication channel event.
-pub enum Event {
-    /// A number of messages pushed into the channel.
-    Pushed(usize),
-    /// A number of messages pulled from the channel.
-    Pulled(usize),
-}

communication/src/allocator/process.rs

@@ -9,7 +9,7 @@ use std::collections::{HashMap};
 use crossbeam_channel::{Sender, Receiver};
 
 use crate::allocator::thread::{ThreadBuilder};
-use crate::allocator::{Allocate, AllocateBuilder, Event, Thread};
+use crate::allocator::{Allocate, AllocateBuilder, Thread};
 use crate::{Push, Pull, Message};
 use crate::buzzer::Buzzer;
 
@@ -25,8 +25,8 @@ pub struct ProcessBuilder {
     buzzers_send: Vec<Sender<Buzzer>>,
     buzzers_recv: Vec<Receiver<Buzzer>>,
 
-    counters_send: Vec<Sender<(usize, Event)>>,
-    counters_recv: Receiver<(usize, Event)>,
+    counters_send: Vec<Sender<usize>>,
+    counters_recv: Receiver<usize>,
 }
 
 impl AllocateBuilder for ProcessBuilder {
@@ -63,8 +63,8 @@ pub struct Process {
     // below: `Box<Any+Send>` is a `Box<Vec<Option<(Vec<Sender<T>>, Receiver<T>)>>>`
     channels: Arc<Mutex<HashMap</* channel id */ usize, Box<dyn Any+Send>>>>,
     buzzers: Vec<Buzzer>,
-    counters_send: Vec<Sender<(usize, Event)>>,
-    counters_recv: Receiver<(usize, Event)>,
+    counters_send: Vec<Sender<usize>>,
+    counters_recv: Receiver<usize>,
 }
 
 impl Process {
@@ -184,7 +184,7 @@ impl Allocate for Process {
 
     fn receive(&mut self) {
         let mut events = self.inner.events().borrow_mut();
-        while let Ok((index, _event)) = self.counters_recv.try_recv() {
+        while let Ok(index) = self.counters_recv.try_recv() {
             events.push(index);
         }
     }