Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions quest/m0/lite07-compression-bench-hang.md

This file was deleted.

209 changes: 103 additions & 106 deletions rs/moq-net/benches/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ use moq_net::{Session, Version, auth, origin};
use std::time::Duration;
use support::{harness, mock::create_mock_session_pair};

/// The one version that presents tokens in band: on moq-transport a token resolves at once
/// and only rides the requests that name it, so no AUTH request ever reaches the peer.
const INBAND: &str = "moq-lite-07-wip";

struct Pair {
client: Session,
_server: Session,
Expand All @@ -32,7 +36,8 @@ struct Origins<'a> {
subscribe: origin::Producer,
}

async fn pair(version: Version, origins: Option<Origins<'_>>) -> Pair {
async fn pair(origins: Option<Origins<'_>>) -> Pair {
let version: Version = INBAND.parse().unwrap();
let mut mock = moq_net::transport::memory::Config::default();
mock.protocol = Some(version.alpn().to_string());
let (client, server) = create_mock_session_pair(mock);
Expand Down Expand Up @@ -92,27 +97,24 @@ fn admission(c: &mut Criterion) {
.enable_all()
.build()
.unwrap();
for version in ["moq-lite-07-wip", "moq-transport-22"] {
let mut group = c.benchmark_group(format!("auth/{version}"));
group.sample_size(10);
group.warm_up_time(Duration::from_millis(100));
group.measurement_time(Duration::from_millis(300));
for sessions in [1, 16, 64] {
for tokens in [1, 16, 128] {
group.throughput(Throughput::Elements((sessions * tokens) as u64));
group.bench_with_input(
BenchmarkId::new(sessions.to_string(), tokens),
&(sessions, tokens),
|b, &(sessions, tokens)| {
let mut pairs =
runtime.block_on(join_all((0..sessions).map(|_| pair(version.parse().unwrap(), None))));
b.iter(|| runtime.block_on(join_all(pairs.iter_mut().map(|pair| pair.round(tokens)))));
},
);
}
let mut group = c.benchmark_group(format!("auth/{INBAND}"));
group.sample_size(10);
group.warm_up_time(Duration::from_millis(100));
group.measurement_time(Duration::from_millis(300));
for sessions in [1, 16, 64] {
for tokens in [1, 16, 128] {
group.throughput(Throughput::Elements((sessions * tokens) as u64));
group.bench_with_input(
BenchmarkId::new(sessions.to_string(), tokens),
&(sessions, tokens),
|b, &(sessions, tokens)| {
let mut pairs = runtime.block_on(join_all((0..sessions).map(|_| pair(None))));
b.iter(|| runtime.block_on(join_all(pairs.iter_mut().map(|pair| pair.round(tokens)))));
},
);
}
group.finish();
}
group.finish();
}

/// A client publishing `origin` to its own server, whose session and token requests follow.
Expand Down Expand Up @@ -235,96 +237,91 @@ fn waiting(c: &mut Criterion) {
.enable_all()
.build()
.unwrap();
for version in ["moq-lite-07-wip", "moq-transport-22"] {
let mut group = c.benchmark_group(format!("auth/waiting/{version}"));
group.sample_size(10);
group.warm_up_time(Duration::from_millis(100));
group.measurement_time(Duration::from_millis(300));
for tokens in [1, 16, 128] {
for paths in [1, 16, 128] {
group.throughput(Throughput::Elements(paths as u64));
group.bench_with_input(
BenchmarkId::new(tokens.to_string(), paths),
&(tokens, paths),
|b, &(tokens, paths)| {
let _guard = runtime.enter();
let mut config = origin::Config::new(std::num::NonZeroU64::new(2).unwrap());
config.update_hold = Duration::ZERO;
let (publish, driver) = origin::Producer::new(config);
harness::spawn(driver);
let (receive, driver) =
origin::Producer::new(origin::Config::new(std::num::NonZeroU64::new(1).unwrap()));
harness::spawn(driver);
let mut pair = runtime.block_on(pair(
version.parse().unwrap(),
Some(Origins {
publish: &publish,
subscribe: receive.clone(),
}),
));
let mut generation = 0;
b.iter(|| {
runtime.block_on(async {
let handle = pair.client.auth();
let mut presenting =
std::pin::pin!(join_all((0..tokens).map(|_| added(&handle, "pending"))));
assert!(futures::poll!(presenting.as_mut()).is_pending());
let mut pending = Vec::with_capacity(tokens);
for _ in 0..tokens {
pending.push(pair.requests.next().await.unwrap());
}
let prefix = format!("wait/{generation}/");
generation += 1;
let broadcasts: Vec<_> = (0..paths)
.map(|path| {
let broadcast = publish
.route(
format!("{prefix}{path}").as_str(),
moq_net::origin::RouteOptions::hidden(),
)
.unwrap();
broadcast.announce().unwrap();
broadcast
})
.collect();
// Let the session reach its admission wait before the final reply widens it.
tokio::task::yield_now().await;
let mut issued = Vec::with_capacity(tokens);
for (index, request) in pending.into_iter().enumerate() {
issued.push(request.accept(if index + 1 == tokens {
auth::Grant::all()
} else {
auth::Grant::default()
}));
}
let tokens: Vec<_> = presenting.await.into_iter().map(Result::unwrap).collect();
let mut announced = receive.consume().routes();
let mut seen = std::collections::HashSet::new();
while seen.len() < paths {
match announced.next().await.unwrap() {
moq_net::origin::RouteEvent {
kind:
moq_net::origin::RouteKind::Start
| moq_net::origin::RouteKind::Update
| moq_net::origin::RouteKind::Restart,
announce: update,
} if update.prefix.as_str().starts_with(&prefix) => {
seen.insert(update.prefix);
}
_ => {}
let mut group = c.benchmark_group(format!("auth/waiting/{INBAND}"));
group.sample_size(10);
group.warm_up_time(Duration::from_millis(100));
group.measurement_time(Duration::from_millis(300));
for tokens in [1, 16, 128] {
for paths in [1, 16, 128] {
group.throughput(Throughput::Elements(paths as u64));
group.bench_with_input(
BenchmarkId::new(tokens.to_string(), paths),
&(tokens, paths),
|b, &(tokens, paths)| {
let _guard = runtime.enter();
let mut config = origin::Config::new(std::num::NonZeroU64::new(2).unwrap());
config.update_hold = Duration::ZERO;
let (publish, driver) = origin::Producer::new(config);
harness::spawn(driver);
let (receive, driver) =
origin::Producer::new(origin::Config::new(std::num::NonZeroU64::new(1).unwrap()));
harness::spawn(driver);
let mut pair = runtime.block_on(pair(Some(Origins {
publish: &publish,
subscribe: receive.clone(),
})));
let mut generation = 0;
b.iter(|| {
runtime.block_on(async {
let handle = pair.client.auth();
let mut presenting =
std::pin::pin!(join_all((0..tokens).map(|_| added(&handle, "pending"))));
assert!(futures::poll!(presenting.as_mut()).is_pending());
let mut pending = Vec::with_capacity(tokens);
for _ in 0..tokens {
pending.push(pair.requests.next().await.unwrap());
}
let prefix = format!("wait/{generation}/");
generation += 1;
let broadcasts: Vec<_> = (0..paths)
.map(|path| {
let broadcast = publish
.route(
format!("{prefix}{path}").as_str(),
moq_net::origin::RouteOptions::hidden(),
)
.unwrap();
broadcast.announce().unwrap();
broadcast
})
.collect();
// Let the session reach its admission wait before the final reply widens it.
tokio::task::yield_now().await;
let mut issued = Vec::with_capacity(tokens);
for (index, request) in pending.into_iter().enumerate() {
issued.push(request.accept(if index + 1 == tokens {
auth::Grant::all()
} else {
auth::Grant::default()
}));
}
let tokens: Vec<_> = presenting.await.into_iter().map(Result::unwrap).collect();
let mut announced = receive.consume().routes();
let mut seen = std::collections::HashSet::new();
while seen.len() < paths {
match announced.next().await.unwrap() {
moq_net::origin::RouteEvent {
kind:
moq_net::origin::RouteKind::Start
| moq_net::origin::RouteKind::Update
| moq_net::origin::RouteKind::Restart,
announce: update,
} if update.prefix.as_str().starts_with(&prefix) => {
seen.insert(update.prefix);
}
_ => {}
}
drop(broadcasts);
drop(tokens);
join_all(issued.iter().map(auth::Issued::closed)).await;
})
});
},
);
}
}
drop(broadcasts);
drop(tokens);
join_all(issued.iter().map(auth::Issued::closed)).await;
})
});
},
);
}
group.finish();
}
group.finish();
}

/// Request-token lookup and shared withdrawal, sweeping distinct tokens and naming requests.
Expand Down