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

Changeset - 3f236d37dad1

Parent rev.

Child rev.

[Not reviewed]

0 7 1

Christopher Esterhuyse - 5 years ago 2020-06-18 17:47:26
christopher.esterhuyse@gmail.com

pulled out arena-id dependency in favour of custom (minimal) impl, and to finish making component states serializable with serde

8 files changed with 114 insertions and 35 deletions:

Cargo.toml

README.md

src/common.rs

src/protocol/arena.rs

src/protocol/ast.rs

src/protocol/eval.rs

src/protocol/mod.rs

src/runtime/mod.rs

0 comments (0 inline, 0 general)

Cargo.toml

➞

Show inline comments

@@ @@ -13,6 +13,7 @@ maplit = "1.0.2" @@
 derive_more = "0.99.2"
 # runtime
 serde = { version = "1.0.112", features = ["derive"] }
 getrandom = "0.1.14" # tiny crate. used to guess controller-id
 take_mut = "0.2.2"
 indexmap = "1.3.0" # hashsets/hashmaps with efficient arbitrary element removal
@@ @@ -24,7 +25,7 @@ mio = "0.6.21" # migrate to mio v0.7.0 when it stabilizes @@
 mio-extras = "2.0.6"
 # protocol
 id-arena = "2.2.1"
+# id-arena = "2.2.1"
 backtrace = "0.3"
 [dev-dependencies]

README.md

➞

Show inline comments

 # Reowolf Implementation
+# Reowolf 1.0 Implementation
 ## Compilation instructions
 . Install the latest stable Rust toolchain using Rustup. See https://rustup.rs/ for further instructions.
 . Run `cargo build --release` to download source dependencies, and compile the library with release-level optimizations.
 	- The resulting dylib can be found in target/release/, to be used with the header file reowolf.h.
 	- Note: A list of immediate ancestor dependencies is visible in Cargo.toml.
 	- Note: Run `cargo test --release` to run unit tests with release-level optimizations.
 . Install the Rust toolchain, using Rustup. See https://rustup.rs/ for further instructions.
 . Run `cargo test` to download dependencies, compile the project, and run the tests.
 ## Structure
 - The user-facing API is visible in src/runtime/connector.rs

src/common.rs

➞

Show inline comments

@@ @@ -35,6 +35,18 @@ pub struct PortId { @@
 #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
 pub struct Payload(Arc<Vec<u8>>);
 impl serde::Serialize for Payload {
     fn serialize<S>(
         &self,
         serializer: S,
     ) -> std::result::Result<<S as serde::Serializer>::Ok, <S as serde::Serializer>::Error>
     where
         S: serde::Serializer,
+    {
         let inner: &Vec<u8> = &self.0;
         inner.serialize(serializer)
+    }
+}
 /// This is a unique identifier for a channel (i.e., port).
 #[derive(Debug, Eq, PartialEq, Clone, Hash, Copy, Ord, PartialOrd)]
@@ @@ -49,9 +61,9 @@ pub enum Polarity { @@
     Getter, // input port (from the perspective of the component)
+}
 #[derive(Eq, PartialEq, Ord, PartialOrd, Hash, Copy, Clone)]
+#[derive(Eq, PartialEq, Ord, PartialOrd, Hash, Copy, Clone, serde::Serialize)]
 #[repr(C)]
-pub struct Port(pub usize); // ports are COPY
+pub struct Port(pub u32); // ports are COPY
 #[derive(Eq, PartialEq, Copy, Clone, Debug)]
 pub enum MainComponentErr {
@@ @@ -157,10 +169,10 @@ impl Debug for Port { @@
+    }
+}
 impl Port {
-    pub fn from_raw(raw: usize) -> Self {
+    pub fn from_raw(raw: u32) -> Self {
         Self(raw)
+    }
-    pub fn to_raw(self) -> usize {
+    pub fn to_raw(self) -> u32 {
         self.0
+    }
     pub fn to_token(self) -> mio::Token {

src/protocol/arena.rs

➞

Show inline comments

@@ new file 100644 @@
 use core::hash::Hash;
 use core::marker::PhantomData;
 #[derive(Debug, serde::Serialize)]
 pub struct Id<T> {
     index: u32,
     _phantom: PhantomData<T>,
+}
 impl<T> Clone for Id<T> {
     fn clone(&self) -> Self {
         *self
+    }
+}
 impl<T> Copy for Id<T> {}
 impl<T> PartialEq for Id<T> {
     fn eq(&self, other: &Self) -> bool {
         self.index.eq(&other.index)
+    }
+}
 impl<T> Eq for Id<T> {}
 impl<T> Hash for Id<T> {
     fn hash<H: std::hash::Hasher>(&self, h: &mut H) {
         self.index.hash(h);
+    }
+}
 pub struct Arena<T> {
     store: Vec<T>,
+}
 impl<T> Arena<T> {
     pub fn new() -> Self {
         Self { store: vec![] }
+    }
     pub fn alloc_with_id(&mut self, f: impl FnOnce(Id<T>) -> T) -> Id<T> {
         use std::convert::TryFrom;
         let id = Id {
             index: u32::try_from(self.store.len()).expect("Out of capacity!"),
             _phantom: Default::default(),
         };
         self.store.push(f(id));
         id
+    }
     pub fn iter(&self) -> impl Iterator<Item = (Id<T>, &T)> {
         (0..).map(|index| Id { index, _phantom: Default::default() }).zip(self.store.iter())
+    }
+}
 impl<T> core::ops::Index<Id<T>> for Arena<T> {
     type Output = T;
     fn index(&self, id: Id<T>) -> &Self::Output {
         self.store.index(id.index as usize)
+    }
+}
 impl<T> core::ops::IndexMut<Id<T>> for Arena<T> {
     fn index_mut(&mut self, id: Id<T>) -> &mut Self::Output {
         self.store.index_mut(id.index as usize)
+    }
+}

src/protocol/ast.rs

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ use std::fmt; @@
 use std::fmt::{Debug, Display, Formatter};
 use std::ops::{Index, IndexMut};
-use id_arena::{Arena, Id};
+use super::arena::{Arena, Id};
 use crate::protocol::inputsource::*;
@@ @@ -39,7 +39,7 @@ impl ExternalIdentifierId { @@
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub struct TypeAnnotationId(Id<TypeAnnotation>);
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize)]
 pub struct VariableId(Id<Variable>);
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ @@ -60,7 +60,7 @@ impl LocalId { @@
+    }
+}
 #[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, serde::Serialize)]
 pub struct DefinitionId(Id<Definition>);
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ @@ -99,7 +99,7 @@ impl PrimitiveId { @@
+    }
+}
 #[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, serde::Serialize)]
 pub struct StatementId(Id<Statement>);
 #[derive(Debug, Clone, Copy, PartialEq)]

src/protocol/eval.rs

➞

Show inline comments

@@ @@ -28,7 +28,7 @@ trait ValueImpl { @@
     fn is_type_compatible(&self, t: &Type) -> bool;
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub enum Value {
     Input(InputValue),
     Output(OutputValue),
@@ @@ -885,7 +885,7 @@ impl Display for Value { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct InputValue(pub Port);
 impl Display for InputValue {
@@ @@ -910,7 +910,7 @@ impl ValueImpl for InputValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct OutputValue(pub Port);
 impl Display for OutputValue {
@@ @@ -935,7 +935,7 @@ impl ValueImpl for OutputValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct MessageValue(pub Option<Payload>);
 impl Display for MessageValue {
@@ @@ -970,7 +970,7 @@ impl ValueImpl for MessageValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct BooleanValue(bool);
 impl Display for BooleanValue {
@@ @@ -999,7 +999,7 @@ impl ValueImpl for BooleanValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct ByteValue(i8);
 impl Display for ByteValue {
@@ @@ -1027,7 +1027,7 @@ impl ValueImpl for ByteValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct ShortValue(i16);
 impl Display for ShortValue {
@@ @@ -1054,7 +1054,7 @@ impl ValueImpl for ShortValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct IntValue(i32);
 impl Display for IntValue {
@@ @@ -1080,7 +1080,7 @@ impl ValueImpl for IntValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct LongValue(i64);
 impl Display for LongValue {
@@ @@ -1105,7 +1105,7 @@ impl ValueImpl for LongValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct InputArrayValue(Vec<InputValue>);
 impl Display for InputArrayValue {
@@ @@ -1139,7 +1139,7 @@ impl ValueImpl for InputArrayValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct OutputArrayValue(Vec<OutputValue>);
 impl Display for OutputArrayValue {
@@ @@ -1173,7 +1173,7 @@ impl ValueImpl for OutputArrayValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct MessageArrayValue(Vec<MessageValue>);
 impl Display for MessageArrayValue {
@@ @@ -1207,7 +1207,7 @@ impl ValueImpl for MessageArrayValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct BooleanArrayValue(Vec<BooleanValue>);
 impl Display for BooleanArrayValue {
@@ @@ -1241,7 +1241,7 @@ impl ValueImpl for BooleanArrayValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct ByteArrayValue(Vec<ByteValue>);
 impl Display for ByteArrayValue {
@@ @@ -1275,7 +1275,7 @@ impl ValueImpl for ByteArrayValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct ShortArrayValue(Vec<ShortValue>);
 impl Display for ShortArrayValue {
@@ @@ -1309,7 +1309,7 @@ impl ValueImpl for ShortArrayValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct IntArrayValue(Vec<IntValue>);
 impl Display for IntArrayValue {
@@ @@ -1343,7 +1343,7 @@ impl ValueImpl for IntArrayValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct LongArrayValue(Vec<LongValue>);
 impl Display for LongArrayValue {
@@ @@ -1377,7 +1377,7 @@ impl ValueImpl for LongArrayValue { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 struct Store {
     map: HashMap<VariableId, Value>,
+}
@@ @@ -1610,7 +1610,7 @@ pub enum EvalContinuation { @@
     Put(Value, Value),
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct Prompt {
     definition: DefinitionId,
     store: Store,

src/protocol/mod.rs

➞

Show inline comments

 mod arena;
 mod ast;
 mod eval;
 pub mod inputsource;
@@ @@ -95,7 +96,7 @@ impl ProtocolDescription for ProtocolDescriptionImpl { @@
+    }
+}
 #[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub struct ComponentStateImpl {
     prompt: Prompt,
+}

src/runtime/mod.rs

➞

Show inline comments

@@ @@ -61,6 +61,9 @@ pub struct Configured { @@
 pub struct Connected {
     native_interface: Vec<(Port, Polarity)>,
     sync_batches: Vec<SyncBatch>,
     // controller is cooperatively scheduled with the native application
     // (except for transport layer behind Endpoints, which are managed by the OS)
     // control flow is passed to the controller during methods on Connector (primarily, connect and sync).
     controller: Controller,
+}
@@ @@ -301,7 +304,8 @@ impl<T> Default for Arena<T> { @@
 impl<T> Arena<T> {
     pub fn alloc(&mut self, t: T) -> Port {
         self.storage.push(t);
         Port::from_raw(self.storage.len() - 1)
         let l: u32 = self.storage.len().try_into().unwrap();
         Port::from_raw(l - 1u32)
+    }
     pub fn get(&self, key: Port) -> Option<&T> {
         self.storage.get(key.to_raw() as usize)
@@ @@ -319,7 +323,7 @@ impl<T> Arena<T> { @@
         self.storage.len()
+    }
     pub fn keyspace(&self) -> impl Iterator<Item = Port> {
-        (0..self.storage.len()).map(Port::from_raw)
+        (0u32..self.storage.len().try_into().unwrap()).map(Port::from_raw)
+    }
+}

0 comments (0 inline, 0 general)