CSY/reowolf Changeset - db17da820a3b · Centrum Wiskunde & Informatica (CWI)

Changeset - db17da820a3b

Parent rev.

Child rev.

[Not reviewed]

0 11 0

Christopher Esterhuyse - 5 years ago 2020-07-01 08:41:15
christopher.esterhuyse@gmail.com

pruned dependencies. cleaned up visibility

11 files changed with 68 insertions and 75 deletions:

Cargo.toml

cbindgen.toml

examples/8_net_ports/amy.c

examples/9_net_self_putget/amy.c

examples/a_swap/amy.c

examples/a_swap/bob.c

reowolf.h

src/common.rs

src/runtime/error.rs

src/runtime/mod.rs

src/runtime/setup.rs

0 comments (0 inline, 0 general)

Cargo.toml

➞

Show inline comments

@@ @@ -16,8 +16,6 @@ derive_more = "0.99.2" @@
 bincode = "1.2.1"
 serde = { version = "1.0.114", features = ["derive"] }
 getrandom = "0.1.14" # tiny crate. used to guess controller-id
 # take_mut = "0.2.2"
 indexmap = "1.4.0" # hashsets/hashmaps with efficient arbitrary element removal
 # network
 # integer-encoding = "1.1.5"

cbindgen.toml

➞

Show inline comments

@@ @@ -2,4 +2,6 @@ language = "C" @@
 header = "/* CBindgen generated */"
 include_guard = "REOWOLF_HEADER_DEFINED"
 [parse]
 parse_deps = false
@@ \ No newline at end of file @@
 parse_deps = false
 [enum]
 prefix_with_name = true
@@ \ No newline at end of file @@

examples/8_net_ports/amy.c

➞

Show inline comments

@@ @@ -12,11 +12,11 @@ int main(int argc, char** argv) { @@
 	PortId putter, getter;
 	char addr_str[] = "127.0.0.1:8000";
 	connector_add_net_port(
-		c, &putter, addr_str, sizeof(addr_str)-1, Putter, Active);
+		c, &putter, addr_str, sizeof(addr_str)-1, Polarity_Putter, EndpointPolarity_Active);
 	printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	connector_add_net_port(
-		c, &getter, addr_str, sizeof(addr_str)-1, Getter, Passive);
+		c, &getter, addr_str, sizeof(addr_str)-1, Polarity_Getter, EndpointPolarity_Passive);
 	printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	connector_connect(c, 4000);

examples/9_net_self_putget/amy.c

➞

Show inline comments

@@ @@ -12,10 +12,10 @@ int main(int argc, char** argv) { @@
 	PortId putter, getter;
 	char addr_str[] = "127.0.0.1:8000";
 	connector_add_net_port(
-		c, &putter, addr_str, sizeof(addr_str)-1, Putter, Active);
+		c, &putter, addr_str, sizeof(addr_str)-1, Polarity_Putter, EndpointPolarity_Active);
 	printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	connector_add_net_port(
-		c, &getter, addr_str, sizeof(addr_str)-1, Getter, Passive);
+		c, &getter, addr_str, sizeof(addr_str)-1, Polarity_Getter, EndpointPolarity_Passive);
 	printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	connector_connect(c, 4000);

examples/a_swap/amy.c

➞

Show inline comments

@@ @@ -18,9 +18,9 @@ int main(int argc, char** argv) { @@
     PortId ports[6];
     connector_add_port_pair(c, &ports[0], &ports[1]);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
-    connector_add_net_port(c, &ports[2], argv[1], strlen(argv[1]), Getter, Passive);
+    connector_add_net_port(c, &ports[2], argv[1], strlen(argv[1]), Polarity_Getter, EndpointPolarity_Passive);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
-    connector_add_net_port(c, &ports[3], argv[2], strlen(argv[2]), Putter, Active);
+    connector_add_net_port(c, &ports[3], argv[2], strlen(argv[2]), Polarity_Putter, EndpointPolarity_Active);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     connector_add_port_pair(c, &ports[4], &ports[5]);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));

examples/a_swap/bob.c

➞

Show inline comments

@@ @@ -18,9 +18,9 @@ int main(int argc, char** argv) { @@
     PortId ports[6];
     connector_add_port_pair(c, &ports[0], &ports[1]);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
-    connector_add_net_port(c, &ports[2], argv[1], strlen(argv[1]), Getter, Passive);
+    connector_add_net_port(c, &ports[2], argv[1], strlen(argv[1]), Polarity_Getter, EndpointPolarity_Passive);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
-    connector_add_net_port(c, &ports[3], argv[2], strlen(argv[2]), Putter, Active);
+    connector_add_net_port(c, &ports[3], argv[2], strlen(argv[2]), Polarity_Putter, EndpointPolarity_Active);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     connector_add_port_pair(c, &ports[4], &ports[5]);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));

reowolf.h

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 #include <stdlib.h>
 typedef enum {
   Active,
   Passive,
   EndpointPolarity_Active,
   EndpointPolarity_Passive,
 } EndpointPolarity;
 typedef enum {
   Putter,
   Getter,
   Polarity_Putter,
   Polarity_Getter,
 } Polarity;
 typedef struct Arc_ProtocolDescription Arc_ProtocolDescription;

src/common.rs

➞

Show inline comments

 ///////////////////// PRELUDE /////////////////////
 pub(crate) use crate::protocol::{ComponentState, ProtocolDescription};
 pub(crate) use crate::runtime::{NonsyncProtoContext, SyncProtoContext};
+pub(crate) use crate::runtime::{error::AddComponentError, NonsyncProtoContext, SyncProtoContext};
 pub use core::{
+pub(crate) use core::{
     cmp::Ordering,
     fmt::{Debug, Formatter},
     hash::{Hash, Hasher},
     ops::{Range, RangeFrom},
     hash::Hash,
     ops::Range,
     time::Duration,
 };
 pub use indexmap::{IndexMap, IndexSet};
 pub use maplit::{hashmap, hashset};
 pub use mio::{
 // pub(crate) use indexmap::IndexSet;
 pub(crate) use maplit::hashmap;
 pub(crate) use mio::{
     net::{TcpListener, TcpStream},
     Events, Interest, Poll, Token,
 };
 pub use std::{
     collections::{hash_map::Entry, BTreeMap, HashMap, HashSet},
 pub(crate) use std::{
     collections::{BTreeMap, HashMap, HashSet},
     convert::TryInto,
     io::{Read, Write},
     net::SocketAddr,
     sync::Arc,
     time::Instant,
 };
 pub use Polarity::*;
 ///////////////////// DEFS /////////////////////
 pub(crate) use Polarity::*;
 pub type ConnectorId = u32;
 pub type PortSuffix = u32;
 #[derive(
     Copy, Clone, Eq, PartialEq, Ord, Hash, PartialOrd, serde::Serialize, serde::Deserialize,
 )]
 // acquired via error in the Rust API
 pub struct ProtoComponentId(Id);
 #[derive(
     Copy, Clone, Eq, PartialEq, Ord, Hash, PartialOrd, serde::Serialize, serde::Deserialize,
 )]
@@ @@ -39,31 +41,17 @@ pub struct Id { @@
     pub(crate) connector_id: ConnectorId,
     pub(crate) u32_suffix: PortSuffix,
+}
 #[derive(Debug, Default)]
 pub struct U32Stream {
     next: u32,
+}
 // globally unique
 #[derive(
     Copy, Clone, Eq, PartialEq, Ord, Hash, PartialOrd, serde::Serialize, serde::Deserialize,
 )]
 #[repr(transparent)]
 pub struct PortId(Id);
 #[derive(
     Copy, Clone, Eq, PartialEq, Ord, Hash, PartialOrd, serde::Serialize, serde::Deserialize,
 )]
 pub struct FiringVar(pub(crate) PortId);
 #[derive(
     Copy, Clone, Eq, PartialEq, Ord, Hash, PartialOrd, serde::Serialize, serde::Deserialize,
 )]
 pub struct ProtoComponentId(Id);
 #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
 // #[repr(C)]
 #[derive(Default, Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
 pub struct Payload(Arc<Vec<u8>>);
 #[derive(
     Debug, Eq, PartialEq, Clone, Hash, Copy, Ord, PartialOrd, serde::Serialize, serde::Deserialize,
 )]
@@ @@ -80,27 +68,19 @@ pub enum EndpointPolarity { @@
     Active,  // calls connect()
     Passive, // calls bind() listen() accept()
+}
 #[derive(Eq, PartialEq, Copy, Clone, Debug)]
 pub enum AddComponentError {
     NoSuchComponent,
     NonPortTypeParameters,
     CannotMovePort(PortId),
     WrongNumberOfParamaters { expected: usize },
     UnknownPort(PortId),
     WrongPortPolarity { port: PortId, expected_polarity: Polarity },
     DuplicateMovedPort(PortId),
+}
 #[derive(
     Copy, Clone, Eq, PartialEq, Ord, Hash, PartialOrd, serde::Serialize, serde::Deserialize,
 )]
 pub(crate) struct FiringVar(pub(crate) PortId);
 #[derive(Debug, Clone)]
 pub enum NonsyncBlocker {
+pub(crate) enum NonsyncBlocker {
     Inconsistent,
     ComponentExit,
     SyncBlockStart,
+}
 #[derive(Debug, Clone)]
 pub enum SyncBlocker {
+pub(crate) enum SyncBlocker {
     Inconsistent,
     SyncBlockEnd,
     CouldntReadMsg(PortId),
@@ @@ -110,7 +90,7 @@ pub enum SyncBlocker { @@
 ///////////////////// IMPL /////////////////////
 impl U32Stream {
     pub fn next(&mut self) -> u32 {
+    pub(crate) fn next(&mut self) -> u32 {
         if self.next == u32::MAX {
             panic!("NO NEXT!")
+        }
@@ @@ -150,7 +130,7 @@ impl Payload { @@
     pub fn as_mut_slice(&mut self) -> &mut [u8] {
         Arc::make_mut(&mut self.0) as _
+    }
-    pub fn concat_with(&mut self, other: &Self) {
+    pub fn concatenate_with(&mut self, other: &Self) {
         let bytes = other.as_slice().iter().copied();
         let me = Arc::make_mut(&mut self.0);
         me.extend(bytes);
@@ @@ -174,11 +154,6 @@ impl<'de> serde::Deserialize<'de> for Payload { @@
         Ok(Self(Arc::new(inner)))
+    }
+}
 impl std::iter::FromIterator<u8> for Payload {
     fn from_iter<I: IntoIterator<Item = u8>>(it: I) -> Self {
         Self(Arc::new(it.into_iter().collect()))
+    }
+}
 impl From<Vec<u8>> for Payload {
     fn from(s: Vec<u8>) -> Self {
         Self(s.into())

src/runtime/error.rs

➞

Show inline comments

@@ @@ -12,6 +12,16 @@ pub enum ConnectError { @@
     EndpointSetupError(SocketAddr, EndpointError),
     SetupAlgMisbehavior,
+}
 #[derive(Eq, PartialEq, Copy, Clone, Debug)]
 pub enum AddComponentError {
     NoSuchComponent,
     NonPortTypeParameters,
     CannotMovePort(PortId),
     WrongNumberOfParamaters { expected: usize },
     UnknownPort(PortId),
     WrongPortPolarity { port: PortId, expected_polarity: Polarity },
     DuplicateMovedPort(PortId),
+}
 ////////////////////////
 #[derive(Debug, Clone)]
 pub enum SyncError {

src/runtime/mod.rs

➞

Show inline comments

 /// cbindgen:ignore
 mod communication;
 /// cbindgen:ignore
 mod endpoints;
 pub mod error;
 /// cbindgen:ignore
 mod logging;
 /// cbindgen:ignore
 mod setup;
 #[cfg(feature = "ffi")]
@@ @@ -46,6 +50,7 @@ struct RoundOk { @@
     batch_index: usize,
     gotten: HashMap<PortId, Payload>,
+}
 #[derive(Default)]
 struct VecSet<T: std::cmp::Ord> {
     // invariant: ordered, deduplicated
     vec: Vec<T>,
@@ @@ -153,7 +158,7 @@ struct EndpointManager { @@
     // 2. Events is empty
     poll: Poll,
     events: Events,
-    polled_undrained: IndexSet<usize>,
+    polled_undrained: VecSet<usize>,
     delayed_messages: Vec<(usize, Msg)>,
     undelayed_messages: Vec<(usize, Msg)>,
     endpoint_exts: Vec<EndpointExt>,
@@ @@ -209,18 +214,21 @@ impl<T: std::cmp::Ord> VecSet<T> { @@
     fn contains(&self, element: &T) -> bool {
         self.vec.binary_search(element).is_ok()
+    }
     // fn insert(&mut self, element: T) -> bool {
     //     match self.vec.binary_search(&element) {
     //         Ok(_) => false,
     //         Err(index) => {
     //             self.vec.insert(index, element);
     //             true
     //         }
     //     }
     // }
     fn insert(&mut self, element: T) -> bool {
         match self.vec.binary_search(&element) {
             Ok(_) => false,
             Err(index) => {
                 self.vec.insert(index, element);
                 true
+            }
+        }
+    }
     fn iter(&self) -> std::slice::Iter<T> {
         self.vec.iter()
+    }
     fn pop(&mut self) -> Option<T> {
         self.vec.pop()
+    }
+}
 impl PortInfo {
     fn firing_var_for(&self, port: PortId) -> FiringVar {

src/runtime/setup.rs

➞

Show inline comments

@@ @@ -152,7 +152,7 @@ fn new_endpoint_manager( @@
     let mut waker_continue_signal: Option<Arc<AtomicBool>> = None;
     let mut poll = Poll::new().map_err(|_| PollInitFailed)?;
     let mut events = Events::with_capacity(endpoint_setups.len() * 2 + 4);
-    let mut polled_undrained = IndexSet::default();
+    let mut polled_undrained = VecSet::default();
     let mut delayed_messages = vec![];
     // 2. create a registered (TcpListener/Endpoint) for passive / active respectively

0 comments (0 inline, 0 general)