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

Changeset - 7c5078fc4f81

Parent rev.

Child rev.

[Not reviewed]

0 4 0

MH - 3 years ago 2022-05-14 19:21:46
contact@maxhenger.nl

Rename Cmd in std.internet to ClientCmd, fix port transfer bug

4 files changed with 19 insertions and 19 deletions:

src/runtime2/component/component.rs

src/runtime2/tests/internet.rs

src/runtime2/tests/mod.rs

std/std.internet.pdl

0 comments (0 inline, 0 general)

src/runtime2/component/component.rs

➞

Show inline comments

@@ @@ -905,14 +905,14 @@ pub(crate) fn special_create_component( @@
     let created_component = &mut created_runtime_component.component;
     created_component.on_creation(created_key.downgrade(), sched_ctx);
     // Transfer messages and link instantiator to created component
     for pair in port_pairs.iter() {
         instantiator_ctx.change_port_peer(sched_ctx, pair.instantiator_handle, None);
         instantiator_ctx.remove_port(pair.instantiator_handle);
         transfer_messages(inbox_main, inbox_backup, pair, instantiator_ctx, created_ctx, created_component.as_mut());
         instantiator_ctx.remove_port(pair.instantiator_handle);
         let created_port_info = created_ctx.get_port(pair.created_handle);
         if pair.is_open && created_port_info.peer_comp_id == instantiator_ctx.id {
             // Set up channel between instantiator component port, and its peer,
             // which is owned by the new component
             let instantiator_port_handle = instantiator_ctx.get_port_handle(created_port_info.peer_port_id);
@@ @@ -1072,14 +1072,14 @@ pub(crate) fn perform_create_component( @@
     // that belong to the new component. At the same time we'll take care of
     // setting the correct peer of the instantiator component
     for pair in port_pairs.iter() {
         // Transferring the messages and removing the port from the
         // instantiator component
         instantiator_ctx.change_port_peer(sched_ctx, pair.instantiator_handle, None);
         instantiator_ctx.remove_port(pair.instantiator_handle);
         transfer_messages(inbox_main, inbox_backup, pair, instantiator_ctx, created_ctx, created_component.as_mut());
         instantiator_ctx.remove_port(pair.instantiator_handle);
         // Here we take care of the case where the instantiator previously owned
         // both ends of the channel, but has transferred one port to the new
         // component (hence creating a channel between the instantiator
         // component and the new component).
         let created_port_info = created_ctx.get_port(pair.created_handle);

src/runtime2/tests/internet.rs

➞

Show inline comments

@@ @@ -14,48 +14,48 @@ fn test_stdlib_file() { @@
         sync put(tx, inet::TcpConnection{
             tx: cmd_tx,
             rx: data_rx,
         });
+    }
-    comp fake_socket(in<inet::Cmd> cmds, out<u8[]> tx) {
+    comp fake_socket(in<inet::ClientCmd> cmds, out<u8[]> tx) {
         auto to_send = {};
         auto shutdown = false;
         while (!shutdown) {
             auto keep_going = true;
             sync {
                 while (keep_going) {
                     auto cmd = get(cmds);
-                    if (let inet::Cmd::Send(data) = cmd) {
+                    if (let inet::ClientCmd::Send(data) = cmd) {
                         to_send = data;
                         keep_going = false;
-                    } else if (let inet::Cmd::Receive = cmd) {
+                    } else if (let inet::ClientCmd::Receive = cmd) {
                         put(tx, to_send);
-                    } else if (let inet::Cmd::Finish = cmd) {
+                    } else if (let inet::ClientCmd::Finish = cmd) {
                         keep_going = false;
-                    } else if (let inet::Cmd::Shutdown = cmd) {
+                    } else if (let inet::ClientCmd::Shutdown = cmd) {
                         keep_going = false;
                         shutdown = true;
+                    }
+                }
+            }
+        }
+    }
     comp fake_client(inet::TcpConnection conn) {
-        sync put(conn.tx, inet::Cmd::Send({1, 3, 3, 7}));
+        sync put(conn.tx, inet::ClientCmd::Send({1, 3, 3, 7}));
         sync {
-            put(conn.tx, inet::Cmd::Receive);
+            put(conn.tx, inet::ClientCmd::Receive);
             auto val = get(conn.rx);
             while (val[0] != 1 || val[1] != 3 || val[2] != 3 || val[3] != 7) {
                 print(\"this is going very wrong\");
+            }
-            put(conn.tx, inet::Cmd::Finish);
+            put(conn.tx, inet::ClientCmd::Finish);
+        }
-        sync put(conn.tx, inet::Cmd::Shutdown);
+        sync put(conn.tx, inet::ClientCmd::Shutdown);
+    }
     comp constructor() {
         channel conn_tx -> conn_rx;
         new fake_listener_once(conn_tx);

src/runtime2/tests/mod.rs

➞

Show inline comments

@@ @@ -163,23 +163,23 @@ fn test_random_u32_temporary_thingo() { @@
 #[test]
 fn test_tcp_socket_http_request() {
     let _pd = ProtocolDescription::parse(b"
     import std.internet::*;
-    comp requester(out<Cmd> cmd_tx, in<u8[]> data_rx) {
+    comp requester(out<ClientCmd> cmd_tx, in<u8[]> data_rx) {
         print(\"*** TCPSocket: Sending request\");
         sync {
-            put(cmd_tx, Cmd::Send(b\"GET / HTTP/1.1\\r\\n\\r\\n\"));
+            put(cmd_tx, ClientCmd::Send(b\"GET / HTTP/1.1\\r\\n\\r\\n\"));
+        }
         print(\"*** TCPSocket: Receiving response\");
         auto buffer = {};
         auto done_receiving = false;
         sync while (!done_receiving) {
-            put(cmd_tx, Cmd::Receive);
+            put(cmd_tx, ClientCmd::Receive);
             auto data = get(data_rx);
             buffer @= data;
             // Completely crap detection of end-of-document. But here we go, we
             // try to detect the trailing </html>. Proper way would be to parse
             // for 'content-length' or 'content-encoding'
@@ @@ -198,36 +198,36 @@ fn test_tcp_socket_http_request() { @@
                     auto c7 = data[index + 6];
                     if ( // i.e. if (data[index..] == '</html>'
                         c2 == cast('/') && c3 == cast('h') && c4 == cast('t') &&
                         c5 == cast('m') && c6 == cast('l') && c7 == cast('>')
                     ) {
                         print(\"*** TCPSocket: Detected </html>\");
-                        put(cmd_tx, Cmd::Finish);
+                        put(cmd_tx, ClientCmd::Finish);
                         done_receiving = true;
+                    }
+                }
                 index += 1;
+            }
+        }
         print(\"*** TCPSocket: Requesting shutdown\");
         sync {
-            put(cmd_tx, Cmd::Shutdown);
+            put(cmd_tx, ClientCmd::Shutdown);
+        }
+    }
     comp main() {
         channel cmd_tx -> cmd_rx;
         channel data_tx -> data_rx;
         new tcp_client({142, 250, 179, 163}, 80, cmd_rx, data_tx); // port 80 of google
         new requester(cmd_tx, data_rx);
+    }
     ").expect("compilation");
     // This test is disabled because it performs a HTTP request to google.
-    // let rt = Runtime::new(1, true, pd).unwrap();
+    // let rt = Runtime::new(1, LOG_LEVEL, _pd).unwrap();
     // create_component(&rt, "", "main", no_args());
+}
 #[test]
 fn test_sending_receiving_union() {
     let pd = ProtocolDescription::parse(b"

std/std.internet.pdl

➞

Show inline comments

@@ @@ -4,23 +4,23 @@ union ClientCmd { @@
     Send(u8[]),
     Receive,
     Finish,
     Shutdown,
+}
-comp tcp_client(u8[] ip, u16 port, in<Cmd> cmds, out<u8[]> rx) {
+comp tcp_client(u8[] ip, u16 port, in<ClientCmd> cmds, out<u8[]> rx) {
     #builtin
+}
 union ListenerCmd {
     Accept,
     Shutdown,
+}
 struct TcpConnection {
-    out<Cmd> tx,
+    out<ClientCmd> tx,
     in<u8[]> rx,
+}
 /* comp tcp_listener(u8[] ip, u16 port, in<ListenerCmd> cmds, out<TcpConnection> rx) {
     #builtin
 } */
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)