Merge pull request #47 from lf-lang/remove-workspace

Remove creusot sources and merge back vecmap into main runtime crate

Author: cmnrd

Cargo.toml

@@ -1,10 +1,64 @@
-[workspace]
+[package]
+name = "reactor_rt"
+version = "0.1.0"
+authors = ["Clément Fournier <[email protected]>"]
+edition = "2021"
 
-members = [
-    "runtime",
-    "vecmap",
-]
-exclude = [ "vecmap/creusot" ]
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[profile.bench]
-debug = true
+[dependencies]
+log = "0.4"
+index_vec = "0.1"
+#itertools = "0.10.1"
+#bit-set = "0.5"
+smallvec = { version = "1.10", features = ["const_generics"] }
+petgraph = "0.6"
+array-macro = "2.1"
+atomic_refcell = "0.1"
+crossbeam-utils = "0.8"
+crossbeam-channel = { git = "https://github.com/oowekyala/crossbeam.git", rev = "9eed66904f969156dedad4eef61ce91d23b9cccb" }
+static_assertions = "1.1.0"
+rayon = { version = "1.5", optional = true }
+cfg-if = "1.0.0"
+
+[dev-dependencies]
+criterion = "0.3"
+env_logger = "0.9"
+assert_matches = "1.5"
+dmsort = "1.0.1"
+
+[features]
+default=["vec-id-sets"]
+# Enable the parallel runtime implementation todo make default
+parallel-runtime=["rayon"]
+# Enables 64-bit wide reaction ids on 64 bit architectures.
+# This may reduce performance, but allows for 2^32 reactor
+# instances compared to the default of 2^16, which may feel
+# a bit tight for some applications.
+wide-ids=[]
+vec-id-sets=[]
+no-unsafe=[]
+# used internally for benchmarking, to access private APIs
+public-internals=[]
+
+[[bench]]
+name = "savina_pong"
+harness = false
+
+[[bench]]
+name = "global_id"
+path = "benches/micro/global_id.rs"
+required-features = ["public-internals"]
+harness = false
+
+[[bench]]
+name = "dmsort"
+path = "benches/micro/dmsort.rs"
+required-features = ["public-internals"]
+harness = false
+
+[[bench]]
+name = "exec_reactions"
+path = "benches/micro/exec_reactions.rs"
+required-features = ["public-internals"]
+harness = false

runtime/benches/README.md benches/README.mdruntime/benches/README.md renamed to benches/README.md

@@ -453,7 +453,7 @@ mod reactors {
         impl ::reactor_rt::assembly::ReactorInitializer for SavinaPongAdapter {
             type Wrapped = SavinaPong;
             type Params = SavinaPongParams;
-            const MAX_REACTION_ID: ::reactor_rt::LocalReactionId = ::reactor_rt::LocalReactionId::new(1 - 1);
+            const MAX_REACTION_ID: ::reactor_rt::LocalReactionId = ::reactor_rt::LocalReactionId::new(0);
 
             fn assemble(
                 __params: Self::Params,

runtime/benches/SavinaPong.lf benches/SavinaPong.lfruntime/benches/SavinaPong.lf renamed to benches/SavinaPong.lf

@@ -116,7 +116,7 @@ impl<T: Sync, K> ReactionTrigger<T> for Action<K, T> {
 #[cfg(not(feature = "no-unsafe"))]
 impl<T: Sync, K> triggers::ReactionTriggerWithRefAccess<T> for Action<K, T> {
     fn get_value_ref(&self, now: &EventTag, _start: &Instant) -> Option<&T> {
-        self.map.get(&Reverse(*now)).map(|a| a.as_ref()).flatten()
+        self.map.get(&Reverse(*now)).and_then(|a| a.as_ref())
     }
 }