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

Changeset - d9774c9084d7

Parent rev.

Child rev.

[Not reviewed]

4 9 2

Christopher Esterhuyse - 5 years ago 2020-06-30 10:45:50
christopher.esterhuyse@gmail.com

more logging, testing, examples and bugfixes: (1) components remember whether they have submitted a solution; only those are considered when selecting a branch at the end of a round, (2) retrying active connections during setup phase were using the wrong index for looking up their TODO structure, (3) recently failed connections are deregistered from mio and reregistered after the retry process restarts s.t. they don't produce a storm of mio events

4 files changed:

examples/a_swap/amy.c

examples/a_swap/bob.c

examples/eg_protocols.pdl

examples/make.py

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

examples/a_swap/amy.c

➞

Show inline comments

@@ new file 100644 @@
 #include <stdio.h>
 #include <string.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
     if(argc != 3) {
         printf("Expected arg[1] and arg[2] for use as addr str\n");
         exit(1);
+    }
     char * pdl_ptr = buffer_pdl("eg_protocols.pdl");
     size_t pdl_len = strlen(pdl_ptr);
     Arc_ProtocolDescription * pd = protocol_description_parse(pdl_ptr, pdl_len);
     char logpath[] = "./a_amy_log.txt";
     Connector * c = connector_new_logging(pd, logpath, sizeof(logpath)-1);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     PortId ports[6];
     connector_add_port_pair(c, &ports[0], &ports[1]);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     connector_add_net_port(c, &ports[2], argv[1], strlen(argv[1]), Getter, Passive);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     connector_add_net_port(c, &ports[3], argv[2], strlen(argv[2]), Putter, Active);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     connector_add_port_pair(c, &ports[4], &ports[5]);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     // native {0,1,2,3,4,5}
     connector_add_component(c, "together", 8, &ports[1], 4);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     // native {0,5} together {1,2,3,4}
     connector_connect(c, 4000);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	connector_put_bytes(c, ports[0], "hi", 2);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	connector_get(c, ports[5]);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     connector_sync(c, 1000);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	size_t msg_len;
 	const char * msg_ptr = connector_gotten_bytes(c, ports[5], &msg_len);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	printf("Got msg `%.*s`\n", msg_len, msg_ptr);
     protocol_description_destroy(pd);
     connector_destroy(c);
     return 0;
+}
@@ \ No newline at end of file @@

examples/a_swap/bob.c

➞

Show inline comments

@@ new file 100644 @@
 #include <stdio.h>
 #include <string.h>
 #include "../../reowolf.h"
 #include "../utility.c"
 int main(int argc, char** argv) {
     if(argc != 3) {
         printf("Expected arg[1] and arg[2] for use as addr str\n");
         exit(1);
+    }
     char * pdl_ptr = buffer_pdl("eg_protocols.pdl");
     size_t pdl_len = strlen(pdl_ptr);
     Arc_ProtocolDescription * pd = protocol_description_parse(pdl_ptr, pdl_len);
     char logpath[] = "./a_bob_log.txt";
     Connector * c = connector_new_logging(pd, logpath, sizeof(logpath)-1);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     PortId ports[6];
     connector_add_port_pair(c, &ports[0], &ports[1]);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     connector_add_net_port(c, &ports[2], argv[1], strlen(argv[1]), Getter, Passive);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     connector_add_net_port(c, &ports[3], argv[2], strlen(argv[2]), Putter, Active);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     connector_add_port_pair(c, &ports[4], &ports[5]);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     // native {0,1,2,3,4,5}
     connector_add_component(c, "together", 8, &ports[1], 4);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     // native {0,5} together {1,2,3,4}
     connector_connect(c, 4000);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	connector_put_bytes(c, ports[0], "hi", 2);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	connector_get(c, ports[5]);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
     connector_sync(c, 1000);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	size_t msg_len;
 	const char * msg_ptr = connector_gotten_bytes(c, ports[5], &msg_len);
     printf("Error str `%s`\n", reowolf_error_peek(NULL));
 	printf("Got msg `%.*s`\n", msg_len, msg_ptr);
     protocol_description_destroy(pd);
     connector_destroy(c);
     return 0;
+}
@@ \ No newline at end of file @@

examples/eg_protocols.pdl

➞

Show inline comments

 primitive foo(){}
@@ \ No newline at end of file @@
 primitive together(in ia, in ib, out oa, out ob){
   while(true) synchronous() {
     if(fires(ia)) {
       put(oa, get(ia));
       put(ob, get(ib));
+    }
+  }
+}
@@ \ No newline at end of file @@

examples/make.py

➞

Show inline comments

 import os, glob, subprocess
+import os, glob, subprocess, time
 script_path = os.path.dirname(os.path.realpath(__file__));
 for c_file in glob.glob(script_path + "/*/*.c", recursive=False):
   print("compiling", c_file)
     "-o",           # output flag
     c_file[:-2]     # output filename
   ];
   subprocess.run(args);
   subprocess.run(args)
 input("Blocking until newline...");

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)