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

Changeset - 466ab31e3998

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Christopher Esterhuyse - 5 years ago 2020-10-29 12:17:22
christopher.esterhuyse@gmail.com

covered corner case: moving a port into a component AFTER you prepare a port operation on it

1 file changed with 11 insertions and 2 deletions:

src/runtime/mod.rs

0 comments (0 inline, 0 general)

src/runtime/mod.rs

➞

Show inline comments

@@ @@ -692,26 +692,35 @@ impl Connector { @@
             if info.polarity != expected_polarity {
                 return Err(Ace::WrongPortPolarity { port, expected_polarity });
+            }
+        }
         // No errors! Time to modify `cu`
         // create a new component and identifier
-        let cu = &mut self.unphased;
+        let Connector { phased, unphased: cu } = self;
         let new_cid = cu.ips.id_manager.new_component_id();
         cu.proto_components.insert(new_cid, cu.proto_description.new_component(identifier, ports));
         // update the ownership of moved ports
         for port in ports.iter() {
             match cu.ips.port_info.map.get_mut(port) {
                 Some(port_info) => port_info.owner = new_cid,
                 None => unreachable!(),
+            }
+        }
         if let Some(set) = cu.ips.port_info.owned.get_mut(&cu.native_component_id) {
             set.retain(|x| !ports.contains(x));
+        }
         cu.ips.port_info.owned.insert(new_cid, ports.iter().copied().collect());
         let moved_port_set: HashSet<PortId> = ports.iter().copied().collect();
         if let ConnectorPhased::Communication(comm) = phased {
             // Preserve invariant: batches only reason about native's ports.
             // Remove batch puts/gets for moved ports.
             for batch in comm.native_batches.iter_mut() {
                 batch.to_put.retain(|port, _| !moved_port_set.contains(port));
                 batch.to_get.retain(|port| !moved_port_set.contains(port));
+            }
+        }
         cu.ips.port_info.owned.insert(new_cid, moved_port_set);
         Ok(())
+    }
+}
 impl Predicate {
     #[inline]
     pub fn singleton(k: SpecVar, v: SpecVal) -> Self {

0 comments (0 inline, 0 general)