Updated dependencies, binary sizes improvement and updated logger

Cargo.toml

@@ -1,24 +1,26 @@
 [package]
 name = "diode"
-version = "1.3.1"
+version = "1.3.3"
 edition = "2021"
 license = "GPL-3.0"
 
 [dependencies]
 clap = "4"
-crossbeam-channel = "0.5"
-crossbeam-utils = "0.8"
-fasthash = "0.4"
-libc = "0.2"
-log = "0.4"
-rand = "0.8"
+crossbeam-channel = "0"
+crossbeam-utils = "0"
+fasthash = "0"
+libc = "0"
+log = "0"
+rand = "0"
 raptorq = "2"
-simple_logger = "5"
+simplelog = "0"
 
 [profile.release]
+opt-level = "z"
 lto = true
-opt-level = 3
 debug = false
+strip = true
+panic = "abort"
 
 [workspace]
 members = [".", "diode-file-bindings"]

diode-file-bindings/src/lib.rs

@@ -1,6 +1,6 @@
 #![allow(unsafe_code)]
 
-use diode::aux::{self,file};
+use diode::aux::{self, file};
 use std::{
     ffi::{c_char, CStr},
     net::SocketAddr,

src/bin/diode-flood-test.rs

@@ -1,5 +1,5 @@
 use clap::{Arg, ArgGroup, Command};
-use rand::RngCore;
+use rand::Rng;
 use std::{env, io::Write, net, os::unix, path, str::FromStr};
 
 fn main() {
@@ -40,7 +40,7 @@ fn main() {
         .map(|s| path::PathBuf::from_str(s).expect("to_unix must point to a valid path"));
     let buffer_size = *args.get_one::<usize>("buffer_size").expect("default");
 
-    init_logger();
+    diode::init_logger();
 
     if let Some(to_tcp) = to_tcp {
         log::debug!("TCP connect to {}", to_tcp);
@@ -71,12 +71,3 @@ where
         diode.write_all(&buffer).expect("write");
     }
 }
-
-fn init_logger() {
-    if env::var("RUST_LOG").is_ok() {
-        simple_logger::init_with_env()
-    } else {
-        simple_logger::init_with_level(log::Level::Info)
-    }
-    .expect("logger initialization")
-}

src/bin/diode-receive-file.rs

@@ -64,18 +64,9 @@ fn main() {
         hash,
     };
 
-    init_logger();
+    diode::init_logger();
 
     if let Err(e) = file::receive::receive_files(&config, &output_directory) {
         log::error!("{e}");
     }
 }
-
-fn init_logger() {
-    if env::var("RUST_LOG").is_ok() {
-        simple_logger::init_with_env()
-    } else {
-        simple_logger::init_with_level(log::Level::Info)
-    }
-    .expect("logger initialization")
-}

src/bin/diode-receive-udp.rs

@@ -59,18 +59,9 @@ fn main() {
         buffer_size: u16::MAX as usize,
     };
 
-    init_logger();
+    diode::init_logger();
 
     if let Err(e) = udp::receive::receive(&config, to_udp_bind, to_udp) {
         log::error!("{e}");
     }
 }
-
-fn init_logger() {
-    if env::var("RUST_LOG").is_ok() {
-        simple_logger::init_with_env()
-    } else {
-        simple_logger::init_with_level(log::Level::Info)
-    }
-    .expect("logger initialization")
-}

src/bin/diode-receive.rs

@@ -226,7 +226,7 @@ impl TryFrom<&ClientConfig> for Client {
 fn main() {
     let config = command_args();
 
-    init_logger();
+    diode::init_logger();
 
     log::info!("sending traffic to {}", config.to);
 
@@ -251,12 +251,3 @@ fn main() {
         }
     });
 }
-
-fn init_logger() {
-    if env::var("RUST_LOG").is_ok() {
-        simple_logger::init_with_env()
-    } else {
-        simple_logger::init_with_level(log::Level::Info)
-    }
-    .expect("logger initialization")
-}

src/bin/diode-send-file.rs

@@ -72,18 +72,9 @@ fn main() {
         hash,
     };
 
-    init_logger();
+    diode::init_logger();
 
     if let Err(e) = file::send::send_files(&config, &files) {
         log::error!("{e}");
     }
 }
-
-fn init_logger() {
-    if env::var("RUST_LOG").is_ok() {
-        simple_logger::init_with_env()
-    } else {
-        simple_logger::init_with_level(log::Level::Info)
-    }
-    .expect("logger initialization")
-}

src/bin/diode-send-udp.rs

@@ -53,18 +53,9 @@ fn main() {
         buffer_size: u16::MAX as usize,
     };
 
-    init_logger();
+    diode::init_logger();
 
     if let Err(e) = udp::send::send(&config, from_udp) {
         log::error!("{e}");
     }
 }
-
-fn init_logger() {
-    if env::var("RUST_LOG").is_ok() {
-        simple_logger::init_with_env()
-    } else {
-        simple_logger::init_with_level(log::Level::Info)
-    }
-    .expect("logger initialization")
-}

src/bin/diode-send.rs

@@ -251,7 +251,7 @@ fn tcp_listener_loop(
 fn main() {
     let config = command_args();
 
-    init_logger();
+    diode::init_logger();
 
     let sender = send::Sender::new(send::Config {
         nb_clients: config.nb_clients,
@@ -314,12 +314,3 @@ fn main() {
         }
     });
 }
-
-fn init_logger() {
-    if env::var("RUST_LOG").is_ok() {
-        simple_logger::init_with_env()
-    } else {
-        simple_logger::init_with_level(log::Level::Info)
-    }
-    .expect("logger initialization")
-}

src/lib.rs

@@ -1,3 +1,5 @@
+use std::str::FromStr;
+
 pub mod aux;
 pub mod protocol;
 pub mod receive;
@@ -12,3 +14,26 @@ pub mod sock_utils;
 // libc functions recv_mmsg and send_mmsg.
 #[allow(unsafe_code)]
 pub mod udp;
+
+pub fn init_logger() {
+    let level_filter = std::env::var("RUST_LOG")
+        .map_err(|_| ())
+        .and_then(|rust_log| simplelog::LevelFilter::from_str(&rust_log).map_err(|_| ()))
+        .unwrap_or(simplelog::LevelFilter::Info);
+
+    let config = simplelog::ConfigBuilder::new()
+        .set_level_padding(simplelog::LevelPadding::Right)
+        .set_target_level(simplelog::LevelFilter::Off)
+        .set_thread_level(simplelog::LevelFilter::Info)
+        .set_thread_mode(simplelog::ThreadLogMode::Names)
+        .set_time_format_rfc2822()
+        .build();
+
+    simplelog::TermLogger::init(
+        level_filter,
+        config,
+        simplelog::TerminalMode::Mixed,
+        simplelog::ColorChoice::Auto,
+    )
+    .expect("failed to initialize termlogger");
+}

src/protocol.rs

@@ -33,7 +33,7 @@
 //! is of type `Heartbeat`, `Abort` or `End`. Then the `data_length` will be set to 0 by the
 //! message constructor and the data chunk will be fully padded with zeros.
 
-use std::{fmt, io};
+use std::{fmt, io, sync};
 
 pub enum Error {
     Io(io::Error),
@@ -95,8 +95,10 @@ const ID_END: u8 = 0x04;
 
 pub(crate) type ClientId = u32;
 
+static CLIENT_ID_COUNTER: sync::atomic::AtomicU32 = sync::atomic::AtomicU32::new(0);
+
 pub(crate) fn new_client_id() -> ClientId {
-    rand::random::<ClientId>()
+    CLIENT_ID_COUNTER.fetch_add(1, sync::atomic::Ordering::Relaxed)
 }
 
 pub struct Message(Vec<u8>);

src/receive/mod.rs

@@ -281,7 +281,7 @@ where
 
         for i in 0..self.config.nb_clients {
             thread::Builder::new()
-                .name(format!("client_{i}"))
+                .name(format!("receive_thread_{i}"))
                 .spawn_scoped(scope, || clients::start(self))?;
         }
 

src/send/mod.rs

@@ -227,7 +227,7 @@ where
 
         for i in 0..self.config.nb_clients {
             thread::Builder::new()
-                .name(format!("client_{i}"))
+                .name(format!("send_thread_{i}"))
                 .spawn_scoped(scope, || server::start(self))?;
         }