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.
177 lines
6.8 KiB
Rust
177 lines
6.8 KiB
Rust
// Copyright (c) 2013-2014 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 crate::carsales_zap::{car, parking_lot, total_value, Color};
|
|
use crate::common::*;
|
|
|
|
trait CarValue {
|
|
fn car_value(self) -> ::zap::Result<u64>;
|
|
}
|
|
|
|
macro_rules! car_value_impl(
|
|
($typ:ident) => (
|
|
impl <'a> CarValue for car::$typ<'a> {
|
|
fn car_value (mut self) -> ::zap::Result<u64> {
|
|
#![allow(unused_mut)]
|
|
let mut result : u64 = 0;
|
|
result += self.reborrow().get_seats() as u64 * 200;
|
|
result += self.reborrow().get_doors() as u64 * 350;
|
|
|
|
// Using an iterator here slows things down considerably.
|
|
// TODO: investigate why.
|
|
{
|
|
let mut wheels = self.reborrow().get_wheels()?;
|
|
for ii in 0..wheels.len() {
|
|
let mut wheel = wheels.reborrow().get(ii);
|
|
result += wheel.reborrow().get_diameter() as u64 * wheel.reborrow().get_diameter() as u64;
|
|
result += if wheel.reborrow().get_snow_tires() { 100 } else { 0 };
|
|
}
|
|
}
|
|
|
|
result += self.reborrow().get_length() as u64 *
|
|
self.reborrow().get_width() as u64 * self.reborrow().get_height() as u64 / 50;
|
|
|
|
{
|
|
let mut engine = self.reborrow().get_engine()?;
|
|
result += engine.reborrow().get_horsepower() as u64 * 40;
|
|
if engine.reborrow().get_uses_electric() {
|
|
if engine.reborrow().get_uses_gas() {
|
|
//# hybrid
|
|
result += 5000;
|
|
} else {
|
|
result += 3000;
|
|
}
|
|
}
|
|
}
|
|
|
|
result += if self.reborrow().get_has_power_windows() { 100 } else { 0 };
|
|
result += if self.reborrow().get_has_power_steering() { 200 } else { 0 };
|
|
result += if self.reborrow().get_has_cruise_control() { 400 } else { 0 };
|
|
result += if self.reborrow().get_has_nav_system() { 2000 } else { 0 };
|
|
|
|
result += self.reborrow().get_cup_holders() as u64 * 25;
|
|
|
|
Ok(result)
|
|
}
|
|
}
|
|
)
|
|
);
|
|
|
|
car_value_impl!(Reader);
|
|
car_value_impl!(Builder);
|
|
|
|
const MAKES: [&str; 5] = ["Toyota", "GM", "Ford", "Honda", "Tesla"];
|
|
const MODELS: [&str; 6] = ["Camry", "Prius", "Volt", "Accord", "Leaf", "Model S"];
|
|
|
|
pub fn random_car(rng: &mut FastRand, mut car: car::Builder) {
|
|
car.set_make(MAKES[rng.next_less_than(MAKES.len() as u32) as usize]);
|
|
car.set_model(MODELS[rng.next_less_than(MODELS.len() as u32) as usize]);
|
|
|
|
car.set_color(
|
|
(rng.next_less_than(Color::Silver as u32 + 1) as u16)
|
|
.try_into()
|
|
.unwrap(),
|
|
);
|
|
car.set_seats(2 + rng.next_less_than(6) as u8);
|
|
car.set_doors(2 + rng.next_less_than(3) as u8);
|
|
|
|
{
|
|
let mut wheels = car.reborrow().init_wheels(4);
|
|
for ii in 0..wheels.len() {
|
|
let mut wheel = wheels.reborrow().get(ii);
|
|
wheel.set_diameter(25 + rng.next_less_than(15) as u16);
|
|
wheel.set_air_pressure((30.0 + rng.next_double(20.0)) as f32);
|
|
wheel.set_snow_tires(rng.next_less_than(16) == 0);
|
|
}
|
|
}
|
|
|
|
let length = 170 + rng.next_less_than(150) as u16;
|
|
let width = 48 + rng.next_less_than(36) as u16;
|
|
let height = 54 + rng.next_less_than(48) as u16;
|
|
car.set_length(length);
|
|
car.set_width(width);
|
|
car.set_height(height);
|
|
car.set_weight(length as u32 * width as u32 * height as u32 / 200);
|
|
|
|
{
|
|
let mut engine = car.reborrow().init_engine();
|
|
engine.set_horsepower(100 * rng.next_less_than(400) as u16);
|
|
engine.set_cylinders(4 + 2 * rng.next_less_than(3) as u8);
|
|
engine.set_cc(800 + rng.next_less_than(10000));
|
|
engine.set_uses_gas(true);
|
|
engine.set_uses_electric(rng.next_bool());
|
|
}
|
|
|
|
let fuel_capacity = (10.0 + rng.next_double(30.0)) as f32;
|
|
car.set_fuel_capacity(fuel_capacity);
|
|
car.set_fuel_level(rng.next_double(fuel_capacity as f64) as f32);
|
|
car.set_has_power_windows(rng.next_bool());
|
|
car.set_has_power_steering(rng.next_bool());
|
|
car.set_has_cruise_control(rng.next_bool());
|
|
car.set_cup_holders(rng.next_less_than(12) as u8);
|
|
car.set_has_nav_system(rng.next_bool());
|
|
}
|
|
|
|
pub struct CarSales;
|
|
|
|
impl crate::TestCase for CarSales {
|
|
type Request = parking_lot::Owned;
|
|
type Response = total_value::Owned;
|
|
type Expectation = u64;
|
|
|
|
fn setup_request(&self, rng: &mut FastRand, request: parking_lot::Builder) -> u64 {
|
|
let mut result = 0;
|
|
let mut cars = request.init_cars(rng.next_less_than(200));
|
|
for ii in 0..cars.len() {
|
|
let mut car = cars.reborrow().get(ii);
|
|
random_car(rng, car.reborrow());
|
|
result += car.car_value().unwrap();
|
|
}
|
|
|
|
result
|
|
}
|
|
|
|
fn handle_request(
|
|
&self,
|
|
request: parking_lot::Reader,
|
|
mut response: total_value::Builder,
|
|
) -> ::zap::Result<()> {
|
|
let mut result = 0;
|
|
for car in request.get_cars()? {
|
|
result += car.car_value()?;
|
|
}
|
|
response.set_amount(result);
|
|
Ok(())
|
|
}
|
|
|
|
fn check_response(&self, response: total_value::Reader, expected: u64) -> ::zap::Result<()> {
|
|
if response.get_amount() == expected {
|
|
Ok(())
|
|
} else {
|
|
Err(::zap::Error::failed(format!(
|
|
"check_response() expected {} but got {}",
|
|
expected,
|
|
response.get_amount()
|
|
)))
|
|
}
|
|
}
|
|
}
|