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

Changeset - d2cb5e59f7e9

Parent rev.

Child rev.

[Not reviewed]

0 8 0

MH - 4 years ago 2021-12-03 15:45:31
contact@maxhenger.nl

Cleaning up some warnings

8 files changed with 21 insertions and 57 deletions:

src/runtime/branch.rs

src/runtime/connector.rs

src/runtime/consensus.rs

src/runtime/mod.rs

src/runtime/native.rs

src/runtime/scheduler.rs

src/runtime/tests/data_transmission.rs

src/runtime/tests/network_shapes.rs

0 comments (0 inline, 0 general)

src/runtime/branch.rs

➞

Show inline comments

@@ @@ -253,21 +253,12 @@ impl ExecTree { @@
             return Some(branch.next_in_queue);
         } else {
             return None;
+        }
+    }
     /// Returns an iterator that starts with the provided branch, and then
     /// continues to visit all of the branch's parents.
     pub fn iter_parents(&self, branch_id: BranchId) -> BranchParentIter {
         return BranchParentIter{
             branches: self.branches.as_slice(),
             index: branch_id.index as usize,
+        }
+    }
     // --- Preparing and finishing a speculative round
     /// Starts a synchronous round by cloning the non-sync branch and marking it
     /// as the root of the speculative tree. The id of this root sync branch is
     /// returned.
     pub fn start_sync(&mut self) -> BranchId {
@@ @@ -329,32 +320,12 @@ impl IndexMut<BranchId> for ExecTree { @@
     fn index_mut(&mut self, index: BranchId) -> &mut Self::Output {
         debug_assert!(index.is_valid());
         return &mut self.branches[index.index as usize];
+    }
+}
 /// Iterator over the parents of an `ExecTree` branch.
 pub(crate) struct BranchParentIter<'a> {
     branches: &'a [Branch],
     index: usize,
+}
 impl<'a> Iterator for BranchParentIter<'a> {
     type Item = &'a Branch;
     fn next(&mut self) -> Option<Self::Item> {
         if self.index == 0 {
             return None;
+        }
         let branch = &self.branches[self.index];
         self.index = branch.parent_id.index as usize;
         return Some(branch);
+    }
+}
 // -----------------------------------------------------------------------------
 // FakeTree
 // -----------------------------------------------------------------------------
 /// Generic fake branch. This is supposed to be used in conjunction with the
 /// fake tree. The purpose is to have a branching-like tree to use in

src/runtime/connector.rs

➞

Show inline comments

@@ @@ -97,17 +97,17 @@ impl<'a> RunContext for ConnectorRunContext<'a>{ @@
             PreparedStatement::None => None,
             PreparedStatement::PerformedGet(value) => Some(value),
             taken => unreachable!("prepared statement is '{:?}' during 'performed_get()'", taken),
         };
+    }
     fn fires(&mut self, port: PortId) -> Option<Value> {
         todo!("Remove fires() now");
         let port_id = PortIdLocal::new(port.id);
         let annotation = self.consensus.get_annotation(self.branch_id, port_id);
         return annotation.expected_firing.map(|v| Value::Bool(v));
     fn fires(&mut self, _port: PortId) -> Option<Value> {
         todo!("Remove fires() now")
         // let port_id = PortIdLocal::new(port.id);
         // let annotation = self.consensus.get_annotation(self.branch_id, port_id);
         // return annotation.expected_firing.map(|v| Value::Bool(v));
+    }
     fn created_channel(&mut self) -> Option<(Value, Value)> {
         return match self.prepared.take() {
             PreparedStatement::None => None,
             PreparedStatement::CreatedChannel(ports) => Some(ports),

src/runtime/consensus.rs

➞

Show inline comments

@@ @@ -118,19 +118,12 @@ impl Consensus { @@
     /// Returns whether the consensus algorithm is running in sync mode
     pub fn is_in_sync(&self) -> bool {
         return !self.branch_annotations.is_empty();
+    }
     #[deprecated]
     pub fn get_annotation(&self, branch_id: BranchId, channel_id: PortIdLocal) -> &ChannelAnnotation {
         let branch = &self.branch_annotations[branch_id.index as usize];
         let port = branch.channel_mapping.iter().find(|v| v.channel_id.index == channel_id.index).unwrap();
         return port;
+    }
     /// Sets up the consensus algorithm for a new synchronous round. The
     /// provided ports should be the ports the component owns at the start of
     /// the sync round.
     pub fn start_sync(&mut self, ctx: &ComponentCtx) {
         debug_assert!(!self.highest_connector_id.is_valid());
         debug_assert!(self.branch_annotations.is_empty());
@@ @@ -298,18 +291,18 @@ impl Consensus { @@
         let maybe_conclusion = self.send_to_leader_or_handle_as_leader(SyncCompContent::LocalSolution(local_solution), ctx);
         return maybe_conclusion;
+    }
     /// Notifies the consensus algorithm about the chosen branch to commit to
     /// memory (may be the invalid "start" branch)
-    pub fn end_sync(&mut self, branch_id: BranchId, final_ports: &mut Vec<ComponentPortChange>) {
+    pub fn end_sync(&mut self, branch_id: BranchId, _final_ports: &mut Vec<ComponentPortChange>) {
         debug_assert!(self.is_in_sync());
         // TODO: Handle sending and receiving ports
         // Set final ports
-        let branch = &self.branch_annotations[branch_id.index as usize];
+        let _branch = &self.branch_annotations[branch_id.index as usize];
         // Clear out internal storage to defaults
         println!("DEBUG: ***** Incrementing sync round stuff");
         self.highest_connector_id = ConnectorId::new_invalid();
         self.branch_annotations.clear();
         self.branch_markers.clear();
@@ @@ -349,13 +342,13 @@ impl Consensus { @@
         // Check for ports that are being sent
         debug_assert!(self.workspace_ports.is_empty());
         find_ports_in_value_group(content, &mut self.workspace_ports);
         if !self.workspace_ports.is_empty() {
             todo!("handle sending ports");
             self.workspace_ports.clear();
+            // self.workspace_ports.clear();
+        }
         // Construct data header
         let data_header = DataHeader{
             expected_mapping: branch.channel_mapping.iter()
                 .filter(|v| v.registered_id.is_some() || v.channel_id == port_info.channel_id)
@@ @@ -551,13 +544,13 @@ impl Consensus { @@
                 // Check for sent ports
                 debug_assert!(self.workspace_ports.is_empty());
                 find_ports_in_value_group(&message.content, &mut self.workspace_ports);
                 if !self.workspace_ports.is_empty() {
                     todo!("handle received ports");
                     self.workspace_ports.clear();
+                    // self.workspace_ports.clear();
+                }
                 return;
+            }
+        }

src/runtime/mod.rs

➞

Show inline comments

@@ @@ -277,13 +277,13 @@ impl RuntimeInner { @@
     /// Sends a message directly (without going through the port) to a
     /// component. This is slightly less efficient then sending over a port, but
     /// might be preferable for some algorithms. If the component was sleeping
     /// then it is scheduled for execution.
     pub(crate) fn send_message_maybe_destroyed(&self, target_id: ConnectorId, message: Message) -> bool {
         let target = {
-            let mut lock = self.connectors.read().unwrap();
             let lock = self.connectors.read().unwrap();
             lock.get(target_id.index)
         };
         // Do a CAS on the number of users. Most common case the component is
         // alive and we're the only one sending the message. Note that if we
         // finish this block, we're sure that no-one has set the `num_users`

src/runtime/native.rs

➞

Show inline comments

@@ @@ -112,16 +112,16 @@ impl ConnectorApplication { @@
         while let Some(ticket) = comp_ctx.get_next_message_ticket() {
             let message = comp_ctx.read_message_using_ticket(ticket);
             if let Message::Data(_) = message {
                 self.handle_new_data_message(ticket, comp_ctx)
             } else {
                 match comp_ctx.take_message_using_ticket(ticket) {
-                    Message::Data(message) => unreachable!(),
+                    Message::Data(_message) => unreachable!(),
                     Message::SyncComp(message) => self.handle_new_sync_comp_message(message, comp_ctx),
                     Message::SyncPort(message) => self.handle_new_sync_port_message(message, comp_ctx),
-                    Message::SyncControl(message) => todo!("implement"),
+                    Message::SyncControl(_message) => todo!("implement"),
                     Message::Control(_) => unreachable!("control message in native API component"),
+                }
+            }
+        }
+    }
@@ @@ -176,13 +176,13 @@ impl ConnectorApplication { @@
         if branch_id.is_none() {
             return ConnectorScheduling::NotNow;
+        }
         let branch_id = branch_id.unwrap();
         let branch = &mut self.tree[branch_id];
-        let mut instruction_idx = self.branch_extra[branch_id.index as usize];
         let instruction_idx = self.branch_extra[branch_id.index as usize];
         if instruction_idx >= self.sync_desc.len() {
             // Performed last instruction, so this branch is officially at the
             // end of the synchronous interaction.
             let consistency = self.consensus.notify_of_finished_branch(branch_id);
             if consistency == Consistency::Valid {
@@ @@ -271,13 +271,13 @@ impl ConnectorApplication { @@
+                }
                 ApplicationJob::NewConnector(connector, initial_ports) => {
                     comp_ctx.push_component(connector, initial_ports);
                     return ConnectorScheduling::Later;
                 },
-                ApplicationJob::SyncRound(mut description) => {
                 ApplicationJob::SyncRound(description) => {
                     // Entering sync mode
                     comp_ctx.notify_sync_start();
                     self.sync_desc = description;
                     self.is_in_sync = true;
                     debug_assert!(self.last_finished_handled.is_none());
                     debug_assert!(self.branch_extra.len() == 1);

src/runtime/scheduler.rs

➞

Show inline comments

@@ @@ -904,14 +904,14 @@ impl ControlMessageHandler { @@
                     _ => unreachable!(),
                 };
                 return Some(new_component_entry.component_key);
             },
             None => {
                 todo!("handling of nefarious ACKs");
                 return None;
                 todo!("handling of nefarious ACKs")
                 // return None;
             },
+        }
+    }
     /// Retrieves the number of responses we still expect to receive from our
     /// peers

src/runtime/tests/data_transmission.rs

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ fn test_doing_nothing() { @@
         while (index < loops) {
             sync { index += 1; }
+        }
+    }
     ";
-    let thing = TestTimer::new("doing_nothing");
+    let _timer = TestTimer::new("doing_nothing");
     run_test_in_runtime(CODE, |api| {
         api.create_connector("", "silent_willy", ValueGroup::new_stack(vec![
             Value::UInt32(NUM_LOOPS),
         ])).expect("create component");
     });
+}
@@ @@ -47,13 +47,13 @@ fn test_single_put_and_get() { @@
+            }
             index += 1;
+        }
+    }
     ";
-    let thing = TestTimer::new("single_put_and_get");
+    let _timer = TestTimer::new("single_put_and_get");
     run_test_in_runtime(CODE, |api| {
         let channel = api.create_channel().unwrap();
         api.create_connector("", "putter", ValueGroup::new_stack(vec![
             Value::Output(PortId::new(channel.putter_id.index)),
             Value::UInt32(NUM_LOOPS)
@@ @@ -127,13 +127,13 @@ fn test_multi_put_and_get() { @@
+            }
             loop_index += 1;
+        }
+    }
     ";
-    let thing = TestTimer::new("multi_put_and_get");
+    let _timer = TestTimer::new("multi_put_and_get");
     run_test_in_runtime(CODE, |api| {
         let channel = api.create_channel().unwrap();
         api.create_connector("", "putter_static", ValueGroup::new_stack(vec![
             Value::Output(PortId::new(channel.putter_id.index)),
             Value::UInt32(NUM_LOOPS),
         ])).unwrap();

src/runtime/tests/network_shapes.rs

➞

Show inline comments

@@ @@ -55,13 +55,13 @@ fn test_star_shaped_request() { @@
+        }
         new center(requests, responses, num_loops);
+    }
     ";
-    let thing = TestTimer::new("star_shaped_request");
+    let _timer = TestTimer::new("star_shaped_request");
     run_test_in_runtime(CODE, |api| {
         api.create_connector("", "constructor", ValueGroup::new_stack(vec![
             Value::UInt32(5),
             Value::UInt32(NUM_LOOPS),
         ])).expect("create connector");
     });
@@ @@ -132,13 +132,13 @@ fn test_conga_line_request() { @@
+        }
         new end(last_req_in, last_resp_out, num_loops);
+    }
     ";
-    let thing = TestTimer::new("conga_line_request");
+    let _timer = TestTimer::new("conga_line_request");
     run_test_in_runtime(CODE, |api| {
         api.create_connector("", "constructor", ValueGroup::new_stack(vec![
             Value::UInt32(1),
             Value::UInt32(NUM_LOOPS)
         ])).expect("create connector");
     });

0 comments (0 inline, 0 general)