Merge pull request #35 from hokeun/sync_reactor-c_20240210

Synchronization with the latest reactor-c
lf-lang · Feb 17, 2024 · 7ba3d49 · 7ba3d49
2 parents 0a44e5c + 1fcaf15
commit 7ba3d49
Show file tree

Hide file tree

Showing 4 changed files with 550 additions and 295 deletions.
diff --git a/rust/rti/src/net_common.rs b/rust/rti/src/net_common.rs
@@ -95,7 +95,7 @@ pub enum MsgType {
     NextEventTag,
     TagAdvanceGrant,
     PropositionalTagAdvanceGrant,
-    LogicalTagComplete,
+    LatestTagComplete,
     StopRequest,
     StopRequestReply,
     StopGranted,
@@ -120,7 +120,7 @@ impl MsgType {
             MsgType::NextEventTag => 6,
             MsgType::TagAdvanceGrant => 7,
             MsgType::PropositionalTagAdvanceGrant => 8,
-            MsgType::LogicalTagComplete => 9,
+            MsgType::LatestTagComplete => 9,
             MsgType::StopRequest => 10,
             MsgType::StopRequestReply => 11,
             MsgType::StopGranted => 12,
@@ -142,7 +142,7 @@ impl MsgType {
             5 => MsgType::TaggedMessage,
             6 => MsgType::NextEventTag,
             8 => MsgType::PropositionalTagAdvanceGrant,
-            9 => MsgType::LogicalTagComplete,
+            9 => MsgType::LatestTagComplete,
             10 => MsgType::StopRequest,
             11 => MsgType::StopRequestReply,
             12 => MsgType::StopGranted,

diff --git a/rust/rti/src/net_util.rs b/rust/rti/src/net_util.rs
@@ -15,7 +15,7 @@ use crate::tag::Tag;
 pub struct NetUtil {}
 
 impl NetUtil {
-    pub fn read_from_stream_errexit(
+    pub fn read_from_socket_fail_on_error(
         stream: &mut TcpStream,
         buffer: &mut Vec<u8>,
         fed_id: u16,
@@ -57,7 +57,7 @@ impl NetUtil {
         bytes_read
     }
 
-    pub fn write_to_stream_errexit(
+    pub fn write_to_socket_fail_on_error(
         mut stream: &TcpStream,
         buffer: &Vec<u8>,
         fed_id: u16,