Apply rustfmt to entire workspace
Runs cargo fmt --all; all 573 tests still passing, clippy still clean. No logic changes — formatting only. Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
This commit is contained in:
co-authored by
Claude Sonnet 4.6
parent
3d524e2d63
commit
1c107fe58a
@@ -78,17 +78,25 @@ async fn serve_one(server: TcpServer, server_onion_path: PathBuf) {
|
||||
let server_onion = OnionFile::open(&server_onion_path).unwrap();
|
||||
let server_rev_count = server_onion.revision_count();
|
||||
let manifest = ClawSyncManifest::from_onion("bench-server", &server_onion, H5_MAGIC);
|
||||
conn.send(&SyncMessage::ManifestResponse { manifest }).await.unwrap();
|
||||
conn.send(&SyncMessage::ManifestResponse { manifest })
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
if server_rev_count > client_rev_count {
|
||||
// Server is ahead — push its extra revisions to client
|
||||
let client_head = if client_rev_count == 0 { NO_PARENT } else { client_rev_count - 1 };
|
||||
let client_head = if client_rev_count == 0 {
|
||||
NO_PARENT
|
||||
} else {
|
||||
client_rev_count - 1
|
||||
};
|
||||
let packets = diff_revisions(&server_onion, client_head).unwrap();
|
||||
let total = packets.len() as u64;
|
||||
let mut bytes_sent = 0u64;
|
||||
for packet in packets {
|
||||
bytes_sent += packet.page_data_size() as u64;
|
||||
conn.send(&SyncMessage::LayerPacket { packet }).await.unwrap();
|
||||
conn.send(&SyncMessage::LayerPacket { packet })
|
||||
.await
|
||||
.unwrap();
|
||||
match conn.recv().await.unwrap() {
|
||||
SyncMessage::Ack { .. } => {}
|
||||
other => panic!("server: expected Ack, got {other:?}"),
|
||||
@@ -96,8 +104,10 @@ async fn serve_one(server: TcpServer, server_onion_path: PathBuf) {
|
||||
}
|
||||
conn.send(&SyncMessage::SyncComplete {
|
||||
revisions_transferred: total,
|
||||
bytes_transferred: bytes_sent,
|
||||
}).await.unwrap();
|
||||
bytes_transferred: bytes_sent,
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
} else {
|
||||
// Server is behind or equal — receive packets from client
|
||||
let mut server_onion_rw = OnionFile::open(&server_onion_path).unwrap();
|
||||
@@ -106,7 +116,9 @@ async fn serve_one(server: TcpServer, server_onion_path: PathBuf) {
|
||||
match conn.recv().await.unwrap() {
|
||||
SyncMessage::LayerPacket { packet } => {
|
||||
let rev = packet.revision;
|
||||
conn.send(&SyncMessage::Ack { revision: rev }).await.unwrap();
|
||||
conn.send(&SyncMessage::Ack { revision: rev })
|
||||
.await
|
||||
.unwrap();
|
||||
packets.push(packet);
|
||||
}
|
||||
SyncMessage::SyncComplete { .. } => {
|
||||
@@ -157,7 +169,10 @@ fn bench_e2e(c: &mut Criterion) {
|
||||
rt.block_on(async {
|
||||
let server_task = tokio::spawn(serve_one(server, dst_h5));
|
||||
let backend = TcpSyncBackend::new(addr, "bench-agent");
|
||||
backend.push(Path::new(&src_h5), &SyncSelector::All).await.unwrap();
|
||||
backend
|
||||
.push(Path::new(&src_h5), &SyncSelector::All)
|
||||
.await
|
||||
.unwrap();
|
||||
server_task.await.unwrap();
|
||||
});
|
||||
drop(src_dir);
|
||||
@@ -275,7 +290,10 @@ fn bench_e2e(c: &mut Criterion) {
|
||||
let addr = server.local_addr;
|
||||
let server_task = tokio::spawn(serve_one(server, dst_h5));
|
||||
let backend = TcpSyncBackend::new(addr, "bench-agent");
|
||||
let stats = backend.push(Path::new(&src_h5), &SyncSelector::All).await.unwrap();
|
||||
let stats = backend
|
||||
.push(Path::new(&src_h5), &SyncSelector::All)
|
||||
.await
|
||||
.unwrap();
|
||||
server_task.await.unwrap();
|
||||
stats.revisions_transferred
|
||||
});
|
||||
|
||||
@@ -78,13 +78,13 @@ async fn serve_with_latency(server: TcpServer, rtt_ms: f64) {
|
||||
|
||||
conn.send(&SyncMessage::ManifestResponse {
|
||||
manifest: ClawSyncManifest {
|
||||
agent_id: "bench-server".to_string(),
|
||||
file_blake3: [0u8; 32],
|
||||
agent_id: "bench-server".to_string(),
|
||||
file_blake3: [0u8; 32],
|
||||
revision_count: 0,
|
||||
head_revision: 0,
|
||||
head_blake3: [0u8; 32],
|
||||
revisions: vec![],
|
||||
last_write: 0.0,
|
||||
head_revision: 0,
|
||||
head_blake3: [0u8; 32],
|
||||
revisions: vec![],
|
||||
last_write: 0.0,
|
||||
},
|
||||
})
|
||||
.await
|
||||
@@ -98,7 +98,9 @@ async fn serve_with_latency(server: TcpServer, rtt_ms: f64) {
|
||||
let rev = packet.revision;
|
||||
// Inject simulated WAN RTT before sending Ack.
|
||||
tokio::time::sleep(delay).await;
|
||||
conn.send(&SyncMessage::Ack { revision: rev }).await.unwrap();
|
||||
conn.send(&SyncMessage::Ack { revision: rev })
|
||||
.await
|
||||
.unwrap();
|
||||
received += 1;
|
||||
}
|
||||
SyncMessage::SyncComplete { .. } => break,
|
||||
@@ -120,8 +122,8 @@ async fn pipelined_push(addr: SocketAddr, onion: &OnionFile, window: usize) {
|
||||
|
||||
let rev_count = onion.revision_count();
|
||||
conn.send(&SyncMessage::ManifestRequest {
|
||||
agent_id: "bench-client".to_string(),
|
||||
head_revision: rev_count.saturating_sub(1),
|
||||
agent_id: "bench-client".to_string(),
|
||||
head_revision: rev_count.saturating_sub(1),
|
||||
revision_count: rev_count,
|
||||
})
|
||||
.await
|
||||
@@ -170,7 +172,7 @@ async fn pipelined_push(addr: SocketAddr, onion: &OnionFile, window: usize) {
|
||||
write_half
|
||||
.send(&SyncMessage::SyncComplete {
|
||||
revisions_transferred: sent,
|
||||
bytes_transferred: bytes_sent,
|
||||
bytes_transferred: bytes_sent,
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
@@ -197,12 +199,12 @@ fn bench_wan_pipeline(c: &mut Criterion) {
|
||||
// At 1 ms RTT: W=1 ≈ 100 ms/iter, W=16 ≈ 7 ms/iter
|
||||
// At 5 ms RTT: W=1 ≈ 500 ms/iter, W=16 ≈ 32 ms/iter
|
||||
let params: &[(f64, usize, &str)] = &[
|
||||
(1.0, 1, "rtt_1ms_W1"),
|
||||
(1.0, 4, "rtt_1ms_W4"),
|
||||
(1.0, 16, "rtt_1ms_W16"),
|
||||
(5.0, 1, "rtt_5ms_W1"),
|
||||
(5.0, 4, "rtt_5ms_W4"),
|
||||
(5.0, 16, "rtt_5ms_W16"),
|
||||
(1.0, 1, "rtt_1ms_W1"),
|
||||
(1.0, 4, "rtt_1ms_W4"),
|
||||
(1.0, 16, "rtt_1ms_W16"),
|
||||
(5.0, 1, "rtt_5ms_W1"),
|
||||
(5.0, 4, "rtt_5ms_W4"),
|
||||
(5.0, 16, "rtt_5ms_W16"),
|
||||
];
|
||||
|
||||
for &(rtt_ms, window, label) in params {
|
||||
@@ -223,8 +225,7 @@ fn bench_wan_pipeline(c: &mut Criterion) {
|
||||
// TIMED: full push with simulated WAN latency
|
||||
let _ = (dir, path); // keep TempDir alive
|
||||
rt.block_on(async {
|
||||
let server_task =
|
||||
tokio::spawn(serve_with_latency(server, rtt_ms));
|
||||
let server_task = tokio::spawn(serve_with_latency(server, rtt_ms));
|
||||
pipelined_push(addr, &onion, window).await;
|
||||
server_task.await.unwrap();
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user