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

Changeset - 49b9c766fe5a

Parent rev.

Child rev.

[Not reviewed]

3 5 3

Christopher Esterhuyse - 5 years ago 2020-02-10 11:35:57
christopheresterhuyse@gmail.com

tracking new channel ekeys

11 files changed with 124 insertions and 76 deletions:

examples/0_forward/alice

bin+new file

examples/0_forward/alice.c

examples/0_forward/alice.exe

bin+del

examples/0_forward/bob

bin+new file

examples/0_forward/bob.c

examples/0_forward/bob.exe

bin+del

examples/0_forward/make.sh

examples/0_forward/reowolf_rs.dll

bin+del

examples/check.c

src/runtime/communication.rs

src/test/connector.rs

0 comments (0 inline, 0 general)

examples/0_forward/alice

➞

Show inline comments

		new file 100755
		binary diff not shown

examples/0_forward/alice.c

➞

Show inline comments

 #include <stdio.h>
 #include <string.h>
 #include "../../reowolf.h"
 #include "../check.c"
 int main() {
 	// ALICE
 	char* pdl ="\
 	primitive forward(in i, out o) {\
 		while(true) synchronous {\
 			put(o, get(i));\
 		}\
 	}";
 int main() { // ALICE
 	char* pdl =
 	"primitive forward(in i, out o) {"
 	"	while(true) synchronous {"
 	"		put(o, get(i));"
 	"	}"
 	"}"
+	;
 	char msg_buf[128];
 	memset(msg_buf, 0, 128);
 	printf("input a message to send:");
 	if (fgets(msg_buf, 128-1, stdin) == NULL) {
 		printf("LINE READ BAD\n");
 		return 1;
+	}
 	check("fgets", fgets(msg_buf, 128-1, stdin) == NULL);
 	int msg_len = strlen(msg_buf);
 	msg_buf[msg_len-1] = 0;
 	printf("sending msg `%s`\n", msg_buf);
 	Connector* c = connector_new();
 	if (connector_configure(c, pdl, "forward")) {
 		printf("CONFIG FAILED: %s\n", connector_error_peek());
 		return 1;
+	}
 	if (connector_bind_native(c, 0)) {
 		printf("BIND0 FAILED: %s\n", connector_error_peek());
 		return 1;
+	}
 	if (connector_bind_passive(c, 1, "127.0.0.1:7000")) {
 		printf("BIND1 FAILED: %s\n", connector_error_peek());
 		return 1;
+	}
 	printf("connecting... \n");
 	if (connector_connect(c, 10000)) {
 		printf("CONNECT FAILED: %s\n", connector_error_peek());
 		return 1;
+	}
 	check("config ", connector_configure(c, pdl, "forward"));
 	check("bind 0 ", connector_bind_native(c, 0));
 	check("bind 1 ", connector_bind_passive(c, 1, "127.0.0.1:7000"));
 	check("connect", connector_connect(c, 10000));
 	int i;
 	for (i = 0; i < 3; i++) {
 		if (connector_put(c, 0, msg_buf, msg_len)) {
 			printf("CONNECT PUT: %s\n", connector_error_peek());
 			return 1;
+		}
 		if (connector_sync(c, 10000)) {
 			printf("SYNC FAILED: %s\n", connector_error_peek());
 			return 1;
+		}
 		check("put ", connector_put(c, 0, msg_buf, msg_len));
 		check("sync", connector_sync(c, 10000));
 		printf("SEND OK\n");
+	}
 	printf("OK\n");
 	connector_destroy(c);
 	return 0;

examples/0_forward/alice.exe

➞

Show inline comments

		deleted file
		binary diff not shown

examples/0_forward/bob

➞

Show inline comments

		new file 100755
		binary diff not shown

examples/0_forward/bob.c

➞

Show inline comments

 #include <stdio.h>
 #include "../../reowolf.h"
 #include "../check.c"
 int main() {
 	char* pdl ="\
 	primitive forward(in i, out o) {\
 		while(true) synchronous {\
 			put(o, get(i));\
 		}\
 	}";
 	// BOB
 	Connector* c = connector_new();
 	if (connector_configure(c, pdl, "forward")) {
 		printf("CONFIG FAILED: %s\n", connector_error_peek());
 		return 1;
+	}
 	if (connector_bind_active(c, 0, "127.0.0.1:7000")) {
 		printf("BIND0 FAILED: %s\n", connector_error_peek());
 		return 1;
+	}
 	if (connector_bind_native(c, 1)) {
 		printf("BIND1 FAILED: %s\n", connector_error_peek());
 		return 1;
+	}
 	printf("connecting... \n");
 	if (connector_connect(c, 10000)) {
 		printf("CONNECT FAILED: %s\n", connector_error_peek());
 		return 1;
+	}
 	check("config ", connector_configure(c, pdl, "forward"));
 	check("bind 0 ", connector_bind_active(c, 0, "127.0.0.1:7000"));
 	check("bind 1 ", connector_bind_native(c, 1));
 	check("connect", connector_connect(c, 10000));
 	int i;
 	for (i = 0; i < 3; i++) {
 		if (connector_get(c, 0)) {
 			printf("CONNECT GET: %s\n", connector_error_peek());
 			return 1;
+		}
 		if (connector_sync(c, 10000)) {
 			printf("SYNC FAILED: %s\n", connector_error_peek());
 			return 1;
+		}
 		check("get ", connector_get(c, 0));
 		check("sync", connector_sync(c, 10000));
 		int msg_len;
 		const unsigned char * msg;
 		if (connector_gotten(c, 0, &msg, &msg_len)) {
 			printf("READ FAILED: %s\n", connector_error_peek());
 			return 1;
+		}
 		check("read", connector_gotten(c, 0, &msg, &msg_len));
 		printf("received: `%s`\n", msg);
+	}
 	printf("OK\n");
 	connector_destroy(c);
 	return 0;

examples/0_forward/bob.exe

➞

Show inline comments

		deleted file
		binary diff not shown

examples/0_forward/make.sh

➞

Show inline comments

@@ modified file chmod 100644 => 100755 @@
 echo "MAKING!"
 gcc main.c -L ../../target/release -lreowolf_rs -o main
 echo "DONE!"
 #!/bin/sh
 LIB_PATH="../../target/release"
 gcc -L $LIB_PATH -lreowolf_rs -Wl,-R$LIB_PATH alice.c -o alice
 gcc -L $LIB_PATH -lreowolf_rs -Wl,-R$LIB_PATH bob.c -o bob

examples/0_forward/reowolf_rs.dll

➞

Show inline comments

		deleted file
		binary diff not shown

examples/check.c

➞

Show inline comments

@@ new file 100644 @@
 void check(const char* phase, int err) {
 	if (err) {
 		printf("ERR %d in phase `%s`. Err was `%s`\nEXITING!\n",
 			err, phase, connector_error_peek());
 		exit(1);
+	}
+}
@@ \ No newline at end of file @@

src/runtime/communication.rs

➞

Show inline comments

@@ @@ -517,12 +517,14 @@ impl MonoContext for MonoPContext<'_> { @@
             endpoint: a,
         });
         let kg = self.inner.endpoint_exts.alloc(EndpointExt {
             info: EndpointInfo { polarity: Putter, channel_id },
             endpoint: b,
         });
         self.ekeys.insert(kp);
         self.ekeys.insert(kg);
         log!(
             &mut self.inner.logger,
             "!! MonoContext callback to new_channel. returning ekeys {:?}!",
             [kp, kg],
         );
         [kp, kg]

src/test/connector.rs

➞

Show inline comments

@@ @@ -16,12 +16,23 @@ primitive forward(in i, out o) { @@
+}
 primitive sync(in i, out o) {
     while(true) synchronous {
         if (fires(i)) put(o, get(i));
+    }
+}
 primitive fifo_1(in i, out o) {
     msg holding = null;
     while(true) synchronous {
         if (holding == null && fires(i)) {
             holding = get(i);
         } else if (holding != null && fires(o)) {
             put(o, holding);
             holding = null;
+        }
+    }
+}
 primitive alternator_2(in i, out a, out b) {
     while(true) {
         synchronous { put(a, get(i)); }
         synchronous { put(b, get(i)); }
+    }
+}
@@ @@ -43,20 +54,19 @@ primitive forward_nonzero(in i, out o) { @@
+}
 primitive token_spout(out o) {
     while(true) synchronous {
         put(o, create(0));
+    }
+}
 primitive wait_10(out o) {
     int i = 0;
     while(i < 10) {
         synchronous {}
         i += 1;
+    }
 primitive wait_n(int to_wait, out o) {
     while(to_wait > 0) synchronous() to_wait -= 1;
     synchronous { put(o, create(0)); }
+}
 composite wait_10(out o) {
     new wait_n(10, o);
+}
 ";
 #[test]
 fn connects_ok() {
     // Test if we can connect natives using the given PDL
     /*
@@ @@ -370,12 +380,79 @@ fn getter_determines() { @@
                 assert_eq!(Ok(MSG), x.read_gotten(0));
+            }
         },
     ]));
+}
 #[test]
 fn fifo_2() {
     // Test a deterministic system which
     // alternates sending Sender's messages to A or B
     /*                    /--|-->A
     Sender -->alternator_2
                           \--|-->B
     */
     let timeout = Duration::from_millis(1_500);
     let addrs = [next_addr(), next_addr()];
     const N: usize = 5;
     static MSG: &[u8] = b"message";
     assert!(run_connector_set(&[
         //
         &|x| {
             // Sender
             x.configure(PDL, b"alternator_2").unwrap();
             x.bind_port(0, Native).unwrap();
             x.bind_port(1, Passive(addrs[0])).unwrap();
             x.bind_port(2, Passive(addrs[1])).unwrap();
             x.connect(timeout).unwrap();
             for _ in 0..N {
                 for _ in 0..2 {
                     x.put(0, MSG.to_vec()).unwrap();
                     assert_eq!(0, x.sync(timeout).unwrap());
+                }
+            }
         },
         &|x| {
             // A
             x.configure(PDL, b"sync").unwrap();
             x.bind_port(0, Active(addrs[0])).unwrap();
             x.bind_port(1, Native).unwrap();
             x.connect(timeout).unwrap();
             for _ in 0..N {
                 // get msg round
                 x.get(0).unwrap();
                 assert_eq!(Ok(0), x.sync(timeout)); // GET ONE
                 assert_eq!(Ok(MSG), x.read_gotten(0));
                 // silent round
                 assert_eq!(Ok(0), x.sync(timeout)); // MISS ONE
                 assert_eq!(Err(ReadGottenErr::DidNotGet), x.read_gotten(0));
+            }
         },
         &|x| {
             // B
             x.configure(PDL, b"sync").unwrap();
             x.bind_port(0, Active(addrs[1])).unwrap();
             x.bind_port(1, Native).unwrap();
             x.connect(timeout).unwrap();
             for _ in 0..N {
                 // silent round
                 assert_eq!(Ok(0), x.sync(timeout)); // MISS ONE
                 assert_eq!(Err(ReadGottenErr::DidNotGet), x.read_gotten(0));
                 // get msg round
                 x.get(0).unwrap();
                 assert_eq!(Ok(0), x.sync(timeout)); // GET ONE
                 assert_eq!(Ok(MSG), x.read_gotten(0));
+            }
         },
     ]));
+}
 #[test]
 fn alternator_2() {
     // Test a deterministic system which
     // alternates sending Sender's messages to A or B
     /*                    /--|-->A
     Sender -->alternator_2

0 comments (0 inline, 0 general)