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

Changeset - 6a7d3acfcb5e

Parent rev.

Child rev.

[Not reviewed]

0 6 0

Christopher Esterhuyse - 5 years ago 2020-10-23 13:57:30
christopher.esterhuyse@gmail.com

logging feature exposed for ease of use

6 files changed with 87 insertions and 11 deletions:

Cargo.toml

README.md

src/macros.rs

src/runtime/communication.rs

src/runtime/mod.rs

src/runtime/tests.rs

0 comments (0 inline, 0 general)

Cargo.toml

➞

Show inline comments

@@ @@ -48,3 +48,4 @@ ffi = [] # see src/ffi/mod.rs @@
 ffi_pseudo_socket_api = ["ffi", "libc", "os_socketaddr"]# see src/ffi/pseudo_socket_api.rs.
 endpoint_logging = [] # see src/macros.rs
 session_optimization = [] # see src/runtime/setup.rs
 no_logging = [] # see src/macros.rs
@@ \ No newline at end of file @@

README.md

➞

Show inline comments

 	- 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.
 . By default, will compile with logging turned ON and session optimization turned OFF. Control this by passing the desired set of feature flags in {"no_logging", "session_optimization"} to the compiler. For example, `cargo build --release --features no_logging`.
 ## Using the library
 - The library may be used as a Rust dependency by adding it as a git dependency, i.e., by adding line `reowolf_rs = { git = "https://scm.cwi.nl/FM/reowolf" }` to downstream crate's manifest file, `Cargo.toml`.

src/macros.rs

➞

Show inline comments

@@ @@ -9,8 +9,9 @@ macro_rules! log { @@
         // }
     }};
     ($logger:expr, $($arg:tt)*) => {{
         // if let Some(w) = $logger.line_writer() {
         //     let _ = writeln!(w, $($arg)*);
         // }
         #[cfg(not(feature = "no_logging"))]
         if let Some(w) = $logger.line_writer() {
             let _ = writeln!(w, $($arg)*);
+        }
     }};
+}

src/runtime/communication.rs

➞

Show inline comments

@@ @@ -72,6 +72,11 @@ impl CuUndecided for ConnectorUnphased { @@
     fn logger_and_protocol_description(&mut self) -> (&mut dyn Logger, &ProtocolDescription) {
         (&mut *self.logger, &self.proto_description)
+    }
     fn logger_and_protocol_components(
         &mut self,
     ) -> (&mut dyn Logger, &mut HashMap<ComponentId, ComponentState>) {
         (&mut *self.logger, &mut self.proto_components)
+    }
     fn logger(&mut self) -> &mut dyn Logger {
         &mut *self.logger
+    }
@@ @@ -274,7 +279,7 @@ impl Connector { @@
             };
             let blocker = component.nonsync_run(&mut ctx, proto_description);
             log!(
-                cu.logger(),
                 logger,
                 "proto component {:?} ran to nonsync blocker {:?}",
                 proto_component_id,
                 &blocker
@@ @@ -452,22 +457,23 @@ impl Connector { @@
             Decision::Success(predicate) => {
                 // commit changes to component states
                 cu.proto_components.clear();
                 cu.proto_components.extend(
                 let (logger, proto_components) = cu.logger_and_protocol_components();
                 proto_components.extend(
                     // "flatten" branching components, committing the speculation
                     // consistent with the predicate decided upon.
                     branching_proto_components
                         .into_iter()
                         .map(|(cid, bpc)| (cid, bpc.collapse_with(&predicate))),
+                        .map(|(cid, bpc)| (cid, bpc.collapse_with(logger, &predicate))),
                 );
                 // commit changes to ports and id_manager
                 cu.ips = rctx.ips;
                 log!(
-                    cu.logger,
                     logger,
                     "End round with (updated) component states {:?}",
-                    cu.proto_components.keys()
                     proto_components.keys()
                 );
                 cu.ips = rctx.ips;
                 // consume native
-                let round_ok = branching_native.collapse_with(&mut *cu.logger(), &predicate);
                 let round_ok = branching_native.collapse_with(cu.logger(), &predicate);
                 Ok(Some(round_ok))
+            }
         };
@@ @@ -972,6 +978,7 @@ impl BranchingNative { @@
                 return RoundEndedNative { batch_index: index, gotten };
+            }
+        }
         log!(logger, "Native had no branches matching pred {:?}", solution_predicate);
         panic!("Native had no branches matching pred {:?}", solution_predicate);
+    }
+}
@@ @@ -1214,7 +1221,11 @@ impl BranchingProtoComponent { @@
     // Given the predicate for the round's solution, collapse this
     // branching native to an ended branch whose predicate is consistent with it.
     fn collapse_with(self, solution_predicate: &Predicate) -> ComponentState {
     fn collapse_with(
         self,
         logger: &mut dyn Logger,
         solution_predicate: &Predicate,
     ) -> ComponentState {
         let BranchingProtoComponent { branches } = self;
         for (branch_predicate, branch) in branches {
             if branch.ended && branch_predicate.assigns_subset(solution_predicate) {
@@ @@ -1222,6 +1233,7 @@ impl BranchingProtoComponent { @@
                 return state;
+            }
+        }
         log!(logger, "ProtoComponent had no branches matching pred {:?}", solution_predicate);
         panic!("ProtoComponent had no branches matching pred {:?}", solution_predicate);
+    }
+}

src/runtime/mod.rs

➞

Show inline comments

@@ @@ -425,6 +425,9 @@ trait CuUndecided { @@
     fn proto_description(&self) -> &ProtocolDescription;
     fn native_component_id(&self) -> ComponentId;
     fn logger_and_protocol_description(&mut self) -> (&mut dyn Logger, &ProtocolDescription);
     fn logger_and_protocol_components(
         &mut self,
     ) -> (&mut dyn Logger, &mut HashMap<ComponentId, ComponentState>);
+}
 // Represents a set of synchronous port operations that the native component

src/runtime/tests.rs

➞

Show inline comments

@@ @@ -1312,6 +1312,58 @@ fn for_msg_byte() { @@
     c.sync(None).unwrap();
+}
 #[test]
 fn eq_causality() {
     let test_log_path = Path::new("./logs/eq_no_causality");
     let pdl = b"
     primitive eq(in a, in b, out c) {
         msg ma = null;
         msg mb = null;
         while(true) synchronous {
             if(fires(a)) {
                 // b and c also fire!
                 // left first!
                 ma = get(a);
                 put(c, ma);
                 mb = get(b);
                 assert(ma == mb);
+            }
+        }
+    }
     ";
     let pd = reowolf::ProtocolDescription::parse(pdl).unwrap();
     let mut c = file_logged_configured_connector(0, test_log_path, Arc::new(pd));
     /*
     [native]p0-->g0[eq]p1--.
                  g1        |
                  ^---------`
     */
     let [p0, g0] = c.new_port_pair();
     let [p1, g1] = c.new_port_pair();
     c.add_component(b"eq", &[g0, g1, p1]).unwrap();
     /*
                   V--------.
                  g2        |
     [native]p2-->g3[eq]p3--`
     */
     let [p2, g2] = c.new_port_pair();
     let [p3, g3] = c.new_port_pair();
     c.add_component(b"eq", &[g3, g2, p3]).unwrap();
     c.connect(None).unwrap();
     for _ in 0..4 {
         // everything is fine with LEFT FIRST
         c.put(p0, TEST_MSG.clone()).unwrap();
         c.sync(MS100).unwrap();
         // no solution when left is NOT FIRST
         c.put(p2, TEST_MSG.clone()).unwrap();
         c.sync(MS100).unwrap_err();
+    }
+}
 #[test]
 fn eq_no_causality() {
     let test_log_path = Path::new("./logs/eq_no_causality");
@@ @@ -1324,6 +1376,8 @@ fn eq_no_causality() { @@
         msg ma = null;
         msg mb = null;
         while(true) synchronous {
             if(fires(a)) {
                 // b and c also fire!
                 if(fires(leftfirsti)) {
                     // left first! DO USE DUMMY
                     ma = get(a);
@@ @@ -1342,6 +1396,7 @@ fn eq_no_causality() { @@
                 assert(ma == mb);
+            }
+        }
+    }
     ";
     let pd = reowolf::ProtocolDescription::parse(pdl).unwrap();
     let mut c = file_logged_configured_connector(0, test_log_path, Arc::new(pd));
@@ @@ -1366,8 +1421,11 @@ fn eq_no_causality() { @@
     c.connect(None).unwrap();
     for _ in 0..32 {
         // ok when they send
         c.put(p0, TEST_MSG.clone()).unwrap();
         c.put(p2, TEST_MSG.clone()).unwrap();
         c.sync(SEC1).unwrap();
         // ok when they don't
         c.sync(SEC1).unwrap();
+    }
+}

0 comments (0 inline, 0 general)