aquatic_ws: OutMessage and InMessage simd-json fixes

* use simd-json in OutMessage deserialization
* take ownership in InMessage deserialization to avoid bugs
* Update benchmark results, benchmark was broken
* Compile simd-json even if simd is not on, so that rust-analyzer
  works

aquatic_ws/src/lib/network/mod.rs

@@ -195,8 +195,8 @@ pub fn run_handshakes_and_read_messages(
             use ::tungstenite::Error::Io;
 
             match established_ws.ws.read_message(){
-                Ok(mut ws_message) => {
+                Ok(ws_message) => {
-                    if let Ok(in_message) = InMessage::from_ws_message(&mut ws_message){
+                    if let Ok(in_message) = InMessage::from_ws_message(ws_message){
                         let naive_peer_addr = established_ws.peer_addr;
                         let converted_peer_ip = convert_ipv4_mapped_ipv6(
                             naive_peer_addr.ip()

aquatic_ws_protocol/Cargo.toml

@@ -18,7 +18,7 @@ anyhow = "1"
 hashbrown = { version = "0.8", features = ["serde"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-simd-json = "0.3"
+simd-json = { version = "0.3", features = ["allow-non-simd"] }
 tungstenite = "0.11"
 
 [dev-dependencies]

aquatic_ws_protocol/benches/bench_deserialize_announce_request.rs

@@ -37,10 +37,10 @@ pub fn bench(c: &mut Criterion) {
         offer_id: Some(OfferId(info_hash.0))
     });
 
-    let mut ws_message = request.to_ws_message();
+    let ws_message = request.to_ws_message();
 
     c.bench_function("deserialize-announce-request", |b| b.iter(||
-        InMessage::from_ws_message(black_box(&mut ws_message))
+        InMessage::from_ws_message(black_box(ws_message.clone()))
     ));
 }
 

aquatic_ws_protocol/src/lib.rs

@@ -259,17 +259,18 @@ pub enum InMessage {
 impl InMessage {
     #[inline]
     pub fn from_ws_message(
-        ws_message: &mut tungstenite::Message
+        ws_message: tungstenite::Message
     ) -> ::anyhow::Result<Self> {
         use tungstenite::Message::Text;
 
-        let text: &mut str = if let Text(text) = ws_message {
+        let mut text = if let Text(text) = ws_message {
             text
         } else {
             return Err(anyhow::anyhow!("Message is not text"));
         };
 
-        ::simd_json::serde::from_str(text).context("deserialize with serde")
+        return ::simd_json::serde::from_str(&mut text)
+            .context("deserialize with serde");
     }
 
     pub fn to_ws_message(&self) -> ::tungstenite::Message {
@@ -300,7 +301,7 @@ impl OutMessage {
     ) -> ::anyhow::Result<Self> {
         use tungstenite::Message::{Text, Binary};
 
-        let text = match message {
+        let mut text = match message {
             Text(text) => text,
             Binary(bytes) => String::from_utf8(bytes)?,
             _ => return Err(anyhow::anyhow!("Message is neither text nor bytes")),
@@ -309,13 +310,13 @@ impl OutMessage {
         // This is brittle and could fail, but it doesn't matter too much
         // since this function is only used in load tester
         if text.contains("answer"){
-            Ok(Self::Answer(::serde_json::from_str(&text)?))
+            Ok(Self::Answer(::simd_json::serde::from_str(&mut text)?))
         } else if text.contains("offer"){
-            Ok(Self::Offer(::serde_json::from_str(&text)?))
+            Ok(Self::Offer(::simd_json::serde::from_str(&mut text)?))
         } else if text.contains("interval"){
-            Ok(Self::AnnounceResponse(::serde_json::from_str(&text)?))
+            Ok(Self::AnnounceResponse(::simd_json::serde::from_str(&mut text)?))
         } else if text.contains("scrape"){
-            Ok(Self::ScrapeResponse(::serde_json::from_str(&text)?))
+            Ok(Self::ScrapeResponse(::simd_json::serde::from_str(&mut text)?))
         } else {
             Err(anyhow::anyhow!("Could not determine response type"))
         }
@@ -523,9 +524,11 @@ mod tests {
 
     #[quickcheck]
     fn quickcheck_serde_identity_in_message(in_message_1: InMessage) -> bool {
-        let mut ws_message = in_message_1.to_ws_message();
+        let ws_message = in_message_1.to_ws_message();
 
-        let in_message_2 = InMessage::from_ws_message(&mut ws_message).unwrap();
+        let in_message_2 = InMessage::from_ws_message(
+            ws_message.clone()
+        ).unwrap();
 
         let success = in_message_1 ==  in_message_2;
 
@@ -544,7 +547,9 @@ mod tests {
     fn quickcheck_serde_identity_out_message(out_message_1: OutMessage) -> bool {
         let ws_message = out_message_1.clone().into_ws_message();
 
-        let out_message_2 = OutMessage::from_ws_message(ws_message.clone()).unwrap();
+        let out_message_2 = OutMessage::from_ws_message(
+            ws_message.clone()
+        ).unwrap();
 
         let success = out_message_1 ==  out_message_2;
 

aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/estimates.json

@@ -1 +1 @@
-{"mean":{"confidence_interval":{"confidence_level":0.95,"lower_bound":2094.926862805663,"upper_bound":2106.4267028892173},"point_estimate":2100.4015350320765,"standard_error":2.9392946950512737},"median":{"confidence_interval":{"confidence_level":0.95,"lower_bound":2085.6324189161965,"upper_bound":2087.229197620325},"point_estimate":2086.413383946413,"standard_error":0.4169721177244358},"median_abs_dev":{"confidence_interval":{"confidence_level":0.95,"lower_bound":16.490233538836364,"upper_bound":21.81096312849954},"point_estimate":18.680703664212437,"standard_error":1.3102508160911694},"slope":{"confidence_interval":{"confidence_level":0.95,"lower_bound":2085.6033212698335,"upper_bound":2094.8775402138917},"point_estimate":2089.9275901786054,"standard_error":2.361080413460781},"std_dev":{"confidence_interval":{"confidence_level":0.95,"lower_bound":73.7250326777399,"upper_bound":111.45831108639615},"point_estimate":93.04040248967267,"standard_error":9.710703224470429}}
+{"mean":{"confidence_interval":{"confidence_level":0.95,"lower_bound":17747.517549723954,"upper_bound":17827.267537642005},"point_estimate":17784.6041414677,"standard_error":20.37407375834334},"median":{"confidence_interval":{"confidence_level":0.95,"lower_bound":17577.94007936508,"upper_bound":17610.776785618924},"point_estimate":17593.548306902798,"standard_error":9.518459372549549},"median_abs_dev":{"confidence_interval":{"confidence_level":0.95,"lower_bound":178.47341704422882,"upper_bound":242.9566257467244},"point_estimate":214.59916963759514,"standard_error":16.547608837291573},"slope":{"confidence_interval":{"confidence_level":0.95,"lower_bound":17756.912325578603,"upper_bound":17852.279555854253},"point_estimate":17798.93543491748,"standard_error":24.423183313014615},"std_dev":{"confidence_interval":{"confidence_level":0.95,"lower_bound":426.35101181405963,"upper_bound":857.9956431905033},"point_estimate":643.9714734076442,"standard_error":111.389827472484}}

aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/tukey.json

@@ -1 +1 @@
-[1994.3859525202693,2034.7983478769509,2142.5647354947687,2182.97713085145]
+[16365.852585890654,16945.45216926808,18491.05105827454,19070.650641651962]

scripts/criterion/aquatic-ws-deserialize-announce-request.sh

@@ -3,7 +3,13 @@
 
 set -e
 
-export RUSTFLAGS="-C target-cpu=native"
+# Compile with target-cpu=native but without AVX512 features, since they
+# decrease performance.
+
+DISABLE_AVX512=$(rustc --print target-features | grep "    avx512" |
+    awk '{print $1}'  | sed 's/^/-C target-feature=-/' | xargs)
+
+export RUSTFLAGS="-C target-cpu=native $DISABLE_AVX512"
 
 cargo bench --bench bench_deserialize_announce_request -- --noplot --baseline latest