[mplex] Add benchmark, tweak default split_send_size.

muxers/mplex/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.24.1 [unreleased]
+
+- Change the default `split_send_size` from 1KiB to 8KiB.
+  [PR 1834](https://github.com/libp2p/rust-libp2p/pull/1834).
+
 # 0.24.0 [2020-11-09]
 
 - Change the default configuration to use `MaxBufferBehaviour::Block`

muxers/mplex/Cargo.toml

@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 bytes = "0.5"
 futures = "0.3.1"
-futures_codec = "0.4"
+futures_codec = "0.4.1"
 libp2p-core = { version = "0.24.0", path = "../../core" }
 log = "0.4"
 nohash-hasher = "0.2"
@@ -22,9 +22,15 @@ smallvec = "1.4"
 unsigned-varint = { version = "0.5", features = ["futures-codec"] }
 
 [dev-dependencies]
-async-std = "1.6.2"
+async-std = "1.7.0"
+criterion = "0.3"
 env_logger = "0.8"
 futures = "0.3"
 libp2p-tcp = { path = "../../transports/tcp", features = ["async-std"] }
+libp2p-plaintext = { path = "../../protocols/plaintext" }
 quickcheck = "0.9"
 rand = "0.7"
+
+[[bench]]
+name = "split_send_size"
+harness = false

muxers/mplex/benches/split_send_size.rs

@@ -0,0 +1,172 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+//! A benchmark for the `split_send_size` configuration option
+//! using different transports.
+
+use async_std::task;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use futures::channel::oneshot;
+use futures::prelude::*;
+use futures::future::poll_fn;
+use libp2p_core::{PeerId, Transport, StreamMuxer, identity, upgrade, transport, muxing, multiaddr::multiaddr, Multiaddr};
+use libp2p_mplex as mplex;
+use libp2p_plaintext::PlainText2Config;
+use std::time::Duration;
+
+type BenchTransport = transport::Boxed<(PeerId, muxing::StreamMuxerBox)>;
+
+/// The sizes (in bytes) used for the `split_send_size` configuration.
+const BENCH_SIZES: [usize; 8] = [
+    256,
+    512,
+    1024,
+    8 * 1024,
+    16 * 1024,
+    64 * 1024,
+    256 * 1024,
+    1024 * 1024,
+];
+
+fn prepare(c: &mut Criterion) {
+    let _ = env_logger::try_init();
+
+    let payload: Vec<u8> = vec![1; 1024 * 1024 * 1];
+
+    let mut tcp = c.benchmark_group("tcp");
+    let tcp_addr = multiaddr![Ip4(std::net::Ipv4Addr::new(127,0,0,1)), Tcp(0u16)];
+    for &size in BENCH_SIZES.iter() {
+        let trans = tcp_transport(size);
+        tcp.bench_function(
+            format!("{}", size),
+            |b| b.iter(|| run(black_box(&trans), black_box(&payload), black_box(&tcp_addr)))
+        );
+    }
+    tcp.finish();
+
+    let mut mem = c.benchmark_group("memory");
+    let mem_addr = multiaddr![Memory(0u64)];
+    for &size in BENCH_SIZES.iter() {
+        let trans = mem_transport(size);
+        mem.bench_function(
+            format!("{}", size),
+            |b| b.iter(|| run(black_box(&trans), black_box(&payload), black_box(&mem_addr)))
+        );
+    }
+    mem.finish();
+}
+
+
+/// Transfers the given payload between two nodes using the given transport.
+fn run(transport: &BenchTransport, payload: &Vec<u8>, listen_addr: &Multiaddr) {
+    let mut listener = transport.clone().listen_on(listen_addr.clone()).unwrap();
+    let (addr_sender, addr_receiver) = oneshot::channel();
+    let mut addr_sender = Some(addr_sender);
+    let payload_len = payload.len();
+
+    // Spawn the receiver.
+    let receiver = task::spawn(async move {
+        loop {
+            match listener.next().await.unwrap().unwrap() {
+                transport::ListenerEvent::NewAddress(a) => {
+                    addr_sender.take().unwrap().send(a).unwrap();
+                }
+                transport::ListenerEvent::Upgrade { upgrade, .. } => {
+                    let (_peer, conn) = upgrade.await.unwrap();
+                    match poll_fn(|cx| conn.poll_event(cx)).await {
+                        Ok(muxing::StreamMuxerEvent::InboundSubstream(mut s)) => {
+                            let mut buf = vec![0u8; payload_len];
+                            let mut off = 0;
+                            loop {
+                                // Read in typical chunk sizes of up to 8KiB.
+                                let end = off + std::cmp::min(buf.len() - off, 8 * 1024);
+                                let n = poll_fn(|cx| {
+                                    conn.read_substream(cx, &mut s, &mut buf[off..end])
+                                }).await.unwrap();
+                                off += n;
+                                if off == buf.len() {
+                                    return
+                                }
+                            }
+                        }
+                        Ok(_) => panic!("Unexpected muxer event"),
+                        Err(e) => panic!("Unexpected error: {:?}", e)
+                    }
+                }
+                _ => panic!("Unexpected listener event")
+            }
+        }
+    });
+
+    // Spawn and block on the sender, i.e. until all data is sent.
+    task::block_on(async move {
+        let addr = addr_receiver.await.unwrap();
+        let (_peer, conn) = transport.clone().dial(addr).unwrap().await.unwrap();
+        let mut handle = conn.open_outbound();
+        let mut stream = poll_fn(|cx| conn.poll_outbound(cx, &mut handle)).await.unwrap();
+        let mut off = 0;
+        loop {
+            let n = poll_fn(|cx| {
+                conn.write_substream(cx, &mut stream, &payload[off..])
+            }).await.unwrap();
+            off += n;
+            if off == payload.len() {
+                poll_fn(|cx| conn.flush_substream(cx, &mut stream)).await.unwrap();
+                return
+            }
+        }
+    });
+
+    // Wait for all data to be received.
+    task::block_on(receiver);
+}
+
+fn tcp_transport(split_send_size: usize) -> BenchTransport {
+    let key = identity::Keypair::generate_ed25519();
+    let local_public_key = key.public();
+
+    let mut mplex = mplex::MplexConfig::default();
+    mplex.set_split_send_size(split_send_size);
+
+    libp2p_tcp::TcpConfig::new().nodelay(true)
+        .upgrade(upgrade::Version::V1)
+        .authenticate(PlainText2Config { local_public_key })
+        .multiplex(mplex)
+        .timeout(Duration::from_secs(5))
+        .boxed()
+}
+
+fn mem_transport(split_send_size: usize) -> BenchTransport {
+    let key = identity::Keypair::generate_ed25519();
+    let local_public_key = key.public();
+
+    let mut mplex = mplex::MplexConfig::default();
+    mplex.set_split_send_size(split_send_size);
+
+    transport::MemoryTransport::default()
+        .upgrade(upgrade::Version::V1)
+        .authenticate(PlainText2Config { local_public_key })
+        .multiplex(mplex)
+        .timeout(Duration::from_secs(5))
+        .boxed()
+}
+
+criterion_group!(split_send_size, prepare);
+criterion_main!(split_send_size);

muxers/mplex/src/config.rs

@@ -119,7 +119,7 @@ impl Default for MplexConfig {
             max_substreams: 128,
             max_buffer_len: 32,
             max_buffer_behaviour: MaxBufferBehaviour::Block,
-            split_send_size: 1024,
+            split_send_size: 8 * 1024,
         }
     }
 }

muxers/yamux/Cargo.toml

@@ -14,4 +14,4 @@ futures = "0.3.1"
 libp2p-core = { version = "0.24.0", path = "../../core" }
 parking_lot = "0.11"
 thiserror = "1.0"
-yamux = "0.8.0"
+yamux = "0.8.0"

transports/tcp/Cargo.toml

@@ -10,14 +10,14 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-async-std = { version = "1.6.2", optional = true }
+async-std = { version = "1.7.0", optional = true }
 futures = "0.3.1"
 futures-timer = "3.0"
 if-addrs = "0.6.4"
 ipnet = "2.0.0"
 libp2p-core = { version = "0.24.0", path = "../../core" }
 log = "0.4.1"
-socket2 = "0.3.12"
+socket2 = { version = "0.3.12" }
 tokio = { version = "0.3", default-features = false, features = ["net"], optional = true }
 
 [dev-dependencies]