Adapting session throughput binaries to new reliability and congestio…

…n control
eclipse-zenoh · Sep 8, 2020 · e11ae20 · e11ae20
1 parent 869d8e8
commit e11ae20
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 32 deletions.
diff --git a/zenoh-perf/src/bin/router_thr_pub_client.rs b/zenoh-perf/src/bin/router_thr_pub_client.rs
@@ -38,8 +38,9 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let mut args = std::env::args();
     // Get exe name
@@ -69,7 +70,7 @@ fn main() {
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::CLIENT,
-        id: PeerId { id: pid },
+        id: pid,
         handler: broker.clone(),
     };
     let manager = SessionManager::new(config, None);

diff --git a/zenoh-perf/src/bin/router_thr_pub_light_client.rs b/zenoh-perf/src/bin/router_thr_pub_light_client.rs
@@ -65,8 +65,9 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let mut args = std::env::args();
     // Get exe name
@@ -106,7 +107,7 @@ fn main() {
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::CLIENT,
-        id: PeerId { id: pid.clone() },
+        id: pid,
         handler: session_handler.clone(),
     };
     let manager = SessionManager::new(config, None);

diff --git a/zenoh-perf/src/bin/router_thr_pub_peer.rs b/zenoh-perf/src/bin/router_thr_pub_peer.rs
@@ -38,8 +38,9 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let mut args = std::env::args();
     // Get exe name
@@ -69,7 +70,7 @@ fn main() {
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::PEER,
-        id: PeerId { id: pid },
+        id: pid,
         handler: broker.clone(),
     };
     let manager = SessionManager::new(config, None);

diff --git a/zenoh-perf/src/bin/router_thr_sub_client.rs b/zenoh-perf/src/bin/router_thr_sub_client.rs
@@ -127,8 +127,9 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let mut args = std::env::args();
     // Get exe name
@@ -146,7 +147,7 @@ fn main() {
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::CLIENT,
-        id: PeerId { id: pid },
+        id: pid,
         handler: broker.clone(),
     };
     let manager = SessionManager::new(config, None);

diff --git a/zenoh-perf/src/bin/router_thr_sub_light_client.rs b/zenoh-perf/src/bin/router_thr_sub_light_client.rs
@@ -151,8 +151,9 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let mut args = std::env::args();
     // Get exe name
@@ -180,7 +181,7 @@ fn main() {
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::CLIENT,
-        id: PeerId { id: pid.clone() },
+        id: pid,
         handler: session_handler.clone(),
     };
     let manager = SessionManager::new(config, None);

diff --git a/zenoh-perf/src/bin/router_thr_sub_peer.rs b/zenoh-perf/src/bin/router_thr_sub_peer.rs
@@ -128,8 +128,9 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let mut args = std::env::args();
     // Get exe name
@@ -159,7 +160,7 @@ fn main() {
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::PEER,
-        id: PeerId { id: pid },
+        id: pid,
         handler: broker.clone(),
     };
     let manager = SessionManager::new(config, None);

diff --git a/zenoh-perf/src/bin/session_thr_pub_client.rs b/zenoh-perf/src/bin/session_thr_pub_client.rs
@@ -58,8 +58,9 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let mut args = std::env::args();
     // Get exe name
@@ -98,7 +99,7 @@ fn main() {
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::PEER,
-        id: PeerId { id: pid },
+        id: pid,
         handler: Arc::new(MySH::new()),
     };
     let manager = SessionManager::new(config, None);

diff --git a/zenoh-perf/src/bin/session_thr_pub_peer.rs b/zenoh-perf/src/bin/session_thr_pub_peer.rs
@@ -16,7 +16,7 @@ use async_std::task;
 use async_trait::async_trait;
 use rand::RngCore;
 
-use zenoh_protocol::core::{whatami, PeerId, ResKey};
+use zenoh_protocol::core::{whatami, CongestionControl, PeerId, Reliability, ResKey};
 use zenoh_protocol::io::RBuf;
 use zenoh_protocol::link::Locator;
 use zenoh_protocol::proto::ZenohMessage;
@@ -59,8 +59,9 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let mut args = std::env::args();
     // Get exe name
@@ -99,7 +100,7 @@ fn main() {
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::PEER,
-        id: PeerId { id: pid },
+        id: pid,
         handler: Arc::new(MySH::new()),
     };
     let manager = SessionManager::new(config, None);
@@ -120,14 +121,22 @@ fn main() {
         };
 
         // Send reliable messages
-        let reliable = true;
+        let reliability = Reliability::Reliable;
+        let congestion_control = CongestionControl::Block;
         let key = ResKey::RName("test".to_string());
         let info = None;
         let payload = RBuf::from(vec![0u8; payload]);
         let reply_context = None;
 
-        let message =
-            ZenohMessage::make_data(reliable, key, info, payload, reply_context, attachment);
+        let message = ZenohMessage::make_data(
+            key,
+            payload,
+            reliability,
+            congestion_control,
+            info,
+            reply_context,
+            attachment,
+        );
 
         loop {
             let res = session.handle_message(message.clone()).await;

diff --git a/zenoh-perf/src/bin/session_thr_pubsub_client.rs b/zenoh-perf/src/bin/session_thr_pubsub_client.rs
@@ -95,8 +95,9 @@ Example:
 }
 
 fn main() {
-    let mut pid: Vec<u8> = vec![0, 0, 0, 0, 0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let count = Arc::new(AtomicUsize::new(0));
 
@@ -137,7 +138,7 @@ fn main() {
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::PEER,
-        id: PeerId { id: pid },
+        id: pid,
         handler: Arc::new(MySH::new(count)),
     };
     let manager = SessionManager::new(config, None);

diff --git a/zenoh-perf/src/bin/session_thr_pubsub_peer.rs b/zenoh-perf/src/bin/session_thr_pubsub_peer.rs
@@ -99,8 +99,9 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let count = Arc::new(AtomicUsize::new(0));
 
@@ -153,7 +154,7 @@ fn main() {
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::PEER,
-        id: PeerId { id: pid },
+        id: pid,
         handler: Arc::new(MySH::new(count)),
     };
     let manager = SessionManager::new(config, None);

diff --git a/zenoh-perf/src/bin/session_thr_broker.rs → zenoh-perf/src/bin/session_thr_router.rs b/zenoh-perf/src/bin/session_thr_broker.rs → zenoh-perf/src/bin/session_thr_router.rs
@@ -96,8 +96,9 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let mut args = std::env::args();
     // Get exe name
@@ -125,7 +126,7 @@ fn main() {
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::PEER,
-        id: PeerId { id: pid },
+        id: pid,
         handler: Arc::new(MySH::new()),
     };
     let manager = SessionManager::new(config, None);

diff --git a/zenoh-perf/src/bin/session_thr_sink_tcp.rs b/zenoh-perf/src/bin/session_thr_sink_tcp.rs
@@ -29,9 +29,9 @@ async fn handle_client(
 ) -> Result<(), Box<dyn std::error::Error>> {
     let counter = Arc::new(AtomicUsize::new(0));
 
-    let mut apid = vec![0, 0, 0, 0];
+    let mut apid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut apid);
-    let apid = PeerId { id: apid };
+    let apid = PeerId::new(1, pid);
 
     let mut buffer = vec![0u8; bs];
 

diff --git a/zenoh-perf/src/bin/session_thr_sub_client.rs b/zenoh-perf/src/bin/session_thr_sub_client.rs
@@ -101,15 +101,16 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let count = Arc::new(AtomicUsize::new(0));
 
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::PEER,
-        id: PeerId { id: pid },
+        id: pid,
         handler: Arc::new(MySH::new(count)),
     };
     let manager = SessionManager::new(config, None);

diff --git a/zenoh-perf/src/bin/session_thr_sub_peer.rs b/zenoh-perf/src/bin/session_thr_sub_peer.rs
@@ -100,15 +100,16 @@ fn main() {
     env_logger::init();
 
     // Initialize the Peer Id
-    let mut pid = vec![0, 0, 0, 0];
+    let mut pid = [0u8; PeerId::MAX_SIZE];
     rand::thread_rng().fill_bytes(&mut pid);
+    let pid = PeerId::new(1, pid);
 
     let count = Arc::new(AtomicUsize::new(0));
 
     let config = SessionManagerConfig {
         version: 0,
         whatami: whatami::PEER,
-        id: PeerId { id: pid },
+        id: pid,
         handler: Arc::new(MySH::new(count)),
     };
     let manager = SessionManager::new(config, None);