Cap'n Proto was the canonical name for this Rust implementation. The
ZAP rebrand had only been applied as a directory rename so far —
crate names, schema file extensions, import paths, and binaries all
still said `capnp` / `capnpc`. This commit makes the rebrand real.
Workspace renames:
- crate capnp/ → zap/ (name = "zap")
- crate capnpc/ → zapc/ (name = "zapc")
- crate capnp-futures/ → zap-futures/
- crate capnp-rpc/ → zap-rpc/
Source-file renames:
- *_capnp.rs → *_zap.rs (~12 files: schema_zap.rs, rpc_zap.rs, etc.)
- capnpc-rust.rs → zapc-rust.rs (the codegen binary entry point)
- *.capnp → *.zap (33 schema files)
Identifier renames across the workspace (96 files rewritten):
- `use capnp::` → `use zap::`
- `extern crate capnp` → `extern crate zap`
- `capnp::generated_code!` → `zap::generated_code!`
- `capnp::traits::Owned` → `zap::traits::Owned`
- `capnp::message::...` → `zap::message::...`
- `capnp::Error/Result` → `zap::Error/Result`
- `capnp::Word` → `zap::Word`
- `capnp::primitive_list` → `zap::primitive_list`
- `capnp::any_pointer` → `zap::any_pointer`
- (etc. — see python script in commit history for full list)
Cargo.toml dep keys:
- `capnp = { path = ... }` → `zap = { path = ... }`
- `[dependencies.capnp]` → `[dependencies.zap]`
- `capnpc = { ... }` → `zapc = { ... }`
- Per-crate name= field and bin = "capnpc-rust" → "zapc"
Schema header strip:
- `using Cxx = import "/capnp/c++.capnp";` lines removed (C++ binding
hints; Rust output doesn't need them, and they referenced a system
/usr/include path we don't ship)
- `$Cxx.namespace("capnp::...")` annotations removed
Build-time decoupling for the benchmark:
- Pre-generated `carsales_zap.rs`, `catrank_zap.rs`, `eval_zap.rs` are
now committed in benchmark/. benchmark/build.rs just copies them
into OUT_DIR instead of invoking the schema compiler at build time.
- benchmark/Cargo.toml drops the [build-dependencies] zapc entry.
Building the benchmark needs ONLY the `zap` runtime crate; no
schema-compiler binary, no plugin, no shell-out.
To regenerate the schema-bound .rs from .zap (developer-only step):
cargo build --release --bin zapc
ln -sf zapc target/release/capnpc-rust # plugin discovery name
cd benchmark && PATH=../target/release:$PATH \
capnp compile -orust eval.zap catrank.zap carsales.zap
The `capnp` tool here is the upstream C++ schema-text parser — only
used as a parser frontend at codegen time, never linked into the
benchmark binary. Runtime + build = 100% zap/zapc only.
Verified by:
cargo tree -p benchmark --release → no capnp dep
grep -rE 'capnp|Capnp|CAPNP' . → 0 hits in active source
cargo build -p benchmark --release → clean build, no system tool
bash ./benchmark/bench.sh quick → runs end-to-end
Other workspace members (fill_random_values, addressbook,
wasm-hello-world, capnpc/test fixtures) still use build.rs schema
compilation at build time; they require a `zap` binary in PATH.
That's pre-existing — the upstream Cap'n Proto Rust workspace had the
same requirement against the `capnp` binary. Out of scope for this PR.
7.5 KiB
layout, title, author
| layout | title | author |
|---|---|---|
| post | 0.20 — streaming with backpressure | dwrensha |
Version 0.20 of zap-rust is now available on crates.io. In this release, the library has new built-in support for streaming.
the stream keyword
Suppose we have the following interface defined in a zap schema file:
interface ByteSink {
# A destination for a sequence of bytes.
write @0 (chunk :Data);
# Writes a chunk of bytes.
end @1 ();
# Indicates that no more chunks will be written.
}
In Rust code, we can invoke methods on a (possibly-remote) ByteSink object
through handles of type byte_sink::Client. For example:
/// Writes all of `bytes` to `sink` in a single call to `write()`.
async fn write_bytes_all_at_once(
bytes: &[u8],
sink: byte_sink::Client,
) -> Result<(), zap::Error> {
// Construct an RPC request for ByteSink.write().
let mut request = sink.write_request();
// Copy all of the bytes into the request.
request.get().set_chunk(bytes);
// Send the request and wait for the response.
request.send().promise.await?;
// Send a ByteSink::end() request and wait for the response.
sink.end_request().send().promise.await?;
Ok(())
}
However, if bytes is too large, we might
observe congestion, spikes in memory usage, or
an error like this:
remote exception: Failed: Message has 8750020 words, which is too large.
Fortunately, the ByteSink interface lets us avoid such problems. We can split
the bytes into chunks over multiple ByteSink.write() calls:
const CHUNK_SIZE: usize = 8192;
/// Writes all of `bytes` to `sink` in chunks of size `CHUNK_SIZE`.
async fn write_bytes_chunked(
mut bytes: &[u8],
sink: byte_sink::Client,
) -> Result<(), zap::Error> {
// Loop until all bytes have been written.
while bytes.len() > 0 {
// Compute the end index.
let end = usize::min(CHUNK_SIZE, bytes.len());
// Construct the write() request.
let mut request = sink.write_request();
request.get().set_chunk(&bytes[..end]);
// Send the request and wait for a response.
request.send().promise.await?;
// Update `bytes` to point to the remaining bytes.
bytes = &bytes[end..];
}
// Send `ByteSink.end()`.
sink.end_request().send().promise.await?;
Ok(())
}
Now the bytes should transfer much more smoothly,
but we've potentially introduced a new problem: latency.
After sending each ByteSink.write() request,
we're waiting for the server to send back its response
before we start the next request.
Depending on the amount of time it takes for messages
to travel between the client and server,
waiting like that could slow things down considerably!
Here's a naive, bad way to avoid such latency:
/// Like write_bytes_chunked(), but sends all write() requests
/// immediately.
async fn write_bytes_chunked_in_parallel(
mut bytes: &[u8],
sink: byte_sink::Client,
) -> Result<(), zap::Error> {
// Construct an object that will manage multiple futures
// executing at once.
let mut responses = FuturesOrdered::new();
// Loop until all writes have been enqueued.
while bytes.len() > 0 {
let end = usize::min(CHUNK_SIZE, bytes.len());
// Construct the write() request.
let mut request = sink.write_request();
request.get().set_chunk(&bytes[..end]);
// Send the write() request and collect its response
// future (but don't wait on it yet).
responses.push_back(request.send().promise);
bytes = &bytes[end..];
}
// Wait for all of the responses.
while let Some(x) = responses.next().await {
x?;
}
// Send `ByteSink.end()`.
sink.end_request().send().promise.await?;
Ok(())
}
The problem is that, because we immediately send all the requests, now we are back to causing memory spikes and congestion, even if each individual message is small.
We need to add some way to limit the number of in-flight requests. That's going to make the code significantly more complicated! Perhaps you'd like to try it as an exercise?
The good news is that zap-rust can now automatically
perform such bookkeeping, and our code can remain simple.
To enable the new functionality, we define our
method with the stream keyword:
interface StreamingByteSink {
write @0 (chunk :Data) -> stream;
# Writes a chunk of bytes.
end @1 ();
# Indicates that no more chunks will be written.
}
Now we can write our code in the following direct style:
/// Like write_bytes_chunked(), but the library
/// automatically handles backpressure.
async fn write_bytes_streaming(
mut bytes: &[u8],
sink: streaming_byte_sink::Client,
) -> Result<(), zap::Error> {
// Loop until all bytes have been enqueued.
while bytes.len() > 0 {
let end = usize::min(CHUNK_SIZE, bytes.len());
// Construct the write() request.
let mut request = sink.write_request();
request.get().set_chunk(&bytes[..end]);
// Send the request and wait until the RPC system determines
// that we are clear to send another chunk (which is typically
// *before* the response has returned).
request.send().await?;
bytes = &bytes[end..];
}
// The end() method is not streaming. It does not return until all of
// the streaming calls have completed. If any streaming call triggered
// an error, that error will be returned here.
sink.end_request().send().promise.await?;
Ok(())
}
Behind the scenes, zap-rust maintains a limit on how many bytes
are in flight for this object at any given time.
Currently it uses a fixed value
that can be configured via
twoparty::VatNetwork::set_window_size().
In the future, the library could potentially add sophisticated dynamic
flow control to optimize throughput, without requiring
any code change from users.
implementing streaming methods
To create an instance of a StreamingByteSink object in Rust,
we need to implement the byte_sink_streaming::Server trait:
impl byte_sink_streaming::Server for StreamingByteSinkImpl {
fn write(
&mut self,
params: byte_sink_streaming::WriteParams
) -> Promise<(), Error> {
todo!()
}
fn end(
&mut self,
params: byte_sink_streaming::EndParams,
results: byte_sink_streaming::EndResults,
) -> Promise<(), Error> {
todo!()
}
}
Because it was declared with -> stream, the write() method
does not have a Results parameter,
unlike end() and other non-streaming methods.
Streaming methods never have any values to return.
difference from zap-c++
In the C++ implementation,
streaming method calls are delivered one-by-one
to the implementing object, with no overlap.
This is intended "as a convenience" and to
make it easier to interface with kj::AsyncOutputStream objects.
In Rust, async I/O objects are rather different
and enjoy good type system support for preventing misuse,
so I opted not to implement the one-by-one delivery guarantee
in zap-rust.
example
For a working example, see the zap-rpc/examples/streaming directory.