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

Changeset - d5c0b4fdc19b

Parent rev.

Child rev.

[Not reviewed]

0 6 5

Christopher Esterhuyse - 5 years ago 2020-09-29 17:14:41
christopher.esterhuyse@gmail.com

more robust test dir creation

11 files changed with 234 insertions and 6 deletions:

examples/bench_4/main.c

examples/bench_5/main.c

examples/bench_6/main.c

examples/bench_7/main.c

examples/bench_8/main.c

examples/zoop.sh

src/ffi/mod.rs

src/runtime/communication.rs

src/runtime/mod.rs

src/runtime/setup.rs

src/runtime/tests.rs

0 comments (0 inline, 0 general)

examples/bench_4/main.c

➞

Show inline comments

@@ @@ -15,7 +15,8 @@ int main(int argc, char** argv) { @@
 	char logpath[] = "./bench_4.txt";
 	Connector * c = connector_new_logging(pd, logpath, sizeof(logpath)-1);
 	for (i=0; i<proto_components; i++) {
 		connector_add_component(c, "trivial_loop", 12, NULL, 0);
 		char ident[] = "trivial_loop";
 		connector_add_component(c, ident, sizeof(ident)-1, NULL, 0);
 		printf("Error str `%s`\n", reowolf_error_peek(NULL));
+	}
 	connector_connect(c, -1);

examples/bench_5/main.c

➞

Show inline comments

@@ new file 100644 @@
 #include <time.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
 	int i, port_pairs, proto_components;
 	port_pairs = atoi(argv[1]);
 	proto_components = atoi(argv[2]);
 	printf("port_pairs %d, proto_components: %d\n", port_pairs, proto_components);
 	const unsigned char pdl[] =
 	"primitive trivial_loop() {   "
 	"    while(true) synchronous{}"
 	"}                            "
+	;
 	Arc_ProtocolDescription * pd = protocol_description_parse(pdl, sizeof(pdl)-1);
 	char logpath[] = "./bench_5.txt";
 	Connector * c = connector_new_logging(pd, logpath, sizeof(logpath)-1);
 	for (i=0; i<port_pairs; i++) {
 		connector_add_port_pair(c, NULL, NULL);
+	}
 	for (i=0; i<proto_components; i++) {
 		char ident[] = "trivial_loop";
 		connector_add_component(c, ident, sizeof(ident)-1, NULL, 0);
 		printf("Error str `%s`\n", reowolf_error_peek(NULL));
+	}
 	connector_connect(c, -1);
 	printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	clock_t begin = clock();
 	for (i=0; i<1000000; i++) {
 		connector_sync(c, -1);
+	}
 	clock_t end = clock();
 	double time_spent = (double)(end - begin) / CLOCKS_PER_SEC;
 	printf("Time taken: %f\n", time_spent);
 	return 0;
+}
@@ \ No newline at end of file @@

examples/bench_6/main.c

➞

Show inline comments

@@ new file 100644 @@
 #include <time.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
 	int i, self_syncs;
 	self_syncs = atoi(argv[1]);
 	printf("self_syncs %d\n", self_syncs);
 	unsigned char pdl[] = "";
 	Arc_ProtocolDescription * pd = protocol_description_parse(pdl, sizeof(pdl)-1);
 	char logpath[] = "./bench_6.txt";
 	Connector * c = connector_new_logging(pd, logpath, sizeof(logpath)-1);
 	for (i=0; i<self_syncs; i++) {
 		PortId putter, getter;
 		connector_add_port_pair(c, &putter, &getter);
 		char ident[] = "sync"; // defined in reowolf's stdlib
 		connector_add_component(c, ident, sizeof(ident)-1, (PortId[]){getter, putter}, 2);
 		printf("Error str `%s`\n", reowolf_error_peek(NULL));
+	}
 	connector_connect(c, -1);
 	printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	clock_t begin = clock();
 	for (i=0; i<1000000; i++) {
 		connector_sync(c, -1);
+	}
 	clock_t end = clock();
 	double time_spent = (double)(end - begin) / CLOCKS_PER_SEC;
 	printf("Time taken: %f\n", time_spent);
 	return 0;
+}
@@ \ No newline at end of file @@

examples/bench_7/main.c

➞

Show inline comments

@@ new file 100644 @@
 #include <time.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
 	int i, forwards;
 	forwards = atoi(argv[1]);
 	printf("forwards %d\n", forwards);
 	unsigned char pdl[] = "";
 	Arc_ProtocolDescription * pd = protocol_description_parse(pdl, sizeof(pdl)-1);
 	printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	char logpath[] = "./bench_7.txt";
 	Connector * c = connector_new_logging(pd, logpath, sizeof(logpath)-1);
 	PortId native_putter, native_getter;
 	connector_add_port_pair(c, &native_putter, &native_getter);
 	for (i=0; i<forwards; i++) {
 		PortId putter, getter;
 		connector_add_port_pair(c, &putter, &getter);
 		// native ports: {native_putter, native_getter, putter, getter}
 		char ident[] = "forward"; // defined in reowolf's stdlib
 		// thread a forward component onto native_tail
 		connector_add_component(c, ident, sizeof(ident)-1, (PortId[]){native_getter, putter}, 2);
 		// native ports: {native_putter, getter}
 		printf("Error str `%s`\n", reowolf_error_peek(NULL));
 		native_getter = getter;
+	}
 	connector_connect(c, -1);
 	printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	clock_t begin = clock();
 	for (i=0; i<1000000; i++) {
 		char msg[] = "Hello, world!";
 		connector_put_bytes(c, native_putter, msg, sizeof(msg)-1);
 		connector_get(c, native_getter);
 		connector_sync(c, -1);
+	}
 	clock_t end = clock();
 	double time_spent = (double)(end - begin) / CLOCKS_PER_SEC;
 	printf("Time taken: %f\n", time_spent);
 	return 0;
+}
@@ \ No newline at end of file @@

examples/bench_8/main.c

➞

Show inline comments

@@ new file 100644 @@
 #include <time.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
 	int i, forwards;
 	forwards = atoi(argv[1]);
 	printf("forwards %d\n", forwards);
 	unsigned char pdl[] = "";
 	Arc_ProtocolDescription * pd = protocol_description_parse(pdl, sizeof(pdl)-1);
 	printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	char logpath[] = "./bench_8.txt";
 	Connector * c = connector_new_logging(pd, logpath, sizeof(logpath)-1);
 	PortId native_putter, native_getter;
 	connector_add_port_pair(c, &native_putter, &native_getter);
 	for (i=0; i<forwards; i++) {
 		PortId putter, getter;
 		connector_add_port_pair(c, &putter, &getter);
 		// native ports: {native_putter, native_getter, putter, getter}
 		char ident[] = "forward"; // defined in reowolf's stdlib
 		// thread a forward component onto native_tail
 		connector_add_component(c, ident, sizeof(ident)-1, (PortId[]){native_getter, putter}, 2);
 		// native ports: {native_putter, getter}
 		printf("Error str `%s`\n", reowolf_error_peek(NULL));
 		native_getter = getter;
+	}
 	connector_connect(c, -1);
 	printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	size_t msg_len = 0xffff;
 	char * msg = malloc(msg_len);
 	memset(msg, 42, msg_len);
 	clock_t begin = clock();
 	for (i=0; i<1000000; i++) {
 		connector_put_bytes(c, native_putter, msg, msg_len);
 		connector_get(c, native_getter);
 		connector_sync(c, -1);
+	}
 	clock_t end = clock();
 	double time_spent = (double)(end - begin) / CLOCKS_PER_SEC;
 	printf("Time taken: %f\n", time_spent);
 	return 0;
+}
@@ \ No newline at end of file @@

examples/zoop.sh

➞

Show inline comments

@@ new file 100644 @@
 #!/bin/bash
 for syncs in {0..16}
 do
 	./bench_8/main.exe $syncs
 done
@@ \ No newline at end of file @@

src/ffi/mod.rs

➞

Show inline comments

@@ @@ -208,8 +208,12 @@ pub unsafe extern "C" fn connector_add_port_pair( @@
     out_getter: *mut PortId,
 ) {
     let [o, i] = connector.new_port_pair();
     out_putter.write(o);
     out_getter.write(i);
     if !out_putter.is_null() {
         out_putter.write(o);
+    }
     if !out_getter.is_null() {
         out_getter.write(i);
+    }
+}
 /// Given

src/runtime/communication.rs

➞

Show inline comments

@@ @@ -1380,6 +1380,10 @@ impl NonsyncProtoContext<'_> { @@
         for port in moved_ports.iter() {
             self.ips.port_info.map.get_mut(port).unwrap().owner = new_cid;
+        }
         if let Some(set) = self.ips.port_info.owned.get_mut(&self.proto_component_id) {
             set.retain(|x| !moved_ports.contains(x));
+        }
         self.ips.port_info.owned.insert(new_cid, moved_ports.clone());
+    }
     // Facilitates callback from the component to the connector runtime,
@@ @@ -1406,6 +1410,12 @@ impl NonsyncProtoContext<'_> { @@
                 owner: self.proto_component_id,
             },
         );
         self.ips
             .port_info
             .owned
             .entry(self.proto_component_id)
             .or_default()
             .extend([o, i].iter().copied());
         log!(
             self.logger,
             "Component {:?} port pair (out->in) {:?} -> {:?}",

src/runtime/mod.rs

➞

Show inline comments

@@ @@ -317,7 +317,11 @@ struct MyPortInfo { @@
 // useful methods
 #[derive(Default, Debug, Clone, serde::Serialize, serde::Deserialize)]
 struct PortInfoMap {
     // invariant: self.invariant_preserved()
     // `owned` is redundant information, allowing for fast lookup
     // of a component's owned ports (which occurs during the sync round a lot)
     map: HashMap<PortId, PortInfo>,
     owned: HashMap<ComponentId, HashSet<PortId>>,
+}
 // A convenient substructure for containing port info and the ID manager.
@@ @@ -483,7 +487,7 @@ impl<T: std::cmp::Ord> VecSet<T> { @@
+}
 impl PortInfoMap {
     fn ports_owned_by(&self, owner: ComponentId) -> impl Iterator<Item = &PortId> {
-        self.map.iter().filter(move |(_, port_info)| port_info.owner == owner).map(|(port, _)| port)
+        self.owned.get(&owner).into_iter().flat_map(HashSet::iter)
+    }
     fn spec_var_for(&self, port: PortId) -> SpecVar {
         // Every port maps to a speculative variable
@@ @@ -495,6 +499,33 @@ impl PortInfoMap { @@
             Putter => info.peer.unwrap(),
         })
+    }
     fn invariant_preserved(&self) -> bool {
         // for every port P with some owner O,
         // P is in O's owned set
         for (port, info) in self.map.iter() {
             match self.owned.get(&info.owner) {
                 Some(set) if set.contains(port) => {}
                 _ => {
                     println!("{:#?}\n WITH port {:?}", self, port);
                     return false;
+                }
+            }
+        }
         // for every port P owned by every owner O,
         // P's owner is O
         for (&owner, set) in self.owned.iter() {
             for port in set {
                 match self.map.get(port) {
                     Some(info) if info.owner == owner => {}
                     _ => {
                         println!("{:#?}\n WITH owner {:?} port {:?}", self, owner, port);
                         return false;
+                    }
+                }
+            }
+        }
         true
+    }
+}
 impl SpecVarStream {
     fn next(&mut self) -> SpecVar {
@@ @@ -615,6 +646,13 @@ impl Connector { @@
                 polarity: Getter,
             },
         );
         cu.ips
             .port_info
             .owned
             .entry(cu.native_component_id)
             .or_default()
             .extend([o, i].iter().copied());
         log!(cu.logger, "Added port pair (out->in) {:?} -> {:?}", o, i);
         [o, i]
+    }
@@ @@ -665,6 +703,10 @@ impl Connector { @@
                 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());
         Ok(())
+    }
+}

src/runtime/setup.rs

➞

Show inline comments

@@ @@ -131,6 +131,15 @@ impl Connector { @@
                     peer_addr,
                     getter_for_incoming: nin,
                 });
                 // update owned sets
                 cu.ips
                     .port_info
                     .owned
                     .entry(cu.native_component_id)
                     .or_default()
                     .extend([nin, nout].iter().copied());
                 cu.ips.port_info.owned.insert(udp_cid, maplit::hashset! {uin, uout});
                 // Return the native's output, input port pair
                 Ok([nout, nin])
+            }
@@ @@ -175,6 +184,8 @@ impl Connector { @@
                     endpoint_polarity,
                     getter_for_incoming: new_pid,
                 });
                 // update owned set
                 cu.ips.port_info.owned.entry(cu.native_component_id).or_default().insert(new_pid);
                 Ok(new_pid)
+            }
+        }
@@ @@ -240,6 +251,7 @@ impl Connector { @@
                 // Connect procedure successful! Commit changes by...
                 // ... commiting new port info for ConnectorUnphased
                 for (port, info) in extra_port_info.info.drain() {
                     cu.ips.port_info.owned.entry(info.owner).or_default().insert(port);
                     cu.ips.port_info.map.insert(port, info);
+                }
                 for (port, peer) in extra_port_info.peers.drain() {
@@ @@ -1002,6 +1014,7 @@ fn apply_my_optimizations( @@
     } = session_info;
     // simply overwrite the contents
     cu.ips.port_info = port_info;
     assert!(cu.ips.port_info.invariant_preserved());
     cu.proto_components = proto_components;
     cu.proto_description = serde_proto_description.0;
     for (ee, getter) in comm

src/runtime/tests.rs

➞

Show inline comments

@@ @@ -30,9 +30,9 @@ fn file_logged_configured_connector( @@
     dir_path: &Path,
     pd: Arc<ProtocolDescription>,
 ) -> Connector {
-    let _ = std::fs::create_dir(dir_path); // we will check failure soon
+    let _ = std::fs::create_dir_all(dir_path).expect("Failed to create log output dir");
     let path = dir_path.join(format!("cid_{:?}.txt", connector_id));
-    let file = File::create(path).unwrap();
+    let file = File::create(path).expect("Failed to create log output file!");
     let file_logger = Box::new(FileLogger::new(connector_id, file));
     Connector::new(file_logger, pd, connector_id)
+}

0 comments (0 inline, 0 general)