mirror of
https://github.com/zap-proto/rust.git
synced 2026-10-30 15:04:23 +00:00
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.
199 lines
7.1 KiB
Rust
199 lines
7.1 KiB
Rust
// Copyright (c) 2013-2016 Sandstorm Development Group, Inc. and contributors
|
|
// Licensed under the MIT License:
|
|
//
|
|
// 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.
|
|
|
|
use std::cell::{Cell, RefCell};
|
|
use std::collections::HashMap;
|
|
use std::rc::Rc;
|
|
|
|
use crate::pubsub_zap::{publisher, subscriber, subscription};
|
|
use zap_rpc::{rpc_twoparty_zap, twoparty, RpcSystem};
|
|
|
|
use futures::{AsyncReadExt, FutureExt, StreamExt};
|
|
|
|
struct SubscriberHandle {
|
|
client: subscriber::Client<::zap::text::Owned>,
|
|
requests_in_flight: i32,
|
|
}
|
|
|
|
struct SubscriberMap {
|
|
subscribers: HashMap<u64, SubscriberHandle>,
|
|
}
|
|
|
|
impl SubscriberMap {
|
|
fn new() -> Self {
|
|
Self {
|
|
subscribers: HashMap::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
struct SubscriptionImpl {
|
|
id: u64,
|
|
subscribers: Rc<RefCell<SubscriberMap>>,
|
|
}
|
|
|
|
impl SubscriptionImpl {
|
|
fn new(id: u64, subscribers: Rc<RefCell<SubscriberMap>>) -> Self {
|
|
Self { id, subscribers }
|
|
}
|
|
}
|
|
|
|
impl Drop for SubscriptionImpl {
|
|
fn drop(&mut self) {
|
|
println!("subscription dropped");
|
|
self.subscribers.borrow_mut().subscribers.remove(&self.id);
|
|
}
|
|
}
|
|
|
|
impl subscription::Server for SubscriptionImpl {}
|
|
|
|
struct PublisherImpl {
|
|
next_id: Cell<u64>,
|
|
subscribers: Rc<RefCell<SubscriberMap>>,
|
|
}
|
|
|
|
impl PublisherImpl {
|
|
pub fn new() -> (Self, Rc<RefCell<SubscriberMap>>) {
|
|
let subscribers = Rc::new(RefCell::new(SubscriberMap::new()));
|
|
(
|
|
Self {
|
|
next_id: Cell::new(0),
|
|
subscribers: subscribers.clone(),
|
|
},
|
|
subscribers,
|
|
)
|
|
}
|
|
}
|
|
|
|
impl publisher::Server<::zap::text::Owned> for PublisherImpl {
|
|
async fn subscribe(
|
|
self: Rc<Self>,
|
|
params: publisher::SubscribeParams<::zap::text::Owned>,
|
|
mut results: publisher::SubscribeResults<::zap::text::Owned>,
|
|
) -> Result<(), ::zap::Error> {
|
|
println!("subscribe");
|
|
self.subscribers.borrow_mut().subscribers.insert(
|
|
self.next_id.get(),
|
|
SubscriberHandle {
|
|
client: params.get()?.get_subscriber()?,
|
|
requests_in_flight: 0,
|
|
},
|
|
);
|
|
|
|
results
|
|
.get()
|
|
.set_subscription(zap_rpc::new_client(SubscriptionImpl::new(
|
|
self.next_id.get(),
|
|
self.subscribers.clone(),
|
|
)));
|
|
|
|
self.next_id.set(self.next_id.get() + 1);
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
pub async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|
use std::net::ToSocketAddrs;
|
|
let args: Vec<String> = ::std::env::args().collect();
|
|
if args.len() != 3 {
|
|
println!("usage: {} server HOST:PORT", args[0]);
|
|
return Ok(());
|
|
}
|
|
|
|
let addr = args[2]
|
|
.to_socket_addrs()?
|
|
.next()
|
|
.expect("could not parse address");
|
|
|
|
tokio::task::LocalSet::new()
|
|
.run_until(async move {
|
|
let listener = tokio::net::TcpListener::bind(&addr).await?;
|
|
let (publisher_impl, subscribers) = PublisherImpl::new();
|
|
let publisher: publisher::Client<_> = zap_rpc::new_client(publisher_impl);
|
|
|
|
let handle_incoming = async move {
|
|
loop {
|
|
let (stream, _) = listener.accept().await?;
|
|
stream.set_nodelay(true)?;
|
|
let (reader, writer) =
|
|
tokio_util::compat::TokioAsyncReadCompatExt::compat(stream).split();
|
|
let network = twoparty::VatNetwork::new(
|
|
futures::io::BufReader::new(reader),
|
|
futures::io::BufWriter::new(writer),
|
|
rpc_twoparty_zap::Side::Server,
|
|
Default::default(),
|
|
);
|
|
let rpc_system =
|
|
RpcSystem::new(Box::new(network), Some(publisher.clone().client));
|
|
|
|
tokio::task::spawn_local(rpc_system);
|
|
}
|
|
};
|
|
|
|
// Trigger sending approximately once per second.
|
|
let (tx, mut rx) = futures::channel::mpsc::unbounded::<()>();
|
|
std::thread::spawn(move || {
|
|
while let Ok(()) = tx.unbounded_send(()) {
|
|
std::thread::sleep(std::time::Duration::from_millis(1000));
|
|
}
|
|
});
|
|
|
|
let send_to_subscribers = async move {
|
|
while let Some(()) = rx.next().await {
|
|
let subscribers1 = subscribers.clone();
|
|
let subs = &mut subscribers.borrow_mut().subscribers;
|
|
for (&idx, subscriber) in subs.iter_mut() {
|
|
if subscriber.requests_in_flight < 5 {
|
|
subscriber.requests_in_flight += 1;
|
|
let mut request = subscriber.client.push_message_request();
|
|
request.get().set_message(format!(
|
|
"system time is: {:?}",
|
|
::std::time::SystemTime::now()
|
|
))?;
|
|
let subscribers2 = subscribers1.clone();
|
|
tokio::task::spawn_local(request.send().promise.map(
|
|
move |r| match r {
|
|
Ok(_) => {
|
|
if let Some(ref mut s) =
|
|
subscribers2.borrow_mut().subscribers.get_mut(&idx)
|
|
{
|
|
s.requests_in_flight -= 1;
|
|
}
|
|
}
|
|
Err(e) => {
|
|
println!("Got error: {e:?}. Dropping subscriber.");
|
|
subscribers2.borrow_mut().subscribers.remove(&idx);
|
|
}
|
|
},
|
|
));
|
|
}
|
|
}
|
|
}
|
|
Ok::<(), Box<dyn std::error::Error>>(())
|
|
};
|
|
|
|
let _: ((), ()) =
|
|
futures::future::try_join(handle_incoming, send_to_subscribers).await?;
|
|
Ok(())
|
|
})
|
|
.await
|
|
}
|