Merge branch 'main' into ci-bench-msquic

Signed-off-by: Lars Eggert <[email protected]>
mozilla · Mar 25, 2024 · 3798f0b · 3798f0b
2 parents aa06400 + 50876af
commit 3798f0b
Show file tree

Hide file tree

Showing 37 changed files with 471 additions and 364 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -2,6 +2,9 @@ name: Bench
 on:
   workflow_call:
   workflow_dispatch:
+  schedule:
+    # Run at 1 AM each day, so there is a `main`-branch baseline in the cache.
+    - cron: '0 1 * * *'
 env:
   CARGO_PROFILE_BENCH_BUILD_OVERRIDE_DEBUG: true
   CARGO_PROFILE_RELEASE_DEBUG: true
@@ -181,7 +184,7 @@ jobs:
             echo "### Benchmark results"
             echo
           } > results.md
-          SHA=$(cat target/criterion/baseline-sha.txt)
+          SHA=$(cat target/criterion/baseline-sha.txt || true)
           if [ -n "$SHA" ]; then
             {
               echo "Performance differences relative to $SHA."

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -113,7 +113,7 @@ jobs:
       - name: Run tests and determine coverage
         run: |
           # shellcheck disable=SC2086
-          cargo +${{ matrix.rust-toolchain }} llvm-cov nextest $BUILD_TYPE --all-targets --features ci --no-fail-fast --lcov --output-path lcov.info
+          cargo +${{ matrix.rust-toolchain }} llvm-cov nextest $BUILD_TYPE --features ci --no-fail-fast --lcov --output-path lcov.info
           cargo +${{ matrix.rust-toolchain }} bench --features bench --no-run
 
       - name: Run client/server transfer
@@ -122,6 +122,8 @@ jobs:
           cargo +${{ matrix.rust-toolchain }} build $BUILD_TYPE --bin neqo-client --bin neqo-server
           "target/$BUILD_DIR/neqo-server" "$HOST:4433" &
           PID=$!
+          # Give the server time to start.
+          sleep 1
           "target/$BUILD_DIR/neqo-client" --output-dir . "https://$HOST:4433/$SIZE"
           kill $PID
           [ "$(wc -c <"$SIZE")" -eq "$SIZE" ] || exit 1
@@ -146,7 +148,7 @@ jobs:
           # respective default features only. Can reveal warnings otherwise
           # hidden given that a plain cargo clippy combines all features of the
           # workspace. See e.g. https://github.com/mozilla/neqo/pull/1695.
-          cargo +${{ matrix.rust-toolchain }} hack clippy --all-targets -- -D warnings || ${{ matrix.rust-toolchain == 'nightly' }}
+          cargo +${{ matrix.rust-toolchain }} hack clippy --all-targets --feature-powerset --exclude-features gecko -- -D warnings || ${{ matrix.rust-toolchain == 'nightly' }}
         if: success() || failure()
 
       - name: Check rustdoc links

diff --git a/neqo-bin/Cargo.toml b/neqo-bin/Cargo.toml
@@ -25,6 +25,7 @@ workspace = true
 [dependencies]
 # neqo-bin is not used in Firefox, so we can be liberal with dependency versions
 clap = { version = "4.4", default-features = false, features = ["std", "color", "help", "usage", "error-context", "suggestions", "derive"] }
+clap-verbosity-flag = { version = "2.2", default-features = false }
 futures = { version = "0.3", default-features = false, features = ["alloc"] }
 hex = { version = "0.4", default-features = false, features = ["std"] }
 log = { version = "0.4", default-features = false }

diff --git a/neqo-bin/src/bin/client/http09.rs b/neqo-bin/src/bin/client/http09.rs
@@ -17,7 +17,7 @@ use std::{
     time::Instant,
 };
 
-use neqo_common::{event::Provider, Datagram};
+use neqo_common::{event::Provider, qdebug, qinfo, qwarn, Datagram};
 use neqo_crypto::{AuthenticationStatus, ResumptionToken};
 use neqo_transport::{
     Connection, ConnectionEvent, EmptyConnectionIdGenerator, Error, Output, State, StreamId,
@@ -50,21 +50,21 @@ impl<'a> super::Handler for Handler<'a> {
                     self.read(client, stream_id)?;
                 }
                 ConnectionEvent::SendStreamWritable { stream_id } => {
-                    println!("stream {stream_id} writable");
+                    qdebug!("stream {stream_id} writable");
                 }
                 ConnectionEvent::SendStreamComplete { stream_id } => {
-                    println!("stream {stream_id} complete");
+                    qdebug!("stream {stream_id} complete");
                 }
                 ConnectionEvent::SendStreamCreatable { stream_type } => {
-                    println!("stream {stream_type:?} creatable");
+                    qdebug!("stream {stream_type:?} creatable");
                     if stream_type == StreamType::BiDi {
                         self.download_urls(client);
                     }
                 }
                 ConnectionEvent::StateChange(
                     State::WaitInitial | State::Handshaking | State::Connected,
                 ) => {
-                    println!("{event:?}");
+                    qdebug!("{event:?}");
                     self.download_urls(client);
                 }
                 ConnectionEvent::StateChange(State::Confirmed) => {
@@ -74,7 +74,7 @@ impl<'a> super::Handler for Handler<'a> {
                     self.token = Some(token);
                 }
                 _ => {
-                    println!("Unhandled event {event:?}");
+                    qwarn!("Unhandled event {event:?}");
                 }
             }
         }
@@ -153,6 +153,10 @@ impl super::Client for Connection {
     fn is_closed(&self) -> bool {
         matches!(self.state(), State::Closed(..))
     }
+
+    fn stats(&self) -> neqo_transport::Stats {
+        self.stats()
+    }
 }
 
 impl<'b> Handler<'b> {
@@ -183,7 +187,7 @@ impl<'b> Handler<'b> {
 
     fn download_next(&mut self, client: &mut Connection) -> bool {
         if self.key_update.needed() {
-            println!("Deferring requests until after first key update");
+            qdebug!("Deferring requests until after first key update");
             return false;
         }
         let url = self
@@ -192,7 +196,7 @@ impl<'b> Handler<'b> {
             .expect("download_next called with empty queue");
         match client.stream_create(StreamType::BiDi) {
             Ok(client_stream_id) => {
-                println!("Created stream {client_stream_id} for {url}");
+                qinfo!("Created stream {client_stream_id} for {url}");
                 let req = format!("GET {}\r\n", url.path());
                 _ = client
                     .stream_send(client_stream_id, req.as_bytes())
@@ -203,7 +207,7 @@ impl<'b> Handler<'b> {
                 true
             }
             Err(e @ (Error::StreamLimitError | Error::ConnectionState)) => {
-                println!("Cannot create stream {e:?}");
+                qwarn!("Cannot create stream {e:?}");
                 self.url_queue.push_front(url);
                 false
             }
@@ -231,9 +235,9 @@ impl<'b> Handler<'b> {
             if let Some(out_file) = maybe_out_file {
                 out_file.write_all(&data[..sz])?;
             } else if !output_read_data {
-                println!("READ[{stream_id}]: {sz} bytes");
+                qdebug!("READ[{stream_id}]: {sz} bytes");
             } else {
-                println!(
+                qdebug!(
                     "READ[{}]: {}",
                     stream_id,
                     String::from_utf8(data.clone()).unwrap()
@@ -248,7 +252,7 @@ impl<'b> Handler<'b> {
     fn read(&mut self, client: &mut Connection, stream_id: StreamId) -> Res<()> {
         match self.streams.get_mut(&stream_id) {
             None => {
-                println!("Data on unexpected stream: {stream_id}");
+                qwarn!("Data on unexpected stream: {stream_id}");
                 return Ok(());
             }
             Some(maybe_out_file) => {
@@ -263,7 +267,7 @@ impl<'b> Handler<'b> {
                     if let Some(mut out_file) = maybe_out_file.take() {
                         out_file.flush()?;
                     } else {
-                        println!("<FIN[{stream_id}]>");
+                        qinfo!("<FIN[{stream_id}]>");
                     }
                     self.streams.remove(&stream_id);
                     self.download_urls(client);

diff --git a/neqo-bin/src/bin/client/http3.rs b/neqo-bin/src/bin/client/http3.rs
@@ -18,7 +18,7 @@ use std::{
     time::Instant,
 };
 
-use neqo_common::{event::Provider, hex, Datagram, Header};
+use neqo_common::{event::Provider, hex, qdebug, qinfo, qwarn, Datagram, Header};
 use neqo_crypto::{AuthenticationStatus, ResumptionToken};
 use neqo_http3::{Error, Http3Client, Http3ClientEvent, Http3Parameters, Http3State, Priority};
 use neqo_transport::{
@@ -125,6 +125,10 @@ impl super::Client for Http3Client {
     {
         self.close(now, app_error, msg);
     }
+
+    fn stats(&self) -> neqo_transport::Stats {
+        self.transport_stats()
+    }
 }
 
 impl<'a> super::Handler for Handler<'a> {
@@ -145,7 +149,7 @@ impl<'a> super::Handler for Handler<'a> {
                     if let Some(handler) = self.url_handler.stream_handler(stream_id) {
                         handler.process_header_ready(stream_id, fin, headers);
                     } else {
-                        println!("Data on unexpected stream: {stream_id}");
+                        qwarn!("Data on unexpected stream: {stream_id}");
                     }
                     if fin {
                         self.url_handler.on_stream_fin(client, stream_id);
@@ -155,7 +159,7 @@ impl<'a> super::Handler for Handler<'a> {
                     let mut stream_done = false;
                     match self.url_handler.stream_handler(stream_id) {
                         None => {
-                            println!("Data on unexpected stream: {stream_id}");
+                            qwarn!("Data on unexpected stream: {stream_id}");
                         }
                         Some(handler) => loop {
                             let mut data = vec![0; 4096];
@@ -189,7 +193,7 @@ impl<'a> super::Handler for Handler<'a> {
                 Http3ClientEvent::DataWritable { stream_id } => {
                     match self.url_handler.stream_handler(stream_id) {
                         None => {
-                            println!("Data on unexpected stream: {stream_id}");
+                            qwarn!("Data on unexpected stream: {stream_id}");
                         }
                         Some(handler) => {
                             handler.process_data_writable(client, stream_id);
@@ -202,7 +206,7 @@ impl<'a> super::Handler for Handler<'a> {
                 }
                 Http3ClientEvent::ResumptionToken(t) => self.token = Some(t),
                 _ => {
-                    println!("Unhandled event {event:?}");
+                    qwarn!("Unhandled event {event:?}");
                 }
             }
         }
@@ -275,7 +279,7 @@ struct DownloadStreamHandler {
 impl StreamHandler for DownloadStreamHandler {
     fn process_header_ready(&mut self, stream_id: StreamId, fin: bool, headers: Vec<Header>) {
         if self.out_file.is_none() {
-            println!("READ HEADERS[{stream_id}]: fin={fin} {headers:?}");
+            qdebug!("READ HEADERS[{stream_id}]: fin={fin} {headers:?}");
         }
     }
 
@@ -293,18 +297,18 @@ impl StreamHandler for DownloadStreamHandler {
             }
             return Ok(true);
         } else if !output_read_data {
-            println!("READ[{stream_id}]: {sz} bytes");
+            qdebug!("READ[{stream_id}]: {sz} bytes");
         } else if let Ok(txt) = String::from_utf8(data.clone()) {
-            println!("READ[{stream_id}]: {txt}");
+            qdebug!("READ[{stream_id}]: {txt}");
         } else {
-            println!("READ[{}]: 0x{}", stream_id, hex(&data));
+            qdebug!("READ[{}]: 0x{}", stream_id, hex(&data));
         }
 
         if fin {
             if let Some(mut out_file) = self.out_file.take() {
                 out_file.flush()?;
             } else {
-                println!("<FIN[{stream_id}]>");
+                qdebug!("<FIN[{stream_id}]>");
             }
         }
 
@@ -323,7 +327,7 @@ struct UploadStreamHandler {
 
 impl StreamHandler for UploadStreamHandler {
     fn process_header_ready(&mut self, stream_id: StreamId, fin: bool, headers: Vec<Header>) {
-        println!("READ HEADERS[{stream_id}]: fin={fin} {headers:?}");
+        qdebug!("READ HEADERS[{stream_id}]: fin={fin} {headers:?}");
     }
 
     fn process_data_readable(
@@ -339,7 +343,7 @@ impl StreamHandler for UploadStreamHandler {
             let parsed: usize = trimmed_txt.parse().unwrap();
             if parsed == self.data.len() {
                 let upload_time = Instant::now().duration_since(self.start);
-                println!("Stream ID: {stream_id:?}, Upload time: {upload_time:?}");
+                qinfo!("Stream ID: {stream_id:?}, Upload time: {upload_time:?}");
             }
         } else {
             panic!("Unexpected data [{}]: 0x{}", stream_id, hex(&data));
@@ -407,7 +411,7 @@ impl<'a> UrlHandler<'a> {
             Priority::default(),
         ) {
             Ok(client_stream_id) => {
-                println!("Successfully created stream id {client_stream_id} for {url}");
+                qdebug!("Successfully created stream id {client_stream_id} for {url}");
 
                 let handler: Box<dyn StreamHandler> = StreamHandlerType::make_handler(
                     &self.handler_type,