Compare commits
285 Commits
alternate_
...
main
Author | SHA1 | Date |
---|---|---|
Tony Garnock-Jones | 6468e16790 | |
Tony Garnock-Jones | 65101e900e | |
Tony Garnock-Jones | 581886835a | |
Tony Garnock-Jones | dcb1aec142 | |
Tony Garnock-Jones | c0239cf322 | |
Tony Garnock-Jones | 9cc4175f24 | |
Tony Garnock-Jones | 70f42dd931 | |
Tony Garnock-Jones | ef1ebe6412 | |
Tony Garnock-Jones | deec008c66 | |
Tony Garnock-Jones | 008671d0b2 | |
Tony Garnock-Jones | 9fcf22e1b5 | |
Tony Garnock-Jones | ca18ca08df | |
Tony Garnock-Jones | 40ca168eac | |
Tony Garnock-Jones | 5a73e8d4c3 | |
Tony Garnock-Jones | 91b26001d8 | |
Tony Garnock-Jones | b83b39515d | |
Tony Garnock-Jones | d9fa6362af | |
Tony Garnock-Jones | 94598a574b | |
Tony Garnock-Jones | 80ad0914ed | |
Tony Garnock-Jones | bdb0cc1023 | |
Tony Garnock-Jones | 710ff91a64 | |
Tony Garnock-Jones | d3748a286b | |
Tony Garnock-Jones | a56aec2c30 | |
Tony Garnock-Jones | 0c06ae9601 | |
Tony Garnock-Jones | 1f0c9d2883 | |
Tony Garnock-Jones | 615830f799 | |
Tony Garnock-Jones | 3c44768a72 | |
Tony Garnock-Jones | 04bb8c2f23 | |
Tony Garnock-Jones | 9084c1781e | |
Tony Garnock-Jones | 8a817fcb4f | |
Tony Garnock-Jones | 2ed2b38edc | |
Tony Garnock-Jones | 5090625f47 | |
Tony Garnock-Jones | a7ede65bad | |
Tony Garnock-Jones | c59e044695 | |
Tony Garnock-Jones | ef98217a3a | |
Tony Garnock-Jones | bf0d47f1b7 | |
Tony Garnock-Jones | fef41f39eb | |
Tony Garnock-Jones | 0b72b4029b | |
Tony Garnock-Jones | 40a239c9eb | |
Tony Garnock-Jones | 55456621d4 | |
Tony Garnock-Jones | 7797a3cd09 | |
Tony Garnock-Jones | eb9d9bed0f | |
Tony Garnock-Jones | b96c469ef5 | |
Tony Garnock-Jones | 34f611f4fe | |
Tony Garnock-Jones | 58c24c30c4 | |
Tony Garnock-Jones | fa990bc042 | |
Tony Garnock-Jones | 060ba36d2e | |
Tony Garnock-Jones | ecd5e87823 | |
Tony Garnock-Jones | a401e5fcd1 | |
Tony Garnock-Jones | 5db05b2df2 | |
Tony Garnock-Jones | f4a4b4d595 | |
Tony Garnock-Jones | b7d4bd4b58 | |
Tony Garnock-Jones | 41cf85f865 | |
Tony Garnock-Jones | 4fcb14d63e | |
Tony Garnock-Jones | b4f355aa0d | |
Tony Garnock-Jones | 5a431b2060 | |
Tony Garnock-Jones | 1ff222b291 | |
Tony Garnock-Jones | e501d0f76a | |
Tony Garnock-Jones | 2e65d31d5d | |
Tony Garnock-Jones | 852f0f4722 | |
Tony Garnock-Jones | 9850c73993 | |
Tony Garnock-Jones | 9864ce0ec8 | |
Tony Garnock-Jones | 19b1e84e43 | |
Tony Garnock-Jones | 3649cc1237 | |
Tony Garnock-Jones | 0f2d9239f9 | |
Tony Garnock-Jones | 0514f11d0f | |
Tony Garnock-Jones | 12428bbdf6 | |
Tony Garnock-Jones | 5dd68e87c1 | |
Tony Garnock-Jones | e2a32b891d | |
Tony Garnock-Jones | 461ac034f8 | |
Tony Garnock-Jones | 19cbceda7a | |
Tony Garnock-Jones | 97876335ba | |
Tony Garnock-Jones | d7b330e6dd | |
Tony Garnock-Jones | 3cbe17790d | |
Tony Garnock-Jones | 1d97ed1b55 | |
Tony Garnock-Jones | 15914aa153 | |
Tony Garnock-Jones | 4f42bbe7b6 | |
Tony Garnock-Jones | 9c32a4a4b8 | |
Tony Garnock-Jones | 56f04786ab | |
Tony Garnock-Jones | 545e247c21 | |
Tony Garnock-Jones | 06f16d42ec | |
Tony Garnock-Jones | fe861e516f | |
Tony Garnock-Jones | 13c841ce6e | |
Tony Garnock-Jones | 9ae1be6f56 | |
Tony Garnock-Jones | 9786bcb285 | |
Tony Garnock-Jones | abb2978b9a | |
Tony Garnock-Jones | b1e20ac706 | |
Tony Garnock-Jones | 34b59cff3b | |
Tony Garnock-Jones | d514a5178f | |
Tony Garnock-Jones | e88c335735 | |
Tony Garnock-Jones | a38765affa | |
Tony Garnock-Jones | 65dae05890 | |
Tony Garnock-Jones | 090ac8780f | |
Tony Garnock-Jones | bbaacd3038 | |
Tony Garnock-Jones | 1d61ea0c8e | |
Tony Garnock-Jones | 1e9e60207b | |
Tony Garnock-Jones | 702057023d | |
Tony Garnock-Jones | 1f7930d31a | |
Tony Garnock-Jones | 764fb3b866 | |
Tony Garnock-Jones | 726265132f | |
Tony Garnock-Jones | f6b6dd25f1 | |
Tony Garnock-Jones | 94c7de2a08 | |
Tony Garnock-Jones | e4c2634088 | |
Tony Garnock-Jones | cbaeba7bba | |
Tony Garnock-Jones | f8c76e9230 | |
Tony Garnock-Jones | fe9ceaf65c | |
Tony Garnock-Jones | 60e6c6badf | |
Tony Garnock-Jones | 2bf2e29dc2 | |
Tony Garnock-Jones | 9a148ecfcc | |
Tony Garnock-Jones | 2104bc1ff0 | |
Tony Garnock-Jones | 17a9c96342 | |
Tony Garnock-Jones | 3c4ba48624 | |
Tony Garnock-Jones | e063a3f84d | |
Tony Garnock-Jones | 72566ac223 | |
Tony Garnock-Jones | 4e30ef48dc | |
Tony Garnock-Jones | d66840bae7 | |
Tony Garnock-Jones | 768fdd6448 | |
Tony Garnock-Jones | 8055895319 | |
Tony Garnock-Jones | a83999d6ed | |
Tony Garnock-Jones | 1f7b7a02b1 | |
Tony Garnock-Jones | 24b6217897 | |
Tony Garnock-Jones | d517fc4e92 | |
Tony Garnock-Jones | a0c40eadd0 | |
Tony Garnock-Jones | fc420d1a86 | |
Tony Garnock-Jones | f3e5652eee | |
Tony Garnock-Jones | 538ad4244c | |
Tony Garnock-Jones | 1cb2eba0e4 | |
Tony Garnock-Jones | a9971fc35a | |
Tony Garnock-Jones | 8dead81cef | |
Tony Garnock-Jones | 16681841a7 | |
Tony Garnock-Jones | 97fdfe6136 | |
Tony Garnock-Jones | c26b67f286 | |
Tony Garnock-Jones | 65db64fce1 | |
Tony Garnock-Jones | 0432f8a04a | |
Tony Garnock-Jones | dd69d5caaa | |
Tony Garnock-Jones | e6bc6d091f | |
Tony Garnock-Jones | 4c9505d28e | |
Tony Garnock-Jones | a74cd19526 | |
Tony Garnock-Jones | 5f3558817e | |
Tony Garnock-Jones | b4a3f743b5 | |
Tony Garnock-Jones | a340b127d7 | |
Tony Garnock-Jones | 08486b4b1c | |
Tony Garnock-Jones | d8a139b23a | |
Tony Garnock-Jones | 990f3fe4cb | |
Tony Garnock-Jones | 3a3c3c0ee4 | |
Tony Garnock-Jones | 46fd2dec3b | |
Tony Garnock-Jones | 7d7b3135ba | |
Tony Garnock-Jones | 06d52c43da | |
Tony Garnock-Jones | 1ae2583414 | |
Tony Garnock-Jones | 4dca1b1615 | |
Tony Garnock-Jones | 45406c75ac | |
Tony Garnock-Jones | f3c9662607 | |
Tony Garnock-Jones | f134d0227d | |
Tony Garnock-Jones | 82624d3007 | |
Tony Garnock-Jones | 8de00045e6 | |
Tony Garnock-Jones | 8b690b9103 | |
Tony Garnock-Jones | f8d1acfa3e | |
Tony Garnock-Jones | 5a52f243e5 | |
Tony Garnock-Jones | 6224baa2b6 | |
Tony Garnock-Jones | 00c99d96df | |
Tony Garnock-Jones | 6ec6bbaf41 | |
Tony Garnock-Jones | ddc94bfa60 | |
Tony Garnock-Jones | 8619342e5e | |
Tony Garnock-Jones | 5bcb268ff8 | |
Tony Garnock-Jones | 7e8dcef0e2 | |
Tony Garnock-Jones | 9a5d452754 | |
Tony Garnock-Jones | 9cd2e6776c | |
Tony Garnock-Jones | c0d4b535a3 | |
Tony Garnock-Jones | 3c1cb11779 | |
Tony Garnock-Jones | a086c1d721 | |
Tony Garnock-Jones | bc41182533 | |
Tony Garnock-Jones | 2ad99b56b8 | |
Tony Garnock-Jones | a2013287db | |
Tony Garnock-Jones | 7de2752068 | |
Tony Garnock-Jones | d2c783927c | |
Tony Garnock-Jones | f6b88ee3fb | |
Tony Garnock-Jones | ee8a23aa2e | |
Tony Garnock-Jones | 833be7b293 | |
Tony Garnock-Jones | 12eaeb8f62 | |
Tony Garnock-Jones | 5cd0335a79 | |
Tony Garnock-Jones | b52da09081 | |
Tony Garnock-Jones | 9ca618268e | |
Tony Garnock-Jones | 1879c52963 | |
Tony Garnock-Jones | 9f1f76d0ca | |
Tony Garnock-Jones | f4078aabaa | |
Tony Garnock-Jones | 557a36756f | |
Tony Garnock-Jones | 9f88765cf7 | |
Tony Garnock-Jones | 2a11bc6bbb | |
Tony Garnock-Jones | 1dac3e5a19 | |
Tony Garnock-Jones | 2382157039 | |
Tony Garnock-Jones | 69c526436f | |
Tony Garnock-Jones | 9761e68bd0 | |
Tony Garnock-Jones | 4becf23caa | |
Tony Garnock-Jones | 94040ae566 | |
Tony Garnock-Jones | c3571a2faf | |
Tony Garnock-Jones | dbbbc8c1c6 | |
Tony Garnock-Jones | 3dea29ffe4 | |
Tony Garnock-Jones | f3424c160d | |
Tony Garnock-Jones | 049ef9aea7 | |
Tony Garnock-Jones | 07a5f688be | |
Tony Garnock-Jones | 48c61098c4 | |
Tony Garnock-Jones | fff84d4c2a | |
Tony Garnock-Jones | bc62cab348 | |
Tony Garnock-Jones | 5983cd01f1 | |
Tony Garnock-Jones | e8881f5980 | |
Tony Garnock-Jones | 40b4681a6e | |
Tony Garnock-Jones | 0f5e033174 | |
Tony Garnock-Jones | aae53b5525 | |
Tony Garnock-Jones | fce32a589c | |
Tony Garnock-Jones | bae21fb69b | |
Tony Garnock-Jones | 25ef92f78e | |
Tony Garnock-Jones | 2f6f1dde26 | |
Tony Garnock-Jones | b5564979f0 | |
Tony Garnock-Jones | 5ca6bdb3bb | |
Tony Garnock-Jones | 11b5a187b9 | |
Tony Garnock-Jones | 1cb89f0b6b | |
Tony Garnock-Jones | 4c03646567 | |
Tony Garnock-Jones | 90940b3c3d | |
Tony Garnock-Jones | eb2bd3cf8e | |
Tony Garnock-Jones | 451a298f94 | |
Tony Garnock-Jones | 181523d05c | |
Tony Garnock-Jones | 4ce2093e52 | |
Tony Garnock-Jones | 2f3b186262 | |
Tony Garnock-Jones | e21485c44d | |
Tony Garnock-Jones | 86347412e7 | |
Tony Garnock-Jones | 2d46d87f58 | |
Tony Garnock-Jones | 54103f87eb | |
Tony Garnock-Jones | 4a6bb3e143 | |
Tony Garnock-Jones | cdfe157fd9 | |
Tony Garnock-Jones | fbfafc1d1d | |
Tony Garnock-Jones | e1eb7ae3dd | |
Tony Garnock-Jones | f2be0d5e62 | |
Tony Garnock-Jones | fc930059d3 | |
Tony Garnock-Jones | bcaf08c602 | |
Tony Garnock-Jones | 9293bd3904 | |
Tony Garnock-Jones | bf1552d9a8 | |
Tony Garnock-Jones | a7ec157437 | |
Tony Garnock-Jones | ccfcf6ec26 | |
Tony Garnock-Jones | af679531b4 | |
Tony Garnock-Jones | ec8ba36d6a | |
Tony Garnock-Jones | ec453b7db7 | |
Tony Garnock-Jones | efb76bfe91 | |
Tony Garnock-Jones | fb31ea44cf | |
Tony Garnock-Jones | d75bfe4e35 | |
Tony Garnock-Jones | 393514fb3a | |
Tony Garnock-Jones | 406f22703b | |
Tony Garnock-Jones | 4f0145e161 | |
Tony Garnock-Jones | b09fbdceec | |
Tony Garnock-Jones | b556414fec | |
Tony Garnock-Jones | ca92d99c52 | |
Tony Garnock-Jones | 98c76df2f7 | |
Tony Garnock-Jones | 0a0d977a48 | |
Tony Garnock-Jones | 8a0675d8ee | |
Tony Garnock-Jones | af2578f887 | |
Tony Garnock-Jones | 84ebf530d3 | |
Tony Garnock-Jones | f88592282d | |
Tony Garnock-Jones | 98731ba968 | |
Tony Garnock-Jones | d820601eea | |
Tony Garnock-Jones | 28b0c5b4d5 | |
Tony Garnock-Jones | 19c96bdef2 | |
Tony Garnock-Jones | 99a027dc26 | |
Tony Garnock-Jones | 9add501124 | |
Tony Garnock-Jones | 38a5279827 | |
Tony Garnock-Jones | 1244e416d0 | |
Tony Garnock-Jones | d7a847de37 | |
Tony Garnock-Jones | 4ea07cdd6b | |
Tony Garnock-Jones | 70c442ad47 | |
Tony Garnock-Jones | 7e4654c8f7 | |
Tony Garnock-Jones | 1111776754 | |
Tony Garnock-Jones | cc11120f23 | |
Tony Garnock-Jones | e600d59f6e | |
Tony Garnock-Jones | 9080dc6f1e | |
Tony Garnock-Jones | a9f83e0a9d | |
Tony Garnock-Jones | ab34b62cf1 | |
Tony Garnock-Jones | 4dc613a091 | |
Tony Garnock-Jones | f7a5edff39 | |
Tony Garnock-Jones | 5a65256cf3 | |
Tony Garnock-Jones | 650463ff20 | |
Tony Garnock-Jones | c951cea508 | |
Tony Garnock-Jones | 257c604e2b | |
Tony Garnock-Jones | a06d532006 | |
Tony Garnock-Jones | 45f9abfd97 | |
Tony Garnock-Jones | 894f0a648a | |
Tony Garnock-Jones | e6a2a25f62 | |
Tony Garnock-Jones | 3d3c1ebf70 |
|
@ -1,3 +1,4 @@
|
|||
/target
|
||||
**/*.rs.bk
|
||||
localdev/
|
||||
scratch/
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -4,7 +4,9 @@ cargo-features = ["strip"]
|
|||
members = [
|
||||
"syndicate",
|
||||
"syndicate-macros",
|
||||
"syndicate-schema-plugin",
|
||||
"syndicate-server",
|
||||
"syndicate-tools",
|
||||
]
|
||||
|
||||
# [patch.crates-io]
|
||||
|
@ -24,3 +26,9 @@ strip = true
|
|||
|
||||
[profile.bench]
|
||||
debug = true
|
||||
|
||||
# [patch.crates-io]
|
||||
# # Unfortunately, until [1] is fixed (perhaps via [2]), we have to use a patched proc-macro2.
|
||||
# # [1]: https://github.com/dtolnay/proc-macro2/issues/402
|
||||
# # [2]: https://github.com/dtolnay/proc-macro2/pull/407
|
||||
# proc-macro2 = { git = "https://github.com/tonyg/proc-macro2", branch = "repair_span_start_end" }
|
||||
|
|
48
Makefile
48
Makefile
|
@ -11,33 +11,28 @@ test:
|
|||
test-all:
|
||||
cargo test --all-targets
|
||||
|
||||
# Try
|
||||
#
|
||||
# make release-minor
|
||||
#
|
||||
# to check things, and
|
||||
#
|
||||
# make release-minor RELEASE_DRY_RUN=
|
||||
#
|
||||
# to do things for real.
|
||||
ws-bump:
|
||||
cargo workspaces version \
|
||||
--no-global-tag \
|
||||
--individual-tag-prefix '%n-v' \
|
||||
--allow-branch 'main' \
|
||||
$(BUMP_ARGS)
|
||||
|
||||
RELEASE_DRY_RUN=--dry-run
|
||||
release-%:
|
||||
PUBLISH_GRACE_SLEEP=15 cargo release \
|
||||
$(RELEASE_DRY_RUN) \
|
||||
-vv --no-dev-version --exclude-unchanged \
|
||||
$*
|
||||
ws-publish:
|
||||
cargo workspaces publish \
|
||||
--from-git
|
||||
|
||||
PROTOCOLS_BRANCH=main
|
||||
pull-protocols:
|
||||
git subtree pull -P syndicate/protocols \
|
||||
-m 'Merge latest changes from the syndicate-protocols repository' \
|
||||
git@git.syndicate-lang.org:syndicate-lang/syndicate-protocols \
|
||||
main
|
||||
$(PROTOCOLS_BRANCH)
|
||||
|
||||
static: static-x86_64
|
||||
|
||||
static-%:
|
||||
cross build --target $*-unknown-linux-musl --features vendored-openssl
|
||||
CARGO_TARGET_DIR=target/target.$* cross build --target $*-unknown-linux-musl --features vendored-openssl,jemalloc
|
||||
|
||||
###########################################################################
|
||||
|
||||
|
@ -59,28 +54,27 @@ static-%:
|
|||
x86_64-binary: x86_64-binary-release
|
||||
|
||||
x86_64-binary-release:
|
||||
cross build --target x86_64-unknown-linux-musl --release --all-targets --features vendored-openssl
|
||||
CARGO_TARGET_DIR=target/target.x86_64 cross build --target x86_64-unknown-linux-musl --release --all-targets --features vendored-openssl,jemalloc
|
||||
|
||||
x86_64-binary-debug:
|
||||
cross build --target x86_64-unknown-linux-musl --all-targets --features vendored-openssl
|
||||
CARGO_TARGET_DIR=target/target.x86_64 cross build --target x86_64-unknown-linux-musl --all-targets --features vendored-openssl
|
||||
|
||||
armv7-binary: armv7-binary-release
|
||||
|
||||
armv7-binary-release:
|
||||
cross build --target=armv7-unknown-linux-musleabihf --release --all-targets --features vendored-openssl
|
||||
CARGO_TARGET_DIR=target/target.armv7 cross build --target=armv7-unknown-linux-musleabihf --release --all-targets --features vendored-openssl
|
||||
|
||||
armv7-binary-debug:
|
||||
cross build --target=armv7-unknown-linux-musleabihf --all-targets --features vendored-openssl
|
||||
CARGO_TARGET_DIR=target/target.armv7 cross build --target=armv7-unknown-linux-musleabihf --all-targets --features vendored-openssl
|
||||
|
||||
# Hack to workaround https://github.com/rust-embedded/cross/issues/598
|
||||
HACK_WORKAROUND_ISSUE_598=CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C link-arg=/usr/local/aarch64-linux-musl/lib/libc.a"
|
||||
# As of 2023-05-12 (and probably earlier!) this is no longer required with current Rust nightlies
|
||||
# # Hack to workaround https://github.com/rust-embedded/cross/issues/598
|
||||
# HACK_WORKAROUND_ISSUE_598=CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C link-arg=/usr/local/aarch64-linux-musl/lib/libc.a"
|
||||
|
||||
aarch64-binary: aarch64-binary-release
|
||||
|
||||
aarch64-binary-release:
|
||||
$(HACK_WORKAROUND_ISSUE_598) \
|
||||
cross build --target=aarch64-unknown-linux-musl --release --all-targets --features vendored-openssl
|
||||
CARGO_TARGET_DIR=target/target.aarch64 cross build --target=aarch64-unknown-linux-musl --release --all-targets --features vendored-openssl,jemalloc
|
||||
|
||||
aarch64-binary-debug:
|
||||
$(HACK_WORKAROUND_ISSUE_598) \
|
||||
cross build --target=aarch64-unknown-linux-musl --all-targets --features vendored-openssl
|
||||
CARGO_TARGET_DIR=target/target.aarch64 cross build --target=aarch64-unknown-linux-musl --all-targets --features vendored-openssl
|
||||
|
|
22
README.md
22
README.md
|
@ -23,16 +23,30 @@ A Rust implementation of:
|
|||
|
||||
## Quickstart
|
||||
|
||||
From docker or podman:
|
||||
|
||||
docker run -it --rm leastfixedpoint/syndicate-server /syndicate-server -p 8001
|
||||
|
||||
Build and run from source:
|
||||
|
||||
git clone https://git.syndicate-lang.org/syndicate-lang/syndicate-rs
|
||||
cd syndicate-rs
|
||||
cargo build --release
|
||||
./target/release/syndicate-server -p 8001
|
||||
|
||||
If you have [`mold`](https://github.com/rui314/mold) available (`apt install mold`), you may be
|
||||
able to get faster linking by creating `.cargo/config.toml` as follows:
|
||||
|
||||
[build]
|
||||
rustflags = ["-C", "link-arg=-fuse-ld=mold"]
|
||||
|
||||
Enabling the `jemalloc` feature can get a *substantial* (~20%-50%) improvement in throughput.
|
||||
|
||||
## Running the examples
|
||||
|
||||
In one window, start the server:
|
||||
In one window, start the server with a basic configuration:
|
||||
|
||||
./target/release/syndicate-server -p 8001
|
||||
./target/release/syndicate-server -c dev-scripts/benchmark-config.pr
|
||||
|
||||
Then, choose one of the examples below.
|
||||
|
||||
|
@ -70,7 +84,7 @@ about who kicks off the pingpong session.
|
|||
You may find better performance by restricting the server to fewer
|
||||
cores than you have available. For example, for me, running
|
||||
|
||||
taskset -c 0,1 ./target/release/syndicate-server -p 8001
|
||||
taskset -c 0,1 ./target/release/syndicate-server -c dev-scripts/benchmark-config.pr
|
||||
|
||||
roughly *quadruples* throughput for a single producer/consumer pair,
|
||||
roughly *doubles* throughput for a single producer/consumer pair,
|
||||
on my 48-core AMD CPU.
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
let ?root_ds = dataspace
|
||||
<require-service <relay-listener <tcp "0.0.0.0" 8001> $gatekeeper>>
|
||||
<bind "syndicate" #x"" $root_ds>
|
||||
<require-service <relay-listener <tcp "0.0.0.0" 9001> $gatekeeper>>
|
||||
<bind <ref { oid: "syndicate" key: #x"" }> $root_ds #f>
|
||||
|
|
|
@ -1,2 +1,7 @@
|
|||
#!/bin/sh
|
||||
make -C ../syndicate-server binary && exec taskset -c 0,1 ../target/release/syndicate-server -c benchmark-config.pr "$@"
|
||||
TASKSET='taskset -c 0,1'
|
||||
if [ $(uname -s) = 'Darwin' ]
|
||||
then
|
||||
TASKSET=
|
||||
fi
|
||||
make -C ../syndicate-server binary && exec $TASKSET ../target/release/syndicate-server -c benchmark-config.pr "$@"
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
syndicate-server.*
|
|
@ -0,0 +1,6 @@
|
|||
FROM busybox
|
||||
RUN mkdir /data
|
||||
ARG TARGETARCH
|
||||
COPY ./syndicate-server.$TARGETARCH /syndicate-server
|
||||
EXPOSE 1
|
||||
CMD ["/syndicate-server", "-c", "/data", "-p", "1"]
|
|
@ -0,0 +1,37 @@
|
|||
U=leastfixedpoint
|
||||
I=syndicate-server
|
||||
ARCHITECTURES:=amd64 arm arm64
|
||||
SERVERS:=$(patsubst %,syndicate-server.%,$(ARCHITECTURES))
|
||||
VERSION=$(shell ./syndicate-server.$(shell ./docker-architecture $$(uname -m)) --version | cut -d' ' -f2)
|
||||
|
||||
all:
|
||||
|
||||
.PHONY: all clean image push push-only
|
||||
|
||||
clean:
|
||||
rm -f syndicate-server.*
|
||||
-podman images -q $(U)/$(I) | sort -u | xargs podman rmi -f
|
||||
|
||||
image: $(SERVERS)
|
||||
for A in $(ARCHITECTURES); do set -x; \
|
||||
podman build --platform=linux/$$A \
|
||||
-t $(U)/$(I):$(VERSION)-$$A \
|
||||
-t $(U)/$(I):latest-$$A \
|
||||
.; \
|
||||
done
|
||||
rm -f tmp.image
|
||||
|
||||
push: image push-only
|
||||
|
||||
push-only:
|
||||
$(patsubst %,podman push $(U)/$(I):$(VERSION)-%;,$(ARCHITECTURES))
|
||||
$(patsubst %,podman push $(U)/$(I):latest-%;,$(ARCHITECTURES))
|
||||
podman rmi -f $(U)/$(I):$(VERSION) $(U)/$(I):latest
|
||||
podman manifest create $(U)/$(I):$(VERSION) $(patsubst %,$(U)/$(I):$(VERSION)-%,$(ARCHITECTURES))
|
||||
podman manifest create $(U)/$(I):latest $(patsubst %,$(U)/$(I):latest-%,$(ARCHITECTURES))
|
||||
podman manifest push $(U)/$(I):$(VERSION)
|
||||
podman manifest push $(U)/$(I):latest
|
||||
|
||||
syndicate-server.%:
|
||||
make -C .. $$(./alpine-architecture $*)-binary-release
|
||||
cp -a ../target/target.$$(./alpine-architecture $*)/$$(./alpine-architecture $*)-unknown-linux-musl*/release/syndicate-server $@
|
|
@ -0,0 +1,9 @@
|
|||
# Docker images for syndicate-server
|
||||
|
||||
Build using podman:
|
||||
|
||||
apt install podman
|
||||
|
||||
and at least until the dependencies are fixed (?),
|
||||
|
||||
apt install uidmap slirp4netns
|
|
@ -0,0 +1,6 @@
|
|||
#!/bin/sh
|
||||
case $1 in
|
||||
amd64) echo x86_64;;
|
||||
arm) echo armv7;;
|
||||
arm64) echo aarch64;;
|
||||
esac
|
|
@ -0,0 +1,6 @@
|
|||
#!/bin/sh
|
||||
case $1 in
|
||||
x86_64) echo amd64;;
|
||||
armv7) echo arm;;
|
||||
aarch64) echo arm64;;
|
||||
esac
|
|
@ -0,0 +1,9 @@
|
|||
version: "3"
|
||||
|
||||
services:
|
||||
syndicate:
|
||||
image: leastfixedpoint/syndicate-server
|
||||
ports:
|
||||
- "1:1"
|
||||
volumes:
|
||||
- "/etc/syndicate:/data"
|
|
@ -0,0 +1,12 @@
|
|||
#!/bin/sh
|
||||
|
||||
buildtag() {
|
||||
name=$(grep '^name' "$1" | head -1 | sed -e 's:^.*"\([^"]*\)":\1:')
|
||||
version=$(grep '^version' "$1" | head -1 | sed -e 's:^.*"\([^"]*\)":\1:')
|
||||
echo "$name-v$version"
|
||||
}
|
||||
|
||||
git tag "$(buildtag syndicate/Cargo.toml)"
|
||||
git tag "$(buildtag syndicate-macros/Cargo.toml)"
|
||||
git tag "$(buildtag syndicate-server/Cargo.toml)"
|
||||
git tag "$(buildtag syndicate-tools/Cargo.toml)"
|
|
@ -0,0 +1,152 @@
|
|||
# We will create a TCP listener on port 9222, which speaks unencrypted
|
||||
# protocol and allows interaction with the default/system gatekeeper, which
|
||||
# has a single noise binding for introducing encrypted interaction with a
|
||||
# *second* gatekeeper, which finally allows resolution of references to
|
||||
# other objects.
|
||||
|
||||
# First, build a space where we place bindings for the inner gatekeeper to
|
||||
# expose.
|
||||
let ?inner-bindings = dataspace
|
||||
|
||||
# Next, start the inner gatekeeper.
|
||||
<require-service <gatekeeper $inner-bindings>>
|
||||
? <service-object <gatekeeper $inner-bindings> ?inner-gatekeeper> [
|
||||
# Expose it via a noise binding at the outer/system gatekeeper.
|
||||
<bind <noise { key: #[z1w/OLy0wi3Veyk8/D+2182YxcrKpgc8y0ZJEBDrmWs],
|
||||
secretKey: #[qLkyuJw/K4yobr4XVKExbinDwEx9QTt9PfDWyx14/kg],
|
||||
service: world }>
|
||||
$inner-gatekeeper #f>
|
||||
]
|
||||
|
||||
# Now, expose the outer gatekeeper to the world, via TCP. The system
|
||||
# gatekeeper is a primordial syndicate-server object bound to $gatekeeper.
|
||||
<require-service <relay-listener <tcp "0.0.0.0" 9222> $gatekeeper>>
|
||||
|
||||
# Finally, let's expose some behaviour accessible via the inner gatekeeper.
|
||||
#
|
||||
# We will create a service dataspace called $world.
|
||||
let ?world = dataspace
|
||||
|
||||
# Running `syndicate-macaroon mint --oid a-service --phrase hello` yields:
|
||||
#
|
||||
# <ref {oid: a-service, sig: #[JTTGQeYCgohMXW/2S2XH8g]}>
|
||||
#
|
||||
# That's a root capability for the service. We use the corresponding
|
||||
# sturdy.SturdyDescriptionDetail to bind it to $world.
|
||||
#
|
||||
$inner-bindings += <bind <ref {oid: a-service, key: #"hello"}>
|
||||
$world #f>
|
||||
|
||||
# Now, we can hand out paths to our services involving an initial noise
|
||||
# step and a subsequent sturdyref/macaroon step.
|
||||
#
|
||||
# For example, running `syndicate-macaroon` like this:
|
||||
#
|
||||
# syndicate-macaroon mint --oid a-service --phrase hello \
|
||||
# --caveat '<rewrite <bind <_>> <rec labelled [<lit "alice"> <ref 0>]>>'
|
||||
#
|
||||
# generates
|
||||
#
|
||||
# <ref {caveats: [<rewrite <bind <_>> <rec labelled [<lit "alice">, <ref 0>]>>],
|
||||
# oid: a-service,
|
||||
# sig: #[CXn7+rAoO3Xr6Y6Laap3OA]}>
|
||||
#
|
||||
# which is an attenuation of the root capability we bound that wraps all
|
||||
# assertions and messages in a `<labelled "alice" _>` wrapper.
|
||||
#
|
||||
# All together, the `gatekeeper.Route` that Alice would use would be
|
||||
# something like:
|
||||
#
|
||||
# <route [<ws "wss://generic-dataspace.demo.leastfixedpoint.com/">]
|
||||
# <noise { key: #[z1w/OLy0wi3Veyk8/D+2182YxcrKpgc8y0ZJEBDrmWs],
|
||||
# service: world }>
|
||||
# <ref { caveats: [<rewrite <bind <_>> <rec labelled [<lit "alice">, <ref 0>]>>],
|
||||
# oid: a-service,
|
||||
# sig: #[CXn7+rAoO3Xr6Y6Laap3OA] }>>
|
||||
#
|
||||
# Here's one for "bob":
|
||||
#
|
||||
# syndicate-macaroon mint --oid a-service --phrase hello \
|
||||
# --caveat '<rewrite <bind <_>> <rec labelled [<lit "bob"> <ref 0>]>>'
|
||||
#
|
||||
# <ref {caveats: [<rewrite <bind <_>> <rec labelled [<lit "bob">, <ref 0>]>>],
|
||||
# oid: a-service,
|
||||
# sig: #[/75BbF77LOiqNcvpzNHf0g]}>
|
||||
#
|
||||
# <route [<ws "wss://generic-dataspace.demo.leastfixedpoint.com/">]
|
||||
# <noise { key: #[z1w/OLy0wi3Veyk8/D+2182YxcrKpgc8y0ZJEBDrmWs],
|
||||
# service: world }>
|
||||
# <ref { caveats: [<rewrite <bind <_>> <rec labelled [<lit "bob">, <ref 0>]>>],
|
||||
# oid: a-service,
|
||||
# sig: #[/75BbF77LOiqNcvpzNHf0g] }>>
|
||||
#
|
||||
# We relay labelled to unlabelled information, enacting a chat protocol
|
||||
# that enforces usernames.
|
||||
$world [
|
||||
|
||||
# Assertions of presence have the username wiped out and replaced with the label.
|
||||
? <labelled ?who <Present _>> <Present $who>
|
||||
|
||||
# Likewise utterance messages.
|
||||
?? <labelled ?who <Says _ ?what>> ! <Says $who $what>
|
||||
|
||||
# We allow anyone to subscribe to presence and utterances.
|
||||
? <labelled _ <Observe <rec Present ?p> ?o>> <Observe <rec Present $p> $o>
|
||||
? <labelled _ <Observe <rec Says ?p> ?o>> <Observe <rec Says $p> $o>
|
||||
|
||||
]
|
||||
|
||||
# We can also use sturdyref rewrites to directly handle `Says` and
|
||||
# `Present` values, rather than wrapping with `<labelled ...>` and
|
||||
# unwrapping using the script fragment just above.
|
||||
#
|
||||
# The multiply-quoted patterns in the `Observe` cases start to get unwieldy
|
||||
# at this point!
|
||||
#
|
||||
# For Alice:
|
||||
#
|
||||
# syndicate-macaroon mint --oid a-service --phrase hello --caveat '<or [
|
||||
# <rewrite <rec Present [<_>]> <rec Present [<lit "alice">]>>
|
||||
# <rewrite <rec Says [<_> <bind String>]> <rec Says [<lit "alice"> <ref 0>]>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Present> <_>]> <_>]>> <ref 0>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Says> <_>]> <_>]>> <ref 0>>
|
||||
# ]>'
|
||||
#
|
||||
# <ref { oid: a-service sig: #[s918Jk6As8AWJ9rtozOTlg] caveats: [<or [
|
||||
# <rewrite <rec Present [<_>]> <rec Present [<lit "alice">]>>
|
||||
# <rewrite <rec Says [<_>, <bind String>]> <rec Says [<lit "alice">, <ref 0>]>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Present>, <_>]>, <_>]>> <ref 0>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Says>, <_>]>, <_>]>> <ref 0>> ]>]}>
|
||||
#
|
||||
# <route [<ws "wss://generic-dataspace.demo.leastfixedpoint.com/">]
|
||||
# <noise { key: #[z1w/OLy0wi3Veyk8/D+2182YxcrKpgc8y0ZJEBDrmWs],
|
||||
# service: world }>
|
||||
# <ref { oid: a-service sig: #[s918Jk6As8AWJ9rtozOTlg] caveats: [<or [
|
||||
# <rewrite <rec Present [<_>]> <rec Present [<lit "alice">]>>
|
||||
# <rewrite <rec Says [<_>, <bind String>]> <rec Says [<lit "alice">, <ref 0>]>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Present>, <_>]>, <_>]>> <ref 0>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Says>, <_>]>, <_>]>> <ref 0>> ]>]}>>
|
||||
#
|
||||
# For Bob:
|
||||
#
|
||||
# syndicate-macaroon mint --oid a-service --phrase hello --caveat '<or [
|
||||
# <rewrite <rec Present [<_>]> <rec Present [<lit "bob">]>>
|
||||
# <rewrite <rec Says [<_> <bind String>]> <rec Says [<lit "bob"> <ref 0>]>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Present> <_>]> <_>]>> <ref 0>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Says> <_>]> <_>]>> <ref 0>>
|
||||
# ]>'
|
||||
#
|
||||
# <ref { oid: a-service sig: #[QBbV4LrS0i3BG6OyCPJl+A] caveats: [<or [
|
||||
# <rewrite <rec Present [<_>]> <rec Present [<lit "bob">]>>
|
||||
# <rewrite <rec Says [<_>, <bind String>]> <rec Says [<lit "bob">, <ref 0>]>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Present>, <_>]>, <_>]>> <ref 0>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Says>, <_>]>, <_>]>> <ref 0>> ]>]}>
|
||||
#
|
||||
# <route [<ws "wss://generic-dataspace.demo.leastfixedpoint.com/">]
|
||||
# <noise { key: #[z1w/OLy0wi3Veyk8/D+2182YxcrKpgc8y0ZJEBDrmWs],
|
||||
# service: world }>
|
||||
# <ref { oid: a-service sig: #[QBbV4LrS0i3BG6OyCPJl+A] caveats: [<or [
|
||||
# <rewrite <rec Present [<_>]> <rec Present [<lit "bob">]>>
|
||||
# <rewrite <rec Says [<_>, <bind String>]> <rec Says [<lit "bob">, <ref 0>]>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Present>, <_>]>, <_>]>> <ref 0>>
|
||||
# <rewrite <bind <rec Observe [<rec rec [<lit Says>, <_>]>, <_>]>> <ref 0>> ]>]}>>
|
|
@ -0,0 +1,65 @@
|
|||
# We use $root_ds as the httpd space.
|
||||
let ?root_ds = dataspace
|
||||
|
||||
# Supplying $root_ds as the last parameter in this relay-listener enables httpd service.
|
||||
<require-service <relay-listener <tcp "0.0.0.0" 9001> $gatekeeper $root_ds>>
|
||||
|
||||
# Regular gatekeeper stuff works too.
|
||||
<bind <ref { oid: "syndicate" key: #x"" }> $root_ds #f>
|
||||
|
||||
# Create an httpd router monitoring $root_ds for requests and bind requests.
|
||||
<require-service <http-router $root_ds>>
|
||||
|
||||
# Create a static file server. When it gets a request, it ignores the first n (here, 1)
|
||||
# elements of the path, and takes the remainder as relative to its configured directory (here,
|
||||
# ".").
|
||||
#
|
||||
<require-service <http-static-files "." 1>>
|
||||
#
|
||||
# It publishes a service object: requests should be asserted to this.
|
||||
# The http-bind record establishes this mapping.
|
||||
#
|
||||
? <service-object <http-static-files "." 1> ?handler> [
|
||||
$root_ds += <http-bind #f 9001 get ["files" ...] $handler>
|
||||
]
|
||||
|
||||
# Separately, bind path /d to $index, and respond there.
|
||||
#
|
||||
let ?index = dataspace
|
||||
$root_ds += <http-bind #f 9001 get ["d"] $index>
|
||||
$index ? <request _ ?k> [
|
||||
$k ! <status 200 "OK">
|
||||
$k ! <header content-type "text/html">
|
||||
$k ! <chunk "<!DOCTYPE html>">
|
||||
$k ! <done "<html><body>D</body></html>">
|
||||
]
|
||||
|
||||
# Similarly, bind three paths, /d, /e and /t to $index2
|
||||
# Because /d doubles up, the httpd router gives a warning when it is accessed.
|
||||
# Accessing /e works fine.
|
||||
# Accessing /t results in wasted work because of the hijacking listeners below.
|
||||
#
|
||||
let ?index2 = dataspace
|
||||
$root_ds += <http-bind #f 9001 get ["d"] $index2>
|
||||
$root_ds += <http-bind #f 9001 get ["e"] $index2>
|
||||
$root_ds += <http-bind #f 9001 get ["t"] $index2>
|
||||
$index2 ? <request _ ?k> [
|
||||
$k ! <status 200 "OK">
|
||||
$k ! <header content-type "text/html">
|
||||
$k ! <chunk "<!DOCTYPE html>">
|
||||
$k ! <done "<html><body>D2</body></html>">
|
||||
]
|
||||
|
||||
# These two hijack /t by listening for raw incoming requests the same way the httpd router
|
||||
# does. They respond quicker and so win the race. The httpd router's responses are lost.
|
||||
#
|
||||
$root_ds ? <request <http-request _ _ _ get ["t"] _ _ _> ?k> [
|
||||
$k ! <status 200 "OK">
|
||||
$k ! <header content-type "text/html">
|
||||
$k ! <done "<html><body>T</body></html>">
|
||||
]
|
||||
$root_ds ? <request <http-request _ _ _ get ["t"] _ _ _> ?k> [
|
||||
$k ! <status 200 "OK">
|
||||
$k ! <header content-type "text/html">
|
||||
$k ! <done "<html><body>T2</body></html>">
|
||||
]
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "syndicate-macros"
|
||||
version = "0.15.0"
|
||||
version = "0.32.0"
|
||||
authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"]
|
||||
edition = "2018"
|
||||
|
||||
|
@ -13,12 +13,15 @@ license = "Apache-2.0"
|
|||
proc-macro = true
|
||||
|
||||
[dependencies]
|
||||
syndicate = { path = "../syndicate", version = "^0.20.0"}
|
||||
syndicate = { path = "../syndicate", version = "0.40.0"}
|
||||
|
||||
proc-macro2 = { version = "^1.0", features = ["span-locations"] }
|
||||
quote = "^1.0"
|
||||
syn = "^1.0"
|
||||
syn = { version = "^1.0", features = ["extra-traits"] } # for impl Debug for syn::Expr
|
||||
|
||||
[dev-dependencies]
|
||||
tokio = { version = "1.10", features = ["io-std"] }
|
||||
tracing = "0.1"
|
||||
|
||||
[package.metadata.workspaces]
|
||||
independent = true
|
||||
|
|
|
@ -6,13 +6,13 @@ use syndicate::schemas::dataspace::Observe;
|
|||
use syndicate::value::NestedValue;
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
async fn main() -> ActorResult {
|
||||
syndicate::convenient_logging()?;
|
||||
Actor::new(None).boot(tracing::Span::current(), |t| {
|
||||
let ds = Cap::new(&t.create(Dataspace::new()));
|
||||
Actor::top(None, |t| {
|
||||
let ds = Cap::new(&t.create(Dataspace::new(None)));
|
||||
let _ = t.prevent_inert_check();
|
||||
|
||||
t.spawn(syndicate::name!("box"), enclose!((ds) move |t| {
|
||||
t.spawn(Some(AnyValue::symbol("box")), enclose!((ds) move |t| {
|
||||
let current_value = t.named_field("current_value", 0u64);
|
||||
|
||||
t.dataflow({
|
||||
|
@ -49,7 +49,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
Ok(())
|
||||
}));
|
||||
|
||||
t.spawn(syndicate::name!("client"), enclose!((ds) move |t| {
|
||||
t.spawn(Some(AnyValue::symbol("client")), enclose!((ds) move |t| {
|
||||
let box_state_handler = syndicate::entity(0u32)
|
||||
.on_asserted(enclose!((ds) move |count, t, captures: AnyValue| {
|
||||
*count = *count + 1;
|
||||
|
|
|
@ -0,0 +1,133 @@
|
|||
use syndicate::actor::*;
|
||||
use std::env;
|
||||
use std::sync::Arc;
|
||||
|
||||
#[derive(Debug)]
|
||||
enum Instruction {
|
||||
SetPeer(Arc<Ref<Instruction>>),
|
||||
HandleMessage(u64),
|
||||
}
|
||||
|
||||
struct Forwarder {
|
||||
hop_limit: u64,
|
||||
supervisor: Arc<Ref<Instruction>>,
|
||||
peer: Option<Arc<Ref<Instruction>>>,
|
||||
}
|
||||
|
||||
impl Drop for Forwarder {
|
||||
fn drop(&mut self) {
|
||||
let r = self.peer.take();
|
||||
let _ = tokio::spawn(async move {
|
||||
drop(r);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
impl Entity<Instruction> for Forwarder {
|
||||
fn message(&mut self, turn: &mut Activation, message: Instruction) -> ActorResult {
|
||||
match message {
|
||||
Instruction::SetPeer(r) => {
|
||||
tracing::info!("Setting peer {:?}", r);
|
||||
self.peer = Some(r);
|
||||
}
|
||||
Instruction::HandleMessage(n) => {
|
||||
let target = if n >= self.hop_limit { &self.supervisor } else { self.peer.as_ref().expect("peer") };
|
||||
turn.message(target, Instruction::HandleMessage(n + 1));
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
struct Supervisor {
|
||||
latency_mode: bool,
|
||||
total_transfers: u64,
|
||||
remaining_to_receive: u32,
|
||||
start_time: Option<std::time::Instant>,
|
||||
}
|
||||
|
||||
impl Entity<Instruction> for Supervisor {
|
||||
fn message(&mut self, turn: &mut Activation, message: Instruction) -> ActorResult {
|
||||
match message {
|
||||
Instruction::SetPeer(_) => {
|
||||
tracing::info!("Start");
|
||||
self.start_time = Some(std::time::Instant::now());
|
||||
},
|
||||
Instruction::HandleMessage(_n) => {
|
||||
self.remaining_to_receive -= 1;
|
||||
if self.remaining_to_receive == 0 {
|
||||
let stop_time = std::time::Instant::now();
|
||||
let duration = stop_time - self.start_time.unwrap();
|
||||
tracing::info!("Stop after {:?}; {:?} messages, so {:?} Hz ({} mode)",
|
||||
duration,
|
||||
self.total_transfers,
|
||||
(1000.0 * self.total_transfers as f64) / duration.as_millis() as f64,
|
||||
if self.latency_mode { "latency" } else { "throughput" });
|
||||
turn.stop_root();
|
||||
}
|
||||
},
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> ActorResult {
|
||||
syndicate::convenient_logging()?;
|
||||
Actor::top(None, |t| {
|
||||
let args: Vec<String> = env::args().collect();
|
||||
let n_actors: u32 = args.get(1).unwrap_or(&"1000000".to_string()).parse()?;
|
||||
let n_rounds: u32 = args.get(2).unwrap_or(&"200".to_string()).parse()?;
|
||||
let latency_mode: bool = match args.get(3).unwrap_or(&"throughput".to_string()).as_str() {
|
||||
"latency" => true,
|
||||
"throughput" => false,
|
||||
_other => return Err("Invalid throughput/latency mode".into()),
|
||||
};
|
||||
tracing::info!("Will run {:?} actors for {:?} rounds", n_actors, n_rounds);
|
||||
|
||||
let total_transfers: u64 = n_actors as u64 * n_rounds as u64;
|
||||
let (hop_limit, injection_count) = if latency_mode {
|
||||
(total_transfers, 1)
|
||||
} else {
|
||||
(n_rounds as u64, n_actors)
|
||||
};
|
||||
|
||||
let me = t.create(Supervisor {
|
||||
latency_mode,
|
||||
total_transfers,
|
||||
remaining_to_receive: injection_count,
|
||||
start_time: None,
|
||||
});
|
||||
|
||||
let mut forwarders: Vec<Arc<Ref<Instruction>>> = Vec::new();
|
||||
for _i in 0 .. n_actors {
|
||||
if _i % 10000 == 0 { tracing::info!("Actor {:?}", _i); }
|
||||
forwarders.push(
|
||||
t.spawn_for_entity(None, true, Box::new(
|
||||
Forwarder {
|
||||
hop_limit,
|
||||
supervisor: me.clone(),
|
||||
peer: forwarders.last().cloned(),
|
||||
}))
|
||||
.0.expect("an entity"));
|
||||
}
|
||||
t.message(&forwarders[0], Instruction::SetPeer(forwarders.last().expect("an entity").clone()));
|
||||
t.later(move |t| {
|
||||
t.message(&me, Instruction::SetPeer(me.clone()));
|
||||
t.later(move |t| {
|
||||
let mut injected: u32 = 0;
|
||||
for f in forwarders.into_iter() {
|
||||
if injected >= injection_count {
|
||||
break;
|
||||
}
|
||||
t.message(&f, Instruction::HandleMessage(0));
|
||||
injected += 1;
|
||||
}
|
||||
Ok(())
|
||||
});
|
||||
Ok(())
|
||||
});
|
||||
Ok(())
|
||||
}).await??;
|
||||
Ok(())
|
||||
}
|
|
@ -0,0 +1,175 @@
|
|||
use std::env;
|
||||
use std::sync::Arc;
|
||||
use std::sync::atomic::AtomicU64;
|
||||
use std::sync::atomic::Ordering;
|
||||
|
||||
use tokio::sync::mpsc::{unbounded_channel, UnboundedSender};
|
||||
|
||||
type Ref<T> = UnboundedSender<Box<T>>;
|
||||
|
||||
#[derive(Debug)]
|
||||
enum Instruction {
|
||||
SetPeer(Arc<Ref<Instruction>>),
|
||||
HandleMessage(u64),
|
||||
}
|
||||
|
||||
struct Forwarder {
|
||||
hop_limit: u64,
|
||||
supervisor: Arc<Ref<Instruction>>,
|
||||
peer: Option<Arc<Ref<Instruction>>>,
|
||||
}
|
||||
|
||||
impl Drop for Forwarder {
|
||||
fn drop(&mut self) {
|
||||
let r = self.peer.take();
|
||||
let _ = tokio::spawn(async move {
|
||||
drop(r);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
enum Action { Continue, Stop }
|
||||
|
||||
trait Actor<T> {
|
||||
fn message(&mut self, message: T) -> Action;
|
||||
}
|
||||
|
||||
fn send<T: std::marker::Send + 'static>(ch: &Arc<Ref<T>>, message: T) -> () {
|
||||
match ch.send(Box::new(message)) {
|
||||
Ok(()) => (),
|
||||
Err(v) => panic!("Aiee! Could not send {:?}", v),
|
||||
}
|
||||
}
|
||||
|
||||
fn spawn<T: std::marker::Send + 'static, R: Actor<T> + std::marker::Send + 'static>(rt: Option<Arc<AtomicU64>>, mut ac: R) -> Arc<Ref<T>> {
|
||||
let (tx, mut rx) = unbounded_channel::<Box<T>>();
|
||||
if let Some(ref c) = rt {
|
||||
c.fetch_add(1, Ordering::SeqCst);
|
||||
}
|
||||
tokio::spawn(async move {
|
||||
loop {
|
||||
match rx.recv().await {
|
||||
None => break,
|
||||
Some(message) => {
|
||||
match ac.message(*message) {
|
||||
Action::Continue => continue,
|
||||
Action::Stop => break,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if let Some(c) = rt {
|
||||
c.fetch_sub(1, Ordering::SeqCst);
|
||||
}
|
||||
});
|
||||
Arc::new(tx)
|
||||
}
|
||||
|
||||
impl Actor<Instruction> for Forwarder {
|
||||
fn message(&mut self, message: Instruction) -> Action {
|
||||
match message {
|
||||
Instruction::SetPeer(r) => {
|
||||
tracing::info!("Setting peer {:?}", r);
|
||||
self.peer = Some(r);
|
||||
}
|
||||
Instruction::HandleMessage(n) => {
|
||||
let target = if n >= self.hop_limit { &self.supervisor } else { self.peer.as_ref().expect("peer") };
|
||||
send(target, Instruction::HandleMessage(n + 1));
|
||||
}
|
||||
}
|
||||
Action::Continue
|
||||
}
|
||||
}
|
||||
|
||||
struct Supervisor {
|
||||
latency_mode: bool,
|
||||
total_transfers: u64,
|
||||
remaining_to_receive: u32,
|
||||
start_time: Option<std::time::Instant>,
|
||||
}
|
||||
|
||||
impl Actor<Instruction> for Supervisor {
|
||||
fn message(&mut self, message: Instruction) -> Action {
|
||||
match message {
|
||||
Instruction::SetPeer(_) => {
|
||||
tracing::info!("Start");
|
||||
self.start_time = Some(std::time::Instant::now());
|
||||
},
|
||||
Instruction::HandleMessage(_n) => {
|
||||
self.remaining_to_receive -= 1;
|
||||
if self.remaining_to_receive == 0 {
|
||||
let stop_time = std::time::Instant::now();
|
||||
let duration = stop_time - self.start_time.unwrap();
|
||||
tracing::info!("Stop after {:?}; {:?} messages, so {:?} Hz ({} mode)",
|
||||
duration,
|
||||
self.total_transfers,
|
||||
(1000.0 * self.total_transfers as f64) / duration.as_millis() as f64,
|
||||
if self.latency_mode { "latency" } else { "throughput" });
|
||||
return Action::Stop;
|
||||
}
|
||||
},
|
||||
}
|
||||
Action::Continue
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error + std::marker::Send + std::marker::Sync>> {
|
||||
syndicate::convenient_logging()?;
|
||||
|
||||
let args: Vec<String> = env::args().collect();
|
||||
let n_actors: u32 = args.get(1).unwrap_or(&"1000000".to_string()).parse()?;
|
||||
let n_rounds: u32 = args.get(2).unwrap_or(&"200".to_string()).parse()?;
|
||||
let latency_mode: bool = match args.get(3).unwrap_or(&"throughput".to_string()).as_str() {
|
||||
"latency" => true,
|
||||
"throughput" => false,
|
||||
_other => return Err("Invalid throughput/latency mode".into()),
|
||||
};
|
||||
tracing::info!("Will run {:?} actors for {:?} rounds", n_actors, n_rounds);
|
||||
|
||||
let count = Arc::new(AtomicU64::new(0));
|
||||
|
||||
let total_transfers: u64 = n_actors as u64 * n_rounds as u64;
|
||||
let (hop_limit, injection_count) = if latency_mode {
|
||||
(total_transfers, 1)
|
||||
} else {
|
||||
(n_rounds as u64, n_actors)
|
||||
};
|
||||
|
||||
let me = spawn(Some(count.clone()), Supervisor {
|
||||
latency_mode,
|
||||
total_transfers,
|
||||
remaining_to_receive: injection_count,
|
||||
start_time: None,
|
||||
});
|
||||
|
||||
let mut forwarders: Vec<Arc<Ref<Instruction>>> = Vec::new();
|
||||
for _i in 0 .. n_actors {
|
||||
if _i % 10000 == 0 { tracing::info!("Actor {:?}", _i); }
|
||||
forwarders.push(spawn(None, Forwarder {
|
||||
hop_limit,
|
||||
supervisor: me.clone(),
|
||||
peer: forwarders.last().cloned(),
|
||||
}));
|
||||
}
|
||||
send(&forwarders[0], Instruction::SetPeer(forwarders.last().expect("an entity").clone()));
|
||||
send(&me, Instruction::SetPeer(me.clone()));
|
||||
|
||||
let mut injected: u32 = 0;
|
||||
for f in forwarders.into_iter() {
|
||||
if injected >= injection_count {
|
||||
break;
|
||||
}
|
||||
send(&f, Instruction::HandleMessage(0));
|
||||
injected += 1;
|
||||
}
|
||||
|
||||
loop {
|
||||
if count.load(Ordering::SeqCst) == 0 {
|
||||
break;
|
||||
}
|
||||
tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
|
@ -27,6 +27,7 @@ use pat::lit;
|
|||
|
||||
enum SymbolVariant<'a> {
|
||||
Normal(&'a str),
|
||||
#[allow(dead_code)] // otherwise we get 'warning: field `0` is never read'
|
||||
Binder(&'a str),
|
||||
Substitution(&'a str),
|
||||
Discard,
|
||||
|
@ -35,7 +36,7 @@ enum SymbolVariant<'a> {
|
|||
fn compile_sequence_members(vs: &[IOValue]) -> Vec<TokenStream> {
|
||||
vs.iter().enumerate().map(|(i, f)| {
|
||||
let p = compile_pattern(f);
|
||||
quote!((#i .into(), #p))
|
||||
quote!((syndicate::value::Value::from(#i).wrap(), #p))
|
||||
}).collect::<Vec<_>>()
|
||||
}
|
||||
|
||||
|
@ -79,10 +80,6 @@ impl ValueCompiler {
|
|||
match v.value() {
|
||||
Value::Boolean(b) =>
|
||||
quote!(#V_::Value::from(#b).wrap()),
|
||||
Value::Float(f) => {
|
||||
let f = f.0;
|
||||
quote!(#V_::Value::from(#f).wrap())
|
||||
}
|
||||
Value::Double(d) => {
|
||||
let d = d.0;
|
||||
quote!(#V_::Value::from(#d).wrap())
|
||||
|
@ -154,16 +151,14 @@ fn compile_pattern(v: &IOValue) -> TokenStream {
|
|||
#[allow(non_snake_case)]
|
||||
let V_: TokenStream = quote!(syndicate::value);
|
||||
#[allow(non_snake_case)]
|
||||
let MapFromIterator_: TokenStream = quote!(<#V_::Map<_, _> as std::iter::FromIterator<_>>::from_iter);
|
||||
let MapFrom_: TokenStream = quote!(<#V_::Map<_, _>>::from);
|
||||
|
||||
match v.value() {
|
||||
Value::Symbol(s) => match analyze_symbol(&s, true) {
|
||||
SymbolVariant::Binder(_) =>
|
||||
quote!(#P_::Pattern::DBind(Box::new(#P_::DBind {
|
||||
pattern: #P_::Pattern::DDiscard(Box::new(#P_::DDiscard))
|
||||
}))),
|
||||
quote!(#P_::Pattern::Bind{ pattern: Box::new(#P_::Pattern::Discard) }),
|
||||
SymbolVariant::Discard =>
|
||||
quote!(#P_::Pattern::DDiscard(Box::new(#P_::DDiscard))),
|
||||
quote!(#P_::Pattern::Discard),
|
||||
SymbolVariant::Substitution(s) =>
|
||||
lit(Ident::new(s, Span::call_site())),
|
||||
SymbolVariant::Normal(_) =>
|
||||
|
@ -175,9 +170,7 @@ fn compile_pattern(v: &IOValue) -> TokenStream {
|
|||
Some(label) =>
|
||||
if label.starts_with("$") && r.arity() == 1 {
|
||||
let nested = compile_pattern(&r.fields()[0]);
|
||||
quote!(#P_::Pattern::DBind(Box::new(#P_::DBind {
|
||||
pattern: #nested
|
||||
})))
|
||||
quote!(#P_::Pattern::Bind{ pattern: Box::new(#nested) })
|
||||
} else {
|
||||
let label_stx = if label.starts_with("=") {
|
||||
let id = Ident::new(&label[1..], Span::call_site());
|
||||
|
@ -186,18 +179,19 @@ fn compile_pattern(v: &IOValue) -> TokenStream {
|
|||
quote!(#V_::Value::symbol(#label).wrap())
|
||||
};
|
||||
let members = compile_sequence_members(r.fields());
|
||||
quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Rec {
|
||||
label: #label_stx,
|
||||
fields: vec![#(#members),*],
|
||||
})))
|
||||
quote!(#P_::Pattern::Group {
|
||||
type_: Box::new(#P_::GroupType::Rec { label: #label_stx }),
|
||||
entries: #MapFrom_([#(#members),*]),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
Value::Sequence(vs) => {
|
||||
let members = compile_sequence_members(vs);
|
||||
quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Arr {
|
||||
items: vec![#(#members),*],
|
||||
})))
|
||||
quote!(#P_::Pattern::Group {
|
||||
type_: Box::new(#P_::GroupType::Arr),
|
||||
entries: #MapFrom_([#(#members),*]),
|
||||
})
|
||||
}
|
||||
Value::Set(_) =>
|
||||
panic!("Cannot match sets in patterns"),
|
||||
|
@ -207,9 +201,10 @@ fn compile_pattern(v: &IOValue) -> TokenStream {
|
|||
let v = compile_pattern(v);
|
||||
quote!((#k, #v))
|
||||
}).collect::<Vec<_>>();
|
||||
quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Dict {
|
||||
entries: #MapFromIterator_(vec![#(#members),*])
|
||||
})))
|
||||
quote!(#P_::Pattern::Group {
|
||||
type_: Box::new(#P_::GroupType::Dict),
|
||||
entries: #MapFrom_([#(#members),*]),
|
||||
})
|
||||
}
|
||||
_ => lit(ValueCompiler::for_patterns().compile(v)),
|
||||
}
|
||||
|
|
|
@ -15,10 +15,9 @@ pub fn lit<T: ToTokens>(e: T) -> TokenStream2 {
|
|||
}
|
||||
|
||||
fn compile_sequence_members(stxs: &Vec<Stx>) -> Result<Vec<TokenStream2>, &'static str> {
|
||||
stxs.iter().map(|stx| {
|
||||
// let p = to_pattern_expr(stx)?;
|
||||
// Ok(quote!(#p))
|
||||
to_pattern_expr(stx)
|
||||
stxs.iter().enumerate().map(|(i, stx)| {
|
||||
let p = to_pattern_expr(stx)?;
|
||||
Ok(quote!((syndicate::value::Value::from(#i).wrap(), #p)))
|
||||
}).collect()
|
||||
}
|
||||
|
||||
|
@ -28,7 +27,7 @@ pub fn to_pattern_expr(stx: &Stx) -> Result<TokenStream2, &'static str> {
|
|||
#[allow(non_snake_case)]
|
||||
let V_: TokenStream2 = quote!(syndicate::value);
|
||||
#[allow(non_snake_case)]
|
||||
let MapFromIterator_: TokenStream2 = quote!(<#V_::Map<_, _> as std::iter::FromIterator<_>>::from_iter);
|
||||
let MapFrom_: TokenStream2 = quote!(<#V_::Map<_, _>>::from);
|
||||
|
||||
match stx {
|
||||
Stx::Atom(v) =>
|
||||
|
@ -41,26 +40,27 @@ pub fn to_pattern_expr(stx: &Stx) -> Result<TokenStream2, &'static str> {
|
|||
None => to_pattern_expr(&Stx::Discard)?,
|
||||
}
|
||||
};
|
||||
Ok(quote!(#P_::Pattern::DBind(Box::new(#P_::DBind { pattern: #inner_pat_expr }))))
|
||||
Ok(quote!(#P_::Pattern::Bind { pattern: Box::new(#inner_pat_expr) }))
|
||||
}
|
||||
Stx::Subst(e) =>
|
||||
Ok(lit(e)),
|
||||
Stx::Discard =>
|
||||
Ok(quote!(#P_::Pattern::DDiscard(Box::new(#P_::DDiscard)))),
|
||||
Ok(quote!(#P_::Pattern::Discard)),
|
||||
|
||||
Stx::Rec(l, fs) => {
|
||||
let label = to_value_expr(&*l)?;
|
||||
let members = compile_sequence_members(fs)?;
|
||||
Ok(quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Rec {
|
||||
label: #label,
|
||||
fields: vec![#(#members),*],
|
||||
}))))
|
||||
Ok(quote!(#P_::Pattern::Group {
|
||||
type_: Box::new(#P_::GroupType::Rec { label: #label }),
|
||||
entries: #MapFrom_([#(#members),*]),
|
||||
}))
|
||||
},
|
||||
Stx::Seq(stxs) => {
|
||||
let members = compile_sequence_members(stxs)?;
|
||||
Ok(quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Arr {
|
||||
items: vec![#(#members),*],
|
||||
}))))
|
||||
Ok(quote!(#P_::Pattern::Group {
|
||||
type_: Box::new(#P_::GroupType::Arr),
|
||||
entries: #MapFrom_([#(#members),*]),
|
||||
}))
|
||||
}
|
||||
Stx::Set(_stxs) =>
|
||||
Err("Set literals not supported in patterns"),
|
||||
|
@ -70,9 +70,10 @@ pub fn to_pattern_expr(stx: &Stx) -> Result<TokenStream2, &'static str> {
|
|||
let v = to_pattern_expr(v)?;
|
||||
Ok(quote!((#k, #v)))
|
||||
}).collect::<Result<Vec<_>, &'static str>>()?;
|
||||
Ok(quote!(#P_::Pattern::DCompound(Box::new(#P_::DCompound::Dict {
|
||||
entries: #MapFromIterator_(vec![#(#members),*])
|
||||
}))))
|
||||
Ok(quote!(#P_::Pattern::Group {
|
||||
type_: Box::new(#P_::GroupType::Dict),
|
||||
entries: #MapFrom_([#(#members),*])
|
||||
}))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
use proc_macro2::Delimiter;
|
||||
use proc_macro2::LineColumn;
|
||||
use proc_macro2::Span;
|
||||
use proc_macro2::TokenStream;
|
||||
|
||||
use syn::ExprLit;
|
||||
|
@ -14,7 +15,6 @@ use syn::parse::Parser;
|
|||
use syn::parse::ParseStream;
|
||||
use syn::parse_str;
|
||||
|
||||
use syndicate::value::Float;
|
||||
use syndicate::value::Double;
|
||||
use syndicate::value::IOValue;
|
||||
use syndicate::value::NestedValue;
|
||||
|
@ -70,24 +70,41 @@ fn punct_char(c: Cursor) -> Option<(char, Cursor)> {
|
|||
c.punct().map(|(p, c)| (p.as_char(), c))
|
||||
}
|
||||
|
||||
fn start_pos(s: Span) -> LineColumn {
|
||||
// We would like to write
|
||||
// s.start()
|
||||
// here, but until [1] is fixed (perhaps via [2]), we have to go the unsafe route
|
||||
// and assume we are in procedural macro context.
|
||||
// [1]: https://github.com/dtolnay/proc-macro2/issues/402
|
||||
// [2]: https://github.com/dtolnay/proc-macro2/pull/407
|
||||
let u = s.unwrap().start();
|
||||
LineColumn { column: u.column(), line: u.line() }
|
||||
}
|
||||
|
||||
fn end_pos(s: Span) -> LineColumn {
|
||||
// See start_pos
|
||||
let u = s.unwrap().end();
|
||||
LineColumn { column: u.column(), line: u.line() }
|
||||
}
|
||||
|
||||
fn parse_id(mut c: Cursor) -> Result<(String, Cursor)> {
|
||||
let mut id = String::new();
|
||||
let mut prev_pos = c.span().start();
|
||||
let mut prev_pos = start_pos(c.span());
|
||||
loop {
|
||||
if c.eof() || c.span().start() != prev_pos {
|
||||
if c.eof() || start_pos(c.span()) != prev_pos {
|
||||
return Ok((id, c));
|
||||
} else if let Some((p, next)) = c.punct() {
|
||||
match p.as_char() {
|
||||
'<' | '>' | '(' | ')' | '{' | '}' | '[' | ']' | ',' | ':' => return Ok((id, c)),
|
||||
ch => {
|
||||
id.push(ch);
|
||||
prev_pos = c.span().end();
|
||||
prev_pos = end_pos(c.span());
|
||||
c = next;
|
||||
}
|
||||
}
|
||||
} else if let Some((i, next)) = c.ident() {
|
||||
id.push_str(&i.to_string());
|
||||
prev_pos = i.span().end();
|
||||
prev_pos = end_pos(i.span());
|
||||
c = next;
|
||||
} else {
|
||||
return Ok((id, c));
|
||||
|
@ -126,7 +143,7 @@ fn skip_commas(mut c: Cursor) -> Cursor {
|
|||
}
|
||||
}
|
||||
|
||||
fn parse_group_inner<'c, R, F: Fn(Cursor<'c>) -> Result<(R, Cursor<'c>)>>(
|
||||
fn parse_group<'c, R, F: Fn(Cursor<'c>) -> Result<(R, Cursor<'c>)>>(
|
||||
mut c: Cursor<'c>,
|
||||
f: F,
|
||||
after: Cursor<'c>,
|
||||
|
@ -143,15 +160,6 @@ fn parse_group_inner<'c, R, F: Fn(Cursor<'c>) -> Result<(R, Cursor<'c>)>>(
|
|||
}
|
||||
}
|
||||
|
||||
fn parse_group<'c, R, F: Fn(Cursor<'c>) -> Result<(R, Cursor<'c>)>>(
|
||||
d: Delimiter,
|
||||
f: F,
|
||||
c: Cursor<'c>,
|
||||
) -> Result<(Vec<R>, Cursor<'c>)> {
|
||||
let (inner, _, after) = c.group(d).unwrap();
|
||||
parse_group_inner(inner, f, after)
|
||||
}
|
||||
|
||||
fn parse_kv(c: Cursor) -> Result<((Stx, Stx), Cursor)> {
|
||||
let (k, c) = parse1(c)?;
|
||||
if let Some((':', c)) = punct_char(c) {
|
||||
|
@ -162,7 +170,7 @@ fn parse_kv(c: Cursor) -> Result<((Stx, Stx), Cursor)> {
|
|||
}
|
||||
|
||||
fn adjacent_ident(pos: LineColumn, c: Cursor) -> (Option<Ident>, Cursor) {
|
||||
if c.span().start() != pos {
|
||||
if start_pos(c.span()) != pos {
|
||||
(None, c)
|
||||
} else if let Some((id, next)) = c.ident() {
|
||||
(Some(id), next)
|
||||
|
@ -186,8 +194,8 @@ fn parse_generic<T: Parse>(mut c: Cursor) -> Option<(T, Cursor)> {
|
|||
// OK, because parse2 checks for end-of-stream, let's chop
|
||||
// the input at the position of the error and try again (!).
|
||||
let mut collected = Vec::new();
|
||||
let upto = e.span().start();
|
||||
while !c.eof() && c.span().start() != upto {
|
||||
let upto = start_pos(e.span());
|
||||
while !c.eof() && start_pos(c.span()) != upto {
|
||||
let (tt, next) = c.token_tree().unwrap();
|
||||
collected.push(tt);
|
||||
c = next;
|
||||
|
@ -208,10 +216,8 @@ fn parse1(c: Cursor) -> Result<(Stx, Cursor)> {
|
|||
} else {
|
||||
Ok((Stx::Rec(Box::new(q.remove(0)), q), c))
|
||||
}),
|
||||
'{' => parse_group(Delimiter::Brace, parse_kv, c).map(|(q,c)| (Stx::Dict(q),c)),
|
||||
'[' => parse_group(Delimiter::Bracket, parse1, c).map(|(q,c)| (Stx::Seq(q),c)),
|
||||
'$' => {
|
||||
let (maybe_id, next) = adjacent_ident(p.span().end(), next);
|
||||
let (maybe_id, next) = adjacent_ident(end_pos(p.span()), next);
|
||||
let (maybe_type, next) = if let Some((':', next)) = punct_char(next) {
|
||||
match parse_generic::<Type>(next) {
|
||||
Some((t, next)) => (Some(t), next),
|
||||
|
@ -229,7 +235,7 @@ fn parse1(c: Cursor) -> Result<(Stx, Cursor)> {
|
|||
}
|
||||
'#' => {
|
||||
if let Some((inner, _, next)) = next.group(Delimiter::Brace) {
|
||||
parse_group_inner(inner, parse1, next).map(|(q,c)| (Stx::Set(q),c))
|
||||
parse_group(inner, parse1, next).map(|(q,c)| (Stx::Set(q),c))
|
||||
} else if let Some((inner, _, next)) = next.group(Delimiter::Parenthesis) {
|
||||
Ok((Stx::Subst(inner.token_stream()), next))
|
||||
} else if let Some((tt, next)) = next.token_tree() {
|
||||
|
@ -259,7 +265,7 @@ fn parse1(c: Cursor) -> Result<(Stx, Cursor)> {
|
|||
IOValue::new(i.base10_parse::<i128>()?)
|
||||
}
|
||||
Lit::Float(f) => if f.suffix() == "f32" {
|
||||
IOValue::new(&Float(f.base10_parse::<f32>()?))
|
||||
IOValue::new(&Double(f.base10_parse::<f32>()? as f64))
|
||||
} else {
|
||||
IOValue::new(&Double(f.base10_parse::<f64>()?))
|
||||
}
|
||||
|
@ -267,6 +273,10 @@ fn parse1(c: Cursor) -> Result<(Stx, Cursor)> {
|
|||
Lit::Verbatim(_) => return Err(Error::new(c.span(), "Verbatim literals not supported")),
|
||||
};
|
||||
Ok((Stx::Atom(v), next))
|
||||
} else if let Some((inner, _, after)) = c.group(Delimiter::Brace) {
|
||||
parse_group(inner, parse_kv, after).map(|(q,c)| (Stx::Dict(q),c))
|
||||
} else if let Some((inner, _, after)) = c.group(Delimiter::Bracket) {
|
||||
parse_group(inner, parse1, after).map(|(q,c)| (Stx::Seq(q),c))
|
||||
} else {
|
||||
Err(Error::new(c.span(), "Unexpected input"))
|
||||
}
|
||||
|
|
|
@ -50,10 +50,6 @@ pub fn value_to_value_expr(v: &IOValue) -> TokenStream2 {
|
|||
match v.value() {
|
||||
Value::Boolean(b) =>
|
||||
quote!(#V_::Value::from(#b).wrap()),
|
||||
Value::Float(f) => {
|
||||
let f = f.0;
|
||||
quote!(#V_::Value::from(#f).wrap())
|
||||
}
|
||||
Value::Double(d) => {
|
||||
let d = d.0;
|
||||
quote!(#V_::Value::from(#d).wrap())
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"folders": [
|
||||
{
|
||||
"path": "."
|
||||
},
|
||||
{
|
||||
"path": "../syndicate-protocols"
|
||||
}
|
||||
],
|
||||
"settings": {
|
||||
"files.exclude": {
|
||||
"target": true
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,19 @@
|
|||
[package]
|
||||
name = "syndicate-schema-plugin"
|
||||
version = "0.9.0"
|
||||
authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"]
|
||||
edition = "2018"
|
||||
|
||||
description = "Support for using Preserves Schema with Syndicate macros."
|
||||
homepage = "https://syndicate-lang.org/"
|
||||
repository = "https://git.syndicate-lang.org/syndicate-lang/syndicate-rs"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[lib]
|
||||
|
||||
[dependencies]
|
||||
preserves-schema = "5.995"
|
||||
syndicate = { path = "../syndicate", version = "0.40.0"}
|
||||
|
||||
[package.metadata.workspaces]
|
||||
independent = true
|
|
@ -0,0 +1,3 @@
|
|||
mod pattern_plugin;
|
||||
|
||||
pub use pattern_plugin::PatternPlugin;
|
|
@ -0,0 +1,164 @@
|
|||
use preserves_schema::*;
|
||||
use preserves_schema::compiler::*;
|
||||
use preserves_schema::compiler::context::ModuleContext;
|
||||
use preserves_schema::compiler::types::definition_type;
|
||||
use preserves_schema::compiler::types::Purpose;
|
||||
use preserves_schema::gen::schema::*;
|
||||
use preserves_schema::syntax::block::escape_string;
|
||||
use preserves_schema::syntax::block::constructors::*;
|
||||
|
||||
use std::iter::FromIterator;
|
||||
|
||||
use syndicate::pattern::lift_literal;
|
||||
use syndicate::schemas::dataspace_patterns as P;
|
||||
use syndicate::value::IOValue;
|
||||
use syndicate::value::Map;
|
||||
use syndicate::value::NestedValue;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct PatternPlugin;
|
||||
|
||||
type WalkState<'a, 'm, 'b> =
|
||||
preserves_schema::compiler::cycles::WalkState<&'a ModuleContext<'m, 'b>>;
|
||||
|
||||
impl Plugin for PatternPlugin {
|
||||
fn generate_definition(
|
||||
&self,
|
||||
ctxt: &mut ModuleContext,
|
||||
definition_name: &str,
|
||||
definition: &Definition,
|
||||
) {
|
||||
if ctxt.mode == context::ModuleContextMode::TargetGeneric {
|
||||
let mut s = WalkState::new(ctxt, ctxt.module_path.clone());
|
||||
if let Some(p) = definition.wc(&mut s) {
|
||||
let ty = definition_type(&ctxt.module_path,
|
||||
Purpose::Codegen,
|
||||
definition_name,
|
||||
definition);
|
||||
let v = syndicate::language().unparse(&p);
|
||||
let v = preserves_schema::support::preserves::value::TextWriter::encode(
|
||||
&mut preserves_schema::support::preserves::value::NoEmbeddedDomainCodec,
|
||||
&v).unwrap();
|
||||
ctxt.define_type(item(seq![
|
||||
"impl",
|
||||
ty.generic_decl(ctxt),
|
||||
" ",
|
||||
names::render_constructor(definition_name),
|
||||
ty.generic_arg(ctxt),
|
||||
" ", codeblock![
|
||||
seq!["#[allow(unused)] pub fn wildcard_dataspace_pattern() ",
|
||||
"-> syndicate::schemas::dataspace_patterns::Pattern ",
|
||||
codeblock![
|
||||
"use syndicate::schemas::dataspace_patterns::*;",
|
||||
"use preserves_schema::Codec;",
|
||||
seq!["let _v = syndicate::value::text::from_str(",
|
||||
escape_string(&v),
|
||||
", syndicate::value::ViaCodec::new(syndicate::value::NoEmbeddedDomainCodec)).unwrap();"],
|
||||
"syndicate::language().parse(&_v).unwrap()"]]]]));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn discard() -> P::Pattern {
|
||||
P::Pattern::Discard
|
||||
}
|
||||
|
||||
trait WildcardPattern {
|
||||
fn wc(&self, s: &mut WalkState) -> Option<P::Pattern>;
|
||||
}
|
||||
|
||||
impl WildcardPattern for Definition {
|
||||
fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
|
||||
match self {
|
||||
Definition::Or { .. } => None,
|
||||
Definition::And { .. } => None,
|
||||
Definition::Pattern(p) => p.wc(s),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl WildcardPattern for Pattern {
|
||||
fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
|
||||
match self {
|
||||
Pattern::CompoundPattern(p) => p.wc(s),
|
||||
Pattern::SimplePattern(p) => p.wc(s),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn from_io(v: &IOValue) -> Option<P::_Any> {
|
||||
Some(v.value().copy_via(&mut |_| Err(())).ok()?.wrap())
|
||||
}
|
||||
|
||||
impl WildcardPattern for CompoundPattern {
|
||||
fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
|
||||
match self {
|
||||
CompoundPattern::Tuple { patterns } |
|
||||
CompoundPattern::TuplePrefix { fixed: patterns, .. }=>
|
||||
Some(P::Pattern::Group {
|
||||
type_: Box::new(P::GroupType::Arr),
|
||||
entries: patterns.iter().enumerate()
|
||||
.map(|(i, p)| Some((P::_Any::new(i), unname(p).wc(s)?)))
|
||||
.collect::<Option<Map<P::_Any, P::Pattern>>>()?,
|
||||
}),
|
||||
CompoundPattern::Dict { entries } =>
|
||||
Some(P::Pattern::Group {
|
||||
type_: Box::new(P::GroupType::Dict),
|
||||
entries: Map::from_iter(
|
||||
entries.0.iter()
|
||||
.map(|(k, p)| Some((from_io(k)?, unname_simple(p).wc(s)?)))
|
||||
.filter(|e| discard() != e.as_ref().unwrap().1)
|
||||
.collect::<Option<Vec<(P::_Any, P::Pattern)>>>()?
|
||||
.into_iter()),
|
||||
}),
|
||||
CompoundPattern::Rec { label, fields } => match (unname(label), unname(fields)) {
|
||||
(Pattern::SimplePattern(label), Pattern::CompoundPattern(fields)) =>
|
||||
match (*label, *fields) {
|
||||
(SimplePattern::Lit { value }, CompoundPattern::Tuple { patterns }) =>
|
||||
Some(P::Pattern::Group{
|
||||
type_: Box::new(P::GroupType::Rec { label: from_io(&value)? }),
|
||||
entries: patterns.iter().enumerate()
|
||||
.map(|(i, p)| Some((P::_Any::new(i), unname(p).wc(s)?)))
|
||||
.collect::<Option<Map<P::_Any, P::Pattern>>>()?,
|
||||
}),
|
||||
_ => None,
|
||||
},
|
||||
_ => None,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl WildcardPattern for SimplePattern {
|
||||
fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
|
||||
match self {
|
||||
SimplePattern::Any |
|
||||
SimplePattern::Atom { .. } |
|
||||
SimplePattern::Embedded { .. } |
|
||||
SimplePattern::Seqof { .. } |
|
||||
SimplePattern::Setof { .. } |
|
||||
SimplePattern::Dictof { .. } => Some(discard()),
|
||||
SimplePattern::Lit { value } => Some(lift_literal(&from_io(value)?)),
|
||||
SimplePattern::Ref(r) => s.cycle_check(
|
||||
r,
|
||||
|ctxt, r| ctxt.bundle.lookup_definition(r).map(|v| v.0),
|
||||
|s, d| d.and_then(|d| d.wc(s)).or_else(|| Some(discard())),
|
||||
|| Some(discard())),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn unname(np: &NamedPattern) -> Pattern {
|
||||
match np {
|
||||
NamedPattern::Anonymous(p) => (**p).clone(),
|
||||
NamedPattern::Named(b) => Pattern::SimplePattern(Box::new(b.pattern.clone())),
|
||||
}
|
||||
}
|
||||
|
||||
fn unname_simple(np: &NamedSimplePattern) -> &SimplePattern {
|
||||
match np {
|
||||
NamedSimplePattern::Anonymous(p) => p,
|
||||
NamedSimplePattern::Named(b) => &b.pattern,
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "syndicate-server"
|
||||
version = "0.20.1"
|
||||
version = "0.45.0"
|
||||
authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"]
|
||||
edition = "2018"
|
||||
|
||||
|
@ -9,27 +9,39 @@ homepage = "https://syndicate-lang.org/"
|
|||
repository = "https://git.syndicate-lang.org/syndicate-lang/syndicate-rs"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[features]
|
||||
jemalloc = ["dep:tikv-jemallocator"]
|
||||
|
||||
[build-dependencies]
|
||||
preserves-schema = "^2"
|
||||
syndicate = { path = "../syndicate", version = "^0.20.0"}
|
||||
preserves-schema = "5.995"
|
||||
syndicate = { path = "../syndicate", version = "0.40.0"}
|
||||
syndicate-schema-plugin = { path = "../syndicate-schema-plugin", version = "0.9.0"}
|
||||
|
||||
[dependencies]
|
||||
preserves-schema = "^2"
|
||||
syndicate = { path = "../syndicate", version = "^0.20.0"}
|
||||
syndicate-macros = { path = "../syndicate-macros", version = "^0.15.0"}
|
||||
preserves-schema = "5.995"
|
||||
syndicate = { path = "../syndicate", version = "0.40.0"}
|
||||
syndicate-macros = { path = "../syndicate-macros", version = "0.32.0"}
|
||||
|
||||
chrono = "0.4"
|
||||
futures = "0.3"
|
||||
lazy_static = "1.4"
|
||||
noise-protocol = "0.1"
|
||||
noise-rust-crypto = "0.5"
|
||||
notify = "4.0"
|
||||
structopt = "0.3"
|
||||
|
||||
tungstenite = "0.13"
|
||||
tokio-tungstenite = "0.14"
|
||||
tikv-jemallocator = { version = "0.5.0", optional = true }
|
||||
|
||||
tokio = { version = "1.10", features = ["io-std", "time", "process"] }
|
||||
tokio-util = "0.6"
|
||||
tokio-stream = "0.1"
|
||||
|
||||
tracing = "0.1"
|
||||
tracing-subscriber = "0.2"
|
||||
tracing-futures = "0.2"
|
||||
hyper = { version = "0.14.27", features = ["server", "http1", "stream"] }
|
||||
hyper-tungstenite = "0.11.1"
|
||||
parking_lot = "0.12.1"
|
||||
|
||||
[package.metadata.workspaces]
|
||||
independent = true
|
||||
|
|
|
@ -13,7 +13,7 @@ inotifytest:
|
|||
binary: binary-release
|
||||
|
||||
binary-release:
|
||||
cargo build --release --all-targets
|
||||
cargo build --release --all-targets --features jemalloc
|
||||
|
||||
binary-debug:
|
||||
cargo build --all-targets
|
||||
|
|
|
@ -1,176 +1,32 @@
|
|||
use preserves_schema::compiler::*;
|
||||
|
||||
mod pattern_plugin {
|
||||
use preserves_schema::*;
|
||||
use preserves_schema::compiler::*;
|
||||
use preserves_schema::compiler::context::ModuleContext;
|
||||
use preserves_schema::gen::schema::*;
|
||||
use preserves_schema::syntax::block::escape_string;
|
||||
use preserves_schema::syntax::block::constructors::*;
|
||||
|
||||
use std::iter::FromIterator;
|
||||
|
||||
use syndicate::pattern::lift_literal;
|
||||
use syndicate::schemas::dataspace_patterns as P;
|
||||
use syndicate::value::IOValue;
|
||||
use syndicate::value::Map;
|
||||
use syndicate::value::NestedValue;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct PatternPlugin;
|
||||
|
||||
type WalkState<'a, 'm, 'b> =
|
||||
preserves_schema::compiler::cycles::WalkState<&'a ModuleContext<'m, 'b>>;
|
||||
|
||||
impl Plugin for PatternPlugin {
|
||||
fn generate_definition(
|
||||
&self,
|
||||
ctxt: &mut ModuleContext,
|
||||
definition_name: &str,
|
||||
definition: &Definition,
|
||||
) {
|
||||
if ctxt.mode == context::ModuleContextMode::TargetGeneric {
|
||||
let mut s = WalkState::new(ctxt, ctxt.module_path.clone());
|
||||
if let Some(p) = definition.wc(&mut s) {
|
||||
let v = syndicate::language().unparse(&p);
|
||||
let v = preserves_schema::support::preserves::value::TextWriter::encode(
|
||||
&mut preserves_schema::support::preserves::value::NoEmbeddedDomainCodec,
|
||||
&v).unwrap();
|
||||
ctxt.define_type(item(seq![
|
||||
"impl ", definition_name.to_owned(), " ", codeblock![
|
||||
seq!["#[allow(unused)] pub fn wildcard_dataspace_pattern() ",
|
||||
"-> syndicate::schemas::dataspace_patterns::Pattern ",
|
||||
codeblock![
|
||||
"use syndicate::schemas::dataspace_patterns::*;",
|
||||
"use preserves_schema::Codec;",
|
||||
seq!["let _v = syndicate::value::text::from_str(",
|
||||
escape_string(&v),
|
||||
", syndicate::value::ViaCodec::new(syndicate::value::NoEmbeddedDomainCodec)).unwrap();"],
|
||||
"syndicate::language().parse(&_v).unwrap()"]]]]));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn discard() -> P::Pattern {
|
||||
P::Pattern::DDiscard(Box::new(P::DDiscard))
|
||||
}
|
||||
|
||||
trait WildcardPattern {
|
||||
fn wc(&self, s: &mut WalkState) -> Option<P::Pattern>;
|
||||
}
|
||||
|
||||
impl WildcardPattern for Definition {
|
||||
fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
|
||||
match self {
|
||||
Definition::Or { .. } => None,
|
||||
Definition::And { .. } => None,
|
||||
Definition::Pattern(p) => p.wc(s),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl WildcardPattern for Pattern {
|
||||
fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
|
||||
match self {
|
||||
Pattern::CompoundPattern(p) => p.wc(s),
|
||||
Pattern::SimplePattern(p) => p.wc(s),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn from_io(v: &IOValue) -> Option<P::_Any> {
|
||||
Some(v.value().copy_via(&mut |_| Err(())).ok()?.wrap())
|
||||
}
|
||||
|
||||
impl WildcardPattern for CompoundPattern {
|
||||
fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
|
||||
match self {
|
||||
CompoundPattern::Tuple { patterns } =>
|
||||
Some(P::Pattern::DCompound(Box::new(P::DCompound::Arr {
|
||||
items: patterns.iter()
|
||||
.map(|p| unname(p).wc(s))
|
||||
.collect::<Option<Vec<P::Pattern>>>()?,
|
||||
}))),
|
||||
CompoundPattern::TuplePrefix { .. } =>
|
||||
Some(discard()),
|
||||
CompoundPattern::Dict { entries } =>
|
||||
Some(P::Pattern::DCompound(Box::new(P::DCompound::Dict {
|
||||
entries: Map::from_iter(
|
||||
entries.0.iter()
|
||||
.map(|(k, p)| Some((from_io(k)?, unname_simple(p).wc(s)?)))
|
||||
.filter(|e| discard() != e.as_ref().unwrap().1)
|
||||
.collect::<Option<Vec<(P::_Any, P::Pattern)>>>()?
|
||||
.into_iter()),
|
||||
}))),
|
||||
CompoundPattern::Rec { label, fields } => match (unname(label), unname(fields)) {
|
||||
(Pattern::SimplePattern(label), Pattern::CompoundPattern(fields)) =>
|
||||
match (*label, *fields) {
|
||||
(SimplePattern::Lit { value }, CompoundPattern::Tuple { patterns }) =>
|
||||
Some(P::Pattern::DCompound(Box::new(P::DCompound::Rec {
|
||||
label: from_io(&value)?,
|
||||
fields: patterns.iter()
|
||||
.map(|p| unname(p).wc(s))
|
||||
.collect::<Option<Vec<P::Pattern>>>()?,
|
||||
}))),
|
||||
_ => None,
|
||||
},
|
||||
_ => None,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl WildcardPattern for SimplePattern {
|
||||
fn wc(&self, s: &mut WalkState) -> Option<P::Pattern> {
|
||||
match self {
|
||||
SimplePattern::Any |
|
||||
SimplePattern::Atom { .. } |
|
||||
SimplePattern::Embedded { .. } |
|
||||
SimplePattern::Seqof { .. } |
|
||||
SimplePattern::Setof { .. } |
|
||||
SimplePattern::Dictof { .. } => Some(discard()),
|
||||
SimplePattern::Lit { value } => Some(lift_literal(&from_io(value)?)),
|
||||
SimplePattern::Ref(r) => s.cycle_check(
|
||||
r,
|
||||
|ctxt, r| ctxt.bundle.lookup_definition(r),
|
||||
|s, d| d.and_then(|d| d.wc(s)).or_else(|| Some(discard())),
|
||||
|| Some(discard())),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn unname(np: &NamedPattern) -> Pattern {
|
||||
match np {
|
||||
NamedPattern::Anonymous(p) => (**p).clone(),
|
||||
NamedPattern::Named(b) => Pattern::SimplePattern(Box::new(b.pattern.clone())),
|
||||
}
|
||||
}
|
||||
|
||||
fn unname_simple(np: &NamedSimplePattern) -> &SimplePattern {
|
||||
match np {
|
||||
NamedSimplePattern::Anonymous(p) => p,
|
||||
NamedSimplePattern::Named(b) => &b.pattern,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn main() -> std::io::Result<()> {
|
||||
let buildroot = std::path::PathBuf::from(std::env::var_os("OUT_DIR").unwrap());
|
||||
|
||||
let mut gen_dir = buildroot.clone();
|
||||
gen_dir.push("src/schemas");
|
||||
|
||||
let mut c = CompilerConfig::new(gen_dir, "crate::schemas".to_owned());
|
||||
c.plugins.push(Box::new(pattern_plugin::PatternPlugin));
|
||||
let mut c = CompilerConfig::new("crate::schemas".to_owned());
|
||||
c.plugins.push(Box::new(syndicate_schema_plugin::PatternPlugin));
|
||||
c.add_external_module(ExternalModule::new(vec!["EntityRef".to_owned()], "syndicate::actor"));
|
||||
c.add_external_module(
|
||||
ExternalModule::new(vec!["TransportAddress".to_owned()],
|
||||
"syndicate::schemas::transport_address")
|
||||
.set_fallback_language_types(
|
||||
|v| vec![format!("syndicate::schemas::Language<{}>", v)].into_iter().collect()));
|
||||
c.add_external_module(
|
||||
ExternalModule::new(vec!["gatekeeper".to_owned()], "syndicate::schemas::gatekeeper")
|
||||
.set_fallback_language_types(
|
||||
|v| vec![format!("syndicate::schemas::Language<{}>", v)].into_iter().collect())
|
||||
);
|
||||
c.add_external_module(
|
||||
ExternalModule::new(vec!["noise".to_owned()], "syndicate::schemas::noise")
|
||||
.set_fallback_language_types(
|
||||
|v| vec![format!("syndicate::schemas::Language<{}>", v)].into_iter().collect())
|
||||
);
|
||||
|
||||
let inputs = expand_inputs(&vec!["protocols/schema-bundle.bin".to_owned()])?;
|
||||
c.load_schemas_and_bundles(&inputs)?;
|
||||
compile(&c)
|
||||
c.load_schemas_and_bundles(&inputs, &vec![])?;
|
||||
c.load_xref_bin("syndicate", syndicate::schemas::_bundle())?;
|
||||
compile(&c, &mut CodeCollector::files(gen_dir))
|
||||
}
|
||||
|
|
|
@ -12,21 +12,20 @@ use syndicate::value::NestedValue;
|
|||
use tokio::net::TcpStream;
|
||||
|
||||
use core::time::Duration;
|
||||
use tokio::time::interval;
|
||||
|
||||
#[derive(Clone, Debug, StructOpt)]
|
||||
pub struct Config {
|
||||
#[structopt(short = "d", default_value = "b4b303726566b10973796e646963617465b584b210a6480df5306611ddd0d3882b546e197784")]
|
||||
#[structopt(short = "d", default_value = "b4b303726566b7b3036f6964b10973796e646963617465b303736967b21069ca300c1dbfa08fba692102dd82311a8484")]
|
||||
dataspace: String,
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
async fn main() -> ActorResult {
|
||||
syndicate::convenient_logging()?;
|
||||
let config = Config::from_args();
|
||||
let sturdyref = sturdy::SturdyRef::from_hex(&config.dataspace)?;
|
||||
let (i, o) = TcpStream::connect("127.0.0.1:8001").await?.into_split();
|
||||
Actor::new(None).boot(syndicate::name!("consumer"), |t| {
|
||||
let (i, o) = TcpStream::connect("127.0.0.1:9001").await?.into_split();
|
||||
Actor::top(None, |t| {
|
||||
relay::connect_stream(t, i, o, false, sturdyref, (), |_state, t, ds| {
|
||||
let consumer = syndicate::entity(0)
|
||||
.on_message(|message_count, _t, m: AnyValue| {
|
||||
|
@ -44,21 +43,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
observer: Arc::clone(&consumer),
|
||||
});
|
||||
|
||||
t.linked_task(syndicate::name!("tick"), async move {
|
||||
let mut stats_timer = interval(Duration::from_secs(1));
|
||||
loop {
|
||||
stats_timer.tick().await;
|
||||
let consumer = Arc::clone(&consumer);
|
||||
external_event(&Arc::clone(&consumer.underlying.mailbox),
|
||||
&Account::new(syndicate::name!("account")),
|
||||
Box::new(move |t| t.with_entity(
|
||||
&consumer.underlying,
|
||||
|t, e| e.message(t, AnyValue::new(true)))))?;
|
||||
}
|
||||
});
|
||||
t.every(Duration::from_secs(1), move |t| {
|
||||
consumer.message(t, &(), &AnyValue::new(true));
|
||||
Ok(())
|
||||
})?;
|
||||
|
||||
Ok(None)
|
||||
});
|
||||
Ok(())
|
||||
})
|
||||
}).await??;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -26,14 +26,14 @@ mod dirty;
|
|||
|
||||
#[derive(Clone, Debug, StructOpt)]
|
||||
pub struct Config {
|
||||
#[structopt(short = "d", default_value = "b4b303726566b10973796e646963617465b584b210a6480df5306611ddd0d3882b546e197784")]
|
||||
#[structopt(short = "d", default_value = "b4b303726566b7b3036f6964b10973796e646963617465b303736967b21069ca300c1dbfa08fba692102dd82311a8484")]
|
||||
dataspace: String,
|
||||
}
|
||||
|
||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
let config = Config::from_args();
|
||||
|
||||
let mut stream = TcpStream::connect("127.0.0.1:8001")?;
|
||||
let mut stream = TcpStream::connect("127.0.0.1:9001")?;
|
||||
dirty::dirty_resolve(&mut stream, &config.dataspace)?;
|
||||
|
||||
let iolang = Language::<IOValue>::default();
|
||||
|
@ -58,7 +58,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
|
||||
let mut buf = [0; 131072];
|
||||
let turn_size = {
|
||||
stream.read(&mut buf)?;
|
||||
let n = stream.read(&mut buf)?;
|
||||
if n == 0 {
|
||||
return Ok(());
|
||||
}
|
||||
let mut src = BytesBinarySource::new(&buf);
|
||||
src.packed_iovalues().demand_next(false)?;
|
||||
src.index
|
||||
|
|
|
@ -25,7 +25,7 @@ pub struct Config {
|
|||
#[structopt(short = "b", default_value = "0")]
|
||||
bytes_padding: usize,
|
||||
|
||||
#[structopt(short = "d", default_value = "b4b303726566b10973796e646963617465b584b210a6480df5306611ddd0d3882b546e197784")]
|
||||
#[structopt(short = "d", default_value = "b4b303726566b7b3036f6964b10973796e646963617465b303736967b21069ca300c1dbfa08fba692102dd82311a8484")]
|
||||
dataspace: String,
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,7 @@ fn says(who: IOValue, what: IOValue) -> IOValue {
|
|||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
let config = Config::from_args();
|
||||
|
||||
let mut stream = TcpStream::connect("127.0.0.1:8001")?;
|
||||
let mut stream = TcpStream::connect("127.0.0.1:9001")?;
|
||||
dirty::dirty_resolve(&mut stream, &config.dataspace)?;
|
||||
|
||||
let padding: IOValue = Value::ByteString(vec![0; config.bytes_padding]).wrap();
|
||||
|
|
|
@ -16,15 +16,16 @@ pub fn dirty_resolve(stream: &mut TcpStream, dataspace: &str) -> Result<(), Box<
|
|||
let iolang = Language::<IOValue>::default();
|
||||
|
||||
let sturdyref = sturdy::SturdyRef::from_hex(dataspace)?;
|
||||
let sturdyref = iolang.parse(&syndicate::language().unparse(&sturdyref)
|
||||
.copy_via(&mut |_| Err("no!"))?)?;
|
||||
let sturdyref = iolang.parse::<gatekeeper::Step<IOValue>>(
|
||||
&syndicate::language().unparse(&sturdyref)
|
||||
.copy_via(&mut |_| Err("no!"))?)?;
|
||||
|
||||
let resolve_turn = P::Turn(vec![
|
||||
P::TurnEvent {
|
||||
oid: P::Oid(0.into()),
|
||||
event: P::Event::Assert(Box::new(P::Assert {
|
||||
assertion: P::Assertion(iolang.unparse(&gatekeeper::Resolve::<IOValue> {
|
||||
sturdyref,
|
||||
step: sturdyref,
|
||||
observer: iolang.unparse(&sturdy::WireRef::Mine {
|
||||
oid: Box::new(sturdy::Oid(0.into())),
|
||||
}),
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
use std::sync::Arc;
|
||||
use std::sync::Mutex;
|
||||
use std::time::SystemTime;
|
||||
|
||||
use structopt::StructOpt;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::enclose;
|
||||
use syndicate::language;
|
||||
use syndicate::relay;
|
||||
use syndicate::schemas::dataspace::Observe;
|
||||
|
@ -14,7 +16,6 @@ use syndicate::value::Value;
|
|||
use tokio::net::TcpStream;
|
||||
|
||||
use core::time::Duration;
|
||||
use tokio::time::interval;
|
||||
|
||||
#[derive(Clone, Debug, StructOpt)]
|
||||
pub struct PingConfig {
|
||||
|
@ -42,7 +43,7 @@ pub struct Config {
|
|||
#[structopt(subcommand)]
|
||||
mode: PingPongMode,
|
||||
|
||||
#[structopt(short = "d", default_value = "b4b303726566b10973796e646963617465b584b210a6480df5306611ddd0d3882b546e197784")]
|
||||
#[structopt(short = "d", default_value = "b4b303726566b7b3036f6964b10973796e646963617465b303736967b21069ca300c1dbfa08fba692102dd82311a8484")]
|
||||
dataspace: String,
|
||||
}
|
||||
|
||||
|
@ -88,12 +89,12 @@ fn report_latencies(rtt_ns_samples: &Vec<u64>) {
|
|||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
async fn main() -> ActorResult {
|
||||
syndicate::convenient_logging()?;
|
||||
let config = Config::from_args();
|
||||
let sturdyref = sturdy::SturdyRef::from_hex(&config.dataspace)?;
|
||||
let (i, o) = TcpStream::connect("127.0.0.1:8001").await?.into_split();
|
||||
Actor::new(None).boot(syndicate::name!("pingpong"), |t| {
|
||||
let (i, o) = TcpStream::connect("127.0.0.1:9001").await?.into_split();
|
||||
Actor::top(None, |t| {
|
||||
relay::connect_stream(t, i, o, false, sturdyref, (), move |_state, t, ds| {
|
||||
|
||||
let (send_label, recv_label, report_latency_every, should_echo, bytes_padding) =
|
||||
|
@ -110,22 +111,18 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
let mut event_counter: u64 = 0;
|
||||
let mut rtt_ns_samples: Vec<u64> = vec![0; report_latency_every];
|
||||
let mut rtt_batch_count: usize = 0;
|
||||
let mut current_reply = None;
|
||||
let self_ref = t.create_inert();
|
||||
self_ref.become_entity(
|
||||
syndicate::entity(Arc::clone(&self_ref))
|
||||
.on_message(move |self_ref, t, m: AnyValue| {
|
||||
let current_reply = Arc::new(Mutex::new(None));
|
||||
Cap::new(&t.create(
|
||||
syndicate::entity(())
|
||||
.on_message(move |(), t, m: AnyValue| {
|
||||
match m.value().as_boolean() {
|
||||
Some(true) => {
|
||||
Some(_) => {
|
||||
tracing::info!("{:?} turns, {:?} events in the last second",
|
||||
turn_counter,
|
||||
event_counter);
|
||||
turn_counter = 0;
|
||||
event_counter = 0;
|
||||
}
|
||||
Some(false) => {
|
||||
current_reply = None;
|
||||
}
|
||||
None => {
|
||||
event_counter += 1;
|
||||
let bindings = m.value().to_sequence()?;
|
||||
|
@ -137,9 +134,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
timestamp.clone(),
|
||||
padding.clone()));
|
||||
} else {
|
||||
if let None = current_reply {
|
||||
let mut g = current_reply.lock().expect("unpoisoned");
|
||||
if let None = *g {
|
||||
turn_counter += 1;
|
||||
t.message_for_myself(&self_ref, AnyValue::new(false));
|
||||
t.pre_commit(enclose!((current_reply) move |_| {
|
||||
*current_reply.lock().expect("unpoisoned") = None;
|
||||
Ok(())
|
||||
}));
|
||||
let rtt_ns = now() - timestamp.value().to_u64()?;
|
||||
rtt_ns_samples[rtt_batch_count] = rtt_ns;
|
||||
rtt_batch_count += 1;
|
||||
|
@ -150,18 +151,16 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
rtt_batch_count = 0;
|
||||
}
|
||||
|
||||
current_reply = Some(
|
||||
simple_record2(&send_label,
|
||||
Value::from(now()).wrap(),
|
||||
padding.clone()));
|
||||
*g = Some(simple_record2(&send_label,
|
||||
Value::from(now()).wrap(),
|
||||
padding.clone()));
|
||||
}
|
||||
ds.message(t, &(), current_reply.as_ref().expect("some reply"));
|
||||
ds.message(t, &(), g.as_ref().expect("some reply"));
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}));
|
||||
Cap::new(&self_ref)
|
||||
})))
|
||||
};
|
||||
|
||||
ds.assert(t, language(), &Observe {
|
||||
|
@ -172,46 +171,35 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
observer: Arc::clone(&consumer),
|
||||
});
|
||||
|
||||
t.linked_task(syndicate::name!("tick"), async move {
|
||||
let mut stats_timer = interval(Duration::from_secs(1));
|
||||
loop {
|
||||
stats_timer.tick().await;
|
||||
let consumer = Arc::clone(&consumer);
|
||||
external_event(&Arc::clone(&consumer.underlying.mailbox),
|
||||
&Account::new(syndicate::name!("account")),
|
||||
Box::new(move |t| t.with_entity(
|
||||
&consumer.underlying,
|
||||
|t, e| e.message(t, AnyValue::new(true)))))?;
|
||||
}
|
||||
});
|
||||
t.every(Duration::from_secs(1), move |t| {
|
||||
consumer.message(t, &(), &AnyValue::new(true));
|
||||
Ok(())
|
||||
})?;
|
||||
|
||||
if let PingPongMode::Ping(c) = &config.mode {
|
||||
let facet = t.facet_ref();
|
||||
let turn_count = c.turn_count;
|
||||
let action_count = c.action_count;
|
||||
let account = Arc::clone(t.account());
|
||||
t.linked_task(syndicate::name!("boot-ping"), async move {
|
||||
t.linked_task(Some(AnyValue::symbol("boot-ping")), async move {
|
||||
let padding = AnyValue::bytestring(vec![0; bytes_padding]);
|
||||
for _ in 0..turn_count {
|
||||
let mut events: PendingEventQueue = vec![];
|
||||
let current_rec = simple_record2(send_label,
|
||||
Value::from(now()).wrap(),
|
||||
padding.clone());
|
||||
for _ in 0..action_count {
|
||||
let ds = Arc::clone(&ds);
|
||||
let current_rec = current_rec.clone();
|
||||
events.push(Box::new(move |t| t.with_entity(
|
||||
&ds.underlying,
|
||||
|t, e| e.message(t, current_rec))));
|
||||
}
|
||||
external_events(&ds.underlying.mailbox, &account, events)?
|
||||
facet.activate(&account, None, |t| {
|
||||
for _ in 0..action_count {
|
||||
ds.message(t, &(), ¤t_rec);
|
||||
}
|
||||
Ok(())
|
||||
});
|
||||
}
|
||||
Ok(LinkedTaskTermination::KeepFacet)
|
||||
});
|
||||
}
|
||||
|
||||
Ok(None)
|
||||
});
|
||||
Ok(())
|
||||
})
|
||||
}).await??;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
use structopt::StructOpt;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::enclose;
|
||||
use syndicate::preserves::rec;
|
||||
use syndicate::relay;
|
||||
use syndicate::sturdy;
|
||||
use syndicate::value::Value;
|
||||
use syndicate::value::NestedValue;
|
||||
|
||||
use tokio::net::TcpStream;
|
||||
|
||||
|
@ -16,44 +16,37 @@ pub struct Config {
|
|||
#[structopt(short = "b", default_value = "0")]
|
||||
bytes_padding: usize,
|
||||
|
||||
#[structopt(short = "d", default_value = "b4b303726566b10973796e646963617465b584b210a6480df5306611ddd0d3882b546e197784")]
|
||||
#[structopt(short = "d", default_value = "b4b303726566b7b3036f6964b10973796e646963617465b303736967b21069ca300c1dbfa08fba692102dd82311a8484")]
|
||||
dataspace: String,
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn says(who: AnyValue, what: AnyValue) -> AnyValue {
|
||||
let mut r = Value::simple_record("Says", 2);
|
||||
r.fields_vec_mut().push(who);
|
||||
r.fields_vec_mut().push(what);
|
||||
r.finish().wrap()
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
async fn main() -> ActorResult {
|
||||
syndicate::convenient_logging()?;
|
||||
let config = Config::from_args();
|
||||
let sturdyref = sturdy::SturdyRef::from_hex(&config.dataspace)?;
|
||||
let (i, o) = TcpStream::connect("127.0.0.1:8001").await?.into_split();
|
||||
Actor::new(None).boot(syndicate::name!("producer"), |t| {
|
||||
let (i, o) = TcpStream::connect("127.0.0.1:9001").await?.into_split();
|
||||
Actor::top(None, |t| {
|
||||
relay::connect_stream(t, i, o, false, sturdyref, (), move |_state, t, ds| {
|
||||
let padding: AnyValue = Value::ByteString(vec![0; config.bytes_padding]).wrap();
|
||||
let facet = t.facet_ref();
|
||||
let padding = AnyValue::new(&vec![0u8; config.bytes_padding][..]);
|
||||
let action_count = config.action_count;
|
||||
let account = Account::new(syndicate::name!("account"));
|
||||
t.linked_task(syndicate::name!("sender"), async move {
|
||||
let account = Account::new(None, None);
|
||||
t.linked_task(Some(AnyValue::symbol("sender")), async move {
|
||||
loop {
|
||||
account.ensure_clear_funds().await;
|
||||
let mut events: PendingEventQueue = Vec::new();
|
||||
for _ in 0..action_count {
|
||||
events.push(Box::new(enclose!((ds, padding) move |t| t.with_entity(
|
||||
&ds.underlying, |t, e| e.message(
|
||||
t, says(Value::from("producer").wrap(), padding))))));
|
||||
}
|
||||
external_events(&ds.underlying.mailbox, &account, events)?;
|
||||
facet.activate(&account, None, |t| {
|
||||
for _ in 0..action_count {
|
||||
ds.message(t, &(), &rec![AnyValue::symbol("Says"),
|
||||
AnyValue::new("producer"),
|
||||
padding.clone()]);
|
||||
}
|
||||
Ok(())
|
||||
});
|
||||
}
|
||||
});
|
||||
Ok(None)
|
||||
});
|
||||
Ok(())
|
||||
})
|
||||
}).await??;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -12,21 +12,20 @@ use syndicate::value::NestedValue;
|
|||
use tokio::net::TcpStream;
|
||||
|
||||
use core::time::Duration;
|
||||
use tokio::time::interval;
|
||||
|
||||
#[derive(Clone, Debug, StructOpt)]
|
||||
pub struct Config {
|
||||
#[structopt(short = "d", default_value = "b4b303726566b10973796e646963617465b584b210a6480df5306611ddd0d3882b546e197784")]
|
||||
#[structopt(short = "d", default_value = "b4b303726566b7b3036f6964b10973796e646963617465b303736967b21069ca300c1dbfa08fba692102dd82311a8484")]
|
||||
dataspace: String,
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
async fn main() -> ActorResult {
|
||||
syndicate::convenient_logging()?;
|
||||
let config = Config::from_args();
|
||||
let sturdyref = sturdy::SturdyRef::from_hex(&config.dataspace)?;
|
||||
let (i, o) = TcpStream::connect("127.0.0.1:8001").await?.into_split();
|
||||
Actor::new(None).boot(syndicate::name!("state-consumer"), |t| {
|
||||
let (i, o) = TcpStream::connect("127.0.0.1:9001").await?.into_split();
|
||||
Actor::top(None, |t| {
|
||||
relay::connect_stream(t, i, o, false, sturdyref, (), |_state, t, ds| {
|
||||
let consumer = {
|
||||
#[derive(Default)]
|
||||
|
@ -65,21 +64,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
observer: Arc::clone(&consumer),
|
||||
});
|
||||
|
||||
t.linked_task(syndicate::name!("tick"), async move {
|
||||
let mut stats_timer = interval(Duration::from_secs(1));
|
||||
loop {
|
||||
stats_timer.tick().await;
|
||||
let consumer = Arc::clone(&consumer);
|
||||
external_event(&Arc::clone(&consumer.underlying.mailbox),
|
||||
&Account::new(syndicate::name!("account")),
|
||||
Box::new(move |t| t.with_entity(
|
||||
&consumer.underlying,
|
||||
|t, e| e.message(t, AnyValue::new(true)))))?;
|
||||
}
|
||||
});
|
||||
t.every(Duration::from_secs(1), move |t| {
|
||||
consumer.message(t, &(), &AnyValue::new(true));
|
||||
Ok(())
|
||||
})?;
|
||||
|
||||
Ok(None)
|
||||
});
|
||||
Ok(())
|
||||
})
|
||||
}).await??;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -1,57 +1,48 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use structopt::StructOpt;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::enclose;
|
||||
use syndicate::preserves::rec;
|
||||
use syndicate::relay;
|
||||
use syndicate::sturdy;
|
||||
use syndicate::value::Value;
|
||||
use syndicate::value::NestedValue;
|
||||
|
||||
use tokio::net::TcpStream;
|
||||
|
||||
#[derive(Clone, Debug, StructOpt)]
|
||||
pub struct Config {
|
||||
#[structopt(short = "d", default_value = "b4b303726566b10973796e646963617465b584b210a6480df5306611ddd0d3882b546e197784")]
|
||||
#[structopt(short = "d", default_value = "b4b303726566b7b3036f6964b10973796e646963617465b303736967b21069ca300c1dbfa08fba692102dd82311a8484")]
|
||||
dataspace: String,
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
async fn main() -> ActorResult {
|
||||
syndicate::convenient_logging()?;
|
||||
let config = Config::from_args();
|
||||
let sturdyref = sturdy::SturdyRef::from_hex(&config.dataspace)?;
|
||||
let (i, o) = TcpStream::connect("127.0.0.1:8001").await?.into_split();
|
||||
Actor::new(None).boot(syndicate::name!("state-producer"), |t| {
|
||||
let (i, o) = TcpStream::connect("127.0.0.1:9001").await?.into_split();
|
||||
Actor::top(None, |t| {
|
||||
relay::connect_stream(t, i, o, false, sturdyref, (), move |_state, t, ds| {
|
||||
let account = Account::new(syndicate::name!("account"));
|
||||
t.linked_task(syndicate::name!("sender"), async move {
|
||||
let presence: AnyValue = Value::simple_record1(
|
||||
"Present",
|
||||
Value::from(std::process::id()).wrap()).wrap();
|
||||
let handle = syndicate::actor::next_handle();
|
||||
let assert_e = || {
|
||||
external_event(
|
||||
&Arc::clone(&ds.underlying.mailbox), &account, Box::new(enclose!(
|
||||
(ds, presence, handle) move |t| t.with_entity(
|
||||
&ds.underlying, |t, e| e.assert(t, presence, handle)))))
|
||||
};
|
||||
let retract_e = || {
|
||||
external_event(
|
||||
&Arc::clone(&ds.underlying.mailbox), &account, Box::new(enclose!(
|
||||
(ds, handle) move |t| t.with_entity(
|
||||
&ds.underlying, |t, e| e.retract(t, handle)))))
|
||||
};
|
||||
assert_e()?;
|
||||
let facet = t.facet_ref();
|
||||
let account = Account::new(None, None);
|
||||
t.linked_task(Some(AnyValue::symbol("sender")), async move {
|
||||
let presence = rec![AnyValue::symbol("Present"), AnyValue::new(std::process::id())];
|
||||
loop {
|
||||
let mut handle = None;
|
||||
facet.activate(&account, None, |t| {
|
||||
handle = ds.assert(t, &(), &presence);
|
||||
Ok(())
|
||||
});
|
||||
account.ensure_clear_funds().await;
|
||||
retract_e()?;
|
||||
assert_e()?;
|
||||
facet.activate(&account, None, |t| {
|
||||
if let Some(h) = handle {
|
||||
t.retract(h);
|
||||
}
|
||||
Ok(())
|
||||
});
|
||||
}
|
||||
});
|
||||
Ok(None)
|
||||
});
|
||||
Ok(())
|
||||
})
|
||||
}).await??;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -1,10 +1,17 @@
|
|||
´³bundle·µ³
documentation„´³schema·³version‘³definitions·³Url´³orµµ±present´³dict·³url´³named³url´³atom³String„„„„„µ±invalid´³dict·³url´³named³url³any„„„„µ±absent´³dict·„„„„„³IOList´³orµµ±bytes´³atom³
|
||||
ByteString„„µ±string´³atom³String„„µ±nested´³seqof´³refµ„³IOList„„„„„³Metadata´³rec´³lit³metadata„´³tupleµ´³named³object³any„´³named³info´³dictof´³atom³Symbol„³any„„„„„³Description´³orµµ±present´³dict·³description´³named³description´³refµ„³IOList„„„„„µ±invalid´³dict·³description´³named³description³any„„„„µ±absent´³dict·„„„„„„³embeddedType€„„µ³externalServices„´³schema·³version‘³definitions·³Process´³orµµ±simple´³refµ„³CommandLine„„µ±full´³refµ„³FullProcess„„„„³Service´³refµ„³
DaemonService„³ClearEnv´³orµµ±present´³dict·³clearEnv´³named³clearEnv´³atom³Boolean„„„„„µ±invalid´³dict·³clearEnv´³named³clearEnv³any„„„„µ±absent´³dict·„„„„„³EnvValue´³orµµ±set´³atom³String„„µ±remove´³lit€„„µ±invalid³any„„„³Protocol´³orµµ±none´³lit³none„„µ±binarySyndicate´³lit³application/syndicate„„µ±
textSyndicate´³lit³text/syndicate„„„„³
|
||||
´³bundle·µ³control„´³schema·³version°³definitions·³
|
||||
ExitServer´³rec´³lit³exit„´³tupleµ´³named³code´³atom³
SignedInteger„„„„„„³embeddedType€„„µ³
documentation„´³schema·³version°³definitions·³Url´³orµµ±present´³dict·³url´³named³url´³atom³String„„„„„µ±invalid´³dict·³url´³named³url³any„„„„µ±absent´³dict·„„„„„³IOList´³orµµ±bytes´³atom³
|
||||
ByteString„„µ±string´³atom³String„„µ±nested´³seqof´³refµ„³IOList„„„„„³Metadata´³rec´³lit³metadata„´³tupleµ´³named³object³any„´³named³info´³dictof´³atom³Symbol„³any„„„„„³Description´³orµµ±present´³dict·³description´³named³description´³refµ„³IOList„„„„„µ±invalid´³dict·³description´³named³description³any„„„„µ±absent´³dict·„„„„„„³embeddedType€„„µ³externalServices„´³schema·³version°³definitions·³Process´³orµµ±simple´³refµ„³CommandLine„„µ±full´³refµ„³FullProcess„„„„³Service´³refµ„³
DaemonService„³ClearEnv´³orµµ±present´³dict·³clearEnv´³named³clearEnv´³atom³Boolean„„„„„µ±invalid´³dict·³clearEnv´³named³clearEnv³any„„„„µ±absent´³dict·„„„„„³EnvValue´³orµµ±set´³atom³String„„µ±remove´³lit€„„µ±invalid³any„„„³Protocol´³orµµ±none´³lit³none„„µ±binarySyndicate´³lit³application/syndicate„„µ±
textSyndicate´³lit³text/syndicate„„„„³
|
||||
ProcessDir´³orµµ±present´³dict·³dir´³named³dir´³atom³String„„„„„µ±invalid´³dict·³dir´³named³dir³any„„„„µ±absent´³dict·„„„„„³
|
||||
ProcessEnv´³orµµ±present´³dict·³env´³named³env´³dictof´³refµ„³EnvVariable„´³refµ„³EnvValue„„„„„„µ±invalid´³dict·³env´³named³env³any„„„„µ±absent´³dict·„„„„„³CommandLine´³orµµ±shell´³atom³String„„µ±full´³refµ„³FullCommandLine„„„„³EnvVariable´³orµµ±string´³atom³String„„µ±symbol´³atom³Symbol„„µ±invalid³any„„„³FullProcess´³andµ´³dict·³argv´³named³argv´³refµ„³CommandLine„„„„´³named³env´³refµ„³
|
||||
ProcessEnv„„´³named³dir´³refµ„³
|
||||
ProcessDir„„´³named³clearEnv´³refµ„³ClearEnv„„„„³ReadyOnStart´³orµµ±present´³dict·³readyOnStart´³named³readyOnStart´³atom³Boolean„„„„„µ±invalid´³dict·³readyOnStart´³named³readyOnStart³any„„„„µ±absent´³dict·„„„„„³RestartField´³orµµ±present´³dict·³restart´³named³restart´³refµ„³
RestartPolicy„„„„„µ±invalid´³dict·³restart´³named³restart³any„„„„µ±absent´³dict·„„„„„³
DaemonProcess´³rec´³lit³daemon„´³tupleµ´³named³id³any„´³named³config´³refµ„³DaemonProcessSpec„„„„„³
DaemonService´³rec´³lit³daemon„´³tupleµ´³named³id³any„„„„³
ProtocolField´³orµµ±present´³dict·³protocol´³named³protocol´³refµ„³Protocol„„„„„µ±invalid´³dict·³protocol´³named³protocol³any„„„„µ±absent´³dict·„„„„„³
RestartPolicy´³orµµ±always´³lit³always„„µ±onError´³lit³on-error„„µ±all´³lit³all„„„„³FullCommandLine´³tuplePrefixµ´³named³program´³atom³String„„„´³named³args´³seqof´³atom³String„„„„³DaemonProcessSpec´³orµµ±simple´³refµ„³CommandLine„„µ±oneShot´³rec´³lit³one-shot„´³tupleµ´³named³setup´³refµ„³CommandLine„„„„„„µ±full´³refµ„³FullDaemonProcess„„„„³FullDaemonProcess´³andµ´³named³process´³refµ„³FullProcess„„´³named³readyOnStart´³refµ„³ReadyOnStart„„´³named³restart´³refµ„³RestartField„„´³named³protocol´³refµ„³
ProtocolField„„„„„³embeddedType´³refµ³ EntityRef„³Cap„„„µ³internalServices„´³schema·³version‘³definitions·³ ConfigEnv´³dictof´³atom³Symbol„³any„³ Milestone´³rec´³lit³ milestone„´³tupleµ´³named³name³any„„„„³DebtReporter´³rec´³lit³
debt-reporter„´³tupleµ´³named³intervalSeconds´³atom³Double„„„„„³
ConfigWatcher´³rec´³lit³config-watcher„´³tupleµ´³named³path´³atom³String„„´³named³env´³refµ„³ ConfigEnv„„„„„³TcpRelayListener´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Tcp„„´³named³
|
||||
ProcessDir„„´³named³clearEnv´³refµ„³ClearEnv„„„„³ReadyOnStart´³orµµ±present´³dict·³readyOnStart´³named³readyOnStart´³atom³Boolean„„„„„µ±invalid´³dict·³readyOnStart´³named³readyOnStart³any„„„„µ±absent´³dict·„„„„„³RestartField´³orµµ±present´³dict·³restart´³named³restart´³refµ„³
RestartPolicy„„„„„µ±invalid´³dict·³restart´³named³restart³any„„„„µ±absent´³dict·„„„„„³
DaemonProcess´³rec´³lit³daemon„´³tupleµ´³named³id³any„´³named³config´³refµ„³DaemonProcessSpec„„„„„³
DaemonService´³rec´³lit³daemon„´³tupleµ´³named³id³any„„„„³
ProtocolField´³orµµ±present´³dict·³protocol´³named³protocol´³refµ„³Protocol„„„„„µ±invalid´³dict·³protocol´³named³protocol³any„„„„µ±absent´³dict·„„„„„³
RestartPolicy´³orµµ±always´³lit³always„„µ±onError´³lit³on-error„„µ±all´³lit³all„„µ±never´³lit³never„„„„³FullCommandLine´³tuplePrefixµ´³named³program´³atom³String„„„´³named³args´³seqof´³atom³String„„„„³DaemonProcessSpec´³orµµ±simple´³refµ„³CommandLine„„µ±oneShot´³rec´³lit³one-shot„´³tupleµ´³named³setup´³refµ„³CommandLine„„„„„„µ±full´³refµ„³FullDaemonProcess„„„„³FullDaemonProcess´³andµ´³named³process´³refµ„³FullProcess„„´³named³readyOnStart´³refµ„³ReadyOnStart„„´³named³restart´³refµ„³RestartField„„´³named³protocol´³refµ„³
ProtocolField„„„„„³embeddedType´³refµ³ EntityRef„³Cap„„„µ³internalServices„´³schema·³version°³definitions·³ ConfigEnv´³dictof´³atom³Symbol„³any„³
|
||||
Gatekeeper´³rec´³lit³
|
||||
gatekeeper„´³tupleµ´³named³ bindspace´³embedded´³refµ³
|
||||
gatekeeper„³Bind„„„„„„³
|
||||
HttpRouter´³rec´³lit³http-router„´³tupleµ´³named³httpd´³embedded³any„„„„„³TcpWithHttp´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Tcp„„´³named³
|
||||
gatekeeper´³embedded´³refµ³
|
||||
gatekeeper„³Resolve„„„„„„³UnixRelayListener´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Unix„„´³named³
|
||||
gatekeeper„³Resolve„„„´³named³httpd´³embedded´³refµ³http„³HttpContext„„„„„„³DebtReporter´³rec´³lit³
debt-reporter„´³tupleµ´³named³intervalSeconds´³atom³Double„„„„„³
ConfigWatcher´³rec´³lit³config-watcher„´³tupleµ´³named³path´³atom³String„„´³named³env´³refµ„³ ConfigEnv„„„„„³TcpWithoutHttp´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Tcp„„´³named³
|
||||
gatekeeper´³embedded´³refµ³
|
||||
gatekeeper„³Resolve„„„„„„„³embeddedType´³refµ³ EntityRef„³Cap„„„„„
|
||||
gatekeeper„³Resolve„„„„„„³TcpRelayListener´³orµµ±TcpWithoutHttp´³refµ„³TcpWithoutHttp„„µ±TcpWithHttp´³refµ„³TcpWithHttp„„„„³UnixRelayListener´³rec´³lit³relay-listener„´³tupleµ´³named³addr´³refµ³TransportAddress„³Unix„„´³named³
|
||||
gatekeeper´³embedded´³refµ³
|
||||
gatekeeper„³Resolve„„„„„„³HttpStaticFileServer´³rec´³lit³http-static-files„´³tupleµ´³named³dir´³atom³String„„´³named³pathPrefixElements´³atom³
SignedInteger„„„„„„³embeddedType´³refµ³ EntityRef„³Cap„„„„„
|
|
@ -0,0 +1,12 @@
|
|||
version 1 .
|
||||
|
||||
# Messages and assertions relating to the `$control` entity enabled in syndicate-server when
|
||||
# the `--control` flag is supplied.
|
||||
#
|
||||
# For example, placing the following into `control-config.pr` and starting the server with
|
||||
# `syndicate-server --control -c control-config.pr` will result in the server exiting with
|
||||
# exit code 2:
|
||||
#
|
||||
# $control ! <exit 2>
|
||||
|
||||
ExitServer = <exit @code int> .
|
|
@ -1,11 +1,11 @@
|
|||
version 1 .
|
||||
|
||||
; Assertion. Describes `object`.
|
||||
# Assertion. Describes `object`.
|
||||
Metadata = <metadata @object any @info { symbol: any ...:... }> .
|
||||
|
||||
; Projections of the `info` in a `Metadata` record.
|
||||
# Projections of the `info` in a `Metadata` record.
|
||||
Description = @present { description: IOList } / @invalid { description: any } / @absent {} .
|
||||
Url = @present { url: string } / @invalid { url: any } / @absent {} .
|
||||
|
||||
; Data type. From preserves' `conventions.md`.
|
||||
# Data type. From preserves' `conventions.md`.
|
||||
IOList = @bytes bytes / @string string / @nested [IOList ...] .
|
||||
|
|
|
@ -30,23 +30,26 @@ EnvVariable = @string string / @symbol symbol / @invalid any .
|
|||
EnvValue = @set string / @remove #f / @invalid any .
|
||||
|
||||
RestartPolicy =
|
||||
/ ; Whether the process terminates normally or abnormally, restart it
|
||||
; without affecting any peer processes within the service.
|
||||
/ # Whether the process terminates normally or abnormally, restart it
|
||||
# without affecting any peer processes within the service.
|
||||
=always
|
||||
/ ; If the process terminates normally, leave everything alone; if it
|
||||
; terminates abnormally, restart it without affecting peers.
|
||||
/ # If the process terminates normally, leave everything alone; if it
|
||||
# terminates abnormally, restart it without affecting peers.
|
||||
@onError =on-error
|
||||
/ ; If the process terminates normally, leave everything alone; if it
|
||||
; terminates abnormally, restart the whole daemon (all processes
|
||||
; within the daemon).
|
||||
/ # If the process terminates normally, leave everything alone; if it
|
||||
# terminates abnormally, restart the whole daemon (all processes
|
||||
# within the daemon).
|
||||
=all
|
||||
/ # Treat both normal and abnormal termination as normal termination; that is, never restart,
|
||||
# and enter state "complete" even if the process fails.
|
||||
=never
|
||||
.
|
||||
|
||||
Protocol =
|
||||
/ ; stdin is /dev/null, output and error are logged
|
||||
/ # stdin is /dev/null, output and error are logged
|
||||
=none
|
||||
/ ; stdin and stdout are *binary* Syndicate-protocol channels
|
||||
/ # stdin and stdout are *binary* Syndicate-protocol channels
|
||||
@binarySyndicate =application/syndicate
|
||||
/ ; stdin and stdout are *text* Syndicate-protocol channels
|
||||
/ # stdin and stdout are *text* Syndicate-protocol channels
|
||||
@textSyndicate =text/syndicate
|
||||
.
|
||||
|
|
|
@ -1,11 +1,18 @@
|
|||
version 1 .
|
||||
embeddedType EntityRef.Cap .
|
||||
|
||||
Gatekeeper = <gatekeeper @bindspace #:gatekeeper.Bind> .
|
||||
|
||||
DebtReporter = <debt-reporter @intervalSeconds double>.
|
||||
|
||||
TcpRelayListener = <relay-listener @addr TransportAddress.Tcp @gatekeeper #!gatekeeper.Resolve> .
|
||||
UnixRelayListener = <relay-listener @addr TransportAddress.Unix @gatekeeper #!gatekeeper.Resolve> .
|
||||
TcpRelayListener = TcpWithoutHttp / TcpWithHttp .
|
||||
TcpWithoutHttp = <relay-listener @addr TransportAddress.Tcp @gatekeeper #:gatekeeper.Resolve> .
|
||||
TcpWithHttp = <relay-listener @addr TransportAddress.Tcp @gatekeeper #:gatekeeper.Resolve @httpd #:http.HttpContext> .
|
||||
|
||||
UnixRelayListener = <relay-listener @addr TransportAddress.Unix @gatekeeper #:gatekeeper.Resolve> .
|
||||
ConfigWatcher = <config-watcher @path string @env ConfigEnv>.
|
||||
Milestone = <milestone @name any>.
|
||||
|
||||
ConfigEnv = { symbol: any ...:... }.
|
||||
|
||||
HttpRouter = <http-router @httpd #:any> .
|
||||
HttpStaticFileServer = <http-static-files @dir string @pathPrefixElements int> .
|
||||
|
|
|
@ -3,23 +3,21 @@ use preserves_schema::Codec;
|
|||
use std::sync::Arc;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::during::entity;
|
||||
use syndicate::enclose;
|
||||
use syndicate::schemas::dataspace::Observe;
|
||||
use syndicate::preserves::rec;
|
||||
use syndicate::schemas::service;
|
||||
use syndicate::value::NestedValue;
|
||||
|
||||
use crate::counter;
|
||||
use crate::language::language;
|
||||
use crate::schemas::internal_services;
|
||||
|
||||
use syndicate_macros::during;
|
||||
|
||||
pub fn boot(t: &mut Activation, ds: Arc<Cap>) {
|
||||
t.spawn(syndicate::name!("dependencies"), move |t| {
|
||||
t.spawn(Some(AnyValue::symbol("dependencies_listener")), move |t| {
|
||||
Ok(during!(t, ds, language(), <require-service $spec>, |t: &mut Activation| {
|
||||
tracing::debug!(?spec, "tracking dependencies");
|
||||
t.spawn_link(syndicate::name!(parent: None, "dependencies", spec = ?spec),
|
||||
t.spawn_link(Some(rec![AnyValue::symbol("dependencies"), language().unparse(&spec)]),
|
||||
enclose!((ds) |t| run(t, ds, spec)));
|
||||
Ok(())
|
||||
}))
|
||||
|
@ -27,34 +25,9 @@ pub fn boot(t: &mut Activation, ds: Arc<Cap>) {
|
|||
}
|
||||
|
||||
fn run(t: &mut Activation, ds: Arc<Cap>, service_name: AnyValue) -> ActorResult {
|
||||
if !service_name.value().is_simple_record("milestone", Some(1)) {
|
||||
let system_layer_dep = service::ServiceDependency {
|
||||
depender: service_name.clone(),
|
||||
dependee: service::ServiceState {
|
||||
service_name: language().unparse(&internal_services::Milestone {
|
||||
name: AnyValue::symbol("system-layer"),
|
||||
}),
|
||||
state: service::State::Ready,
|
||||
},
|
||||
};
|
||||
let milestone_monitor = entity(ds.assert(t, language(), &system_layer_dep))
|
||||
.on_asserted(enclose!((ds) move |handle, t, _captures: AnyValue| {
|
||||
ds.update::<_, service::ServiceDependency>(t, handle, language(), None);
|
||||
Ok(Some(Box::new(enclose!((ds, system_layer_dep) move |handle, t| {
|
||||
ds.update(t, handle, language(), Some(&system_layer_dep));
|
||||
Ok(())
|
||||
}))))
|
||||
}))
|
||||
.create_cap(t);
|
||||
ds.assert(t, language(), &Observe {
|
||||
pattern: syndicate_macros::pattern!{<system-layer-service #(&service_name)>},
|
||||
observer: milestone_monitor,
|
||||
});
|
||||
}
|
||||
|
||||
let obstacle_count = t.named_field("obstacle_count", 1isize);
|
||||
t.dataflow(enclose!((obstacle_count) move |t| {
|
||||
tracing::trace!(obstacle_count = ?t.get(&obstacle_count));
|
||||
t.dataflow(enclose!((service_name, obstacle_count) move |t| {
|
||||
tracing::trace!(?service_name, obstacle_count = ?t.get(&obstacle_count));
|
||||
Ok(())
|
||||
}))?;
|
||||
|
||||
|
@ -73,24 +46,25 @@ fn run(t: &mut Activation, ds: Arc<Cap>, service_name: AnyValue) -> ActorResult
|
|||
})
|
||||
})?;
|
||||
|
||||
let depender = service_name.clone();
|
||||
enclose!((ds, obstacle_count) during!(
|
||||
t, ds, language(), <depends-on #(&service_name) $dependee>,
|
||||
enclose!((ds, obstacle_count) move |t: &mut Activation| {
|
||||
t, ds, language(), <depends-on #(&depender) $dependee>,
|
||||
enclose!((service_name, ds, obstacle_count) move |t: &mut Activation| {
|
||||
if let Ok(dependee) = language().parse::<service::ServiceState>(&dependee) {
|
||||
tracing::trace!(on = ?dependee, "new dependency");
|
||||
tracing::trace!(?service_name, ?dependee, "new dependency");
|
||||
ds.assert(t, language(), &service::RequireService {
|
||||
service_name: dependee.service_name,
|
||||
});
|
||||
} else {
|
||||
tracing::warn!(on = ?dependee, "cannot deduce dependee service name");
|
||||
tracing::warn!(?service_name, ?dependee, "cannot deduce dependee service name");
|
||||
}
|
||||
|
||||
counter::adjust(t, &obstacle_count, 1);
|
||||
|
||||
let d = &dependee.clone();
|
||||
during!(t, ds, language(), #d, enclose!(
|
||||
(obstacle_count, dependee) move |t: &mut Activation| {
|
||||
tracing::trace!(on = ?dependee, "dependency satisfied");
|
||||
(service_name, obstacle_count, dependee) move |t: &mut Activation| {
|
||||
tracing::trace!(?service_name, ?dependee, "dependency satisfied");
|
||||
counter::adjust(t, &obstacle_count, -1);
|
||||
Ok(())
|
||||
}));
|
||||
|
|
|
@ -1,37 +1,179 @@
|
|||
use noise_protocol::CipherState;
|
||||
use noise_protocol::U8Array;
|
||||
use noise_protocol::patterns::HandshakePattern;
|
||||
use noise_rust_crypto::Blake2s;
|
||||
use noise_rust_crypto::ChaCha20Poly1305;
|
||||
use noise_rust_crypto::X25519;
|
||||
use preserves_schema::Codec;
|
||||
use syndicate::relay::Mutex;
|
||||
use syndicate::relay::TunnelRelay;
|
||||
use syndicate::trace::TurnCause;
|
||||
use syndicate::value::NoEmbeddedDomainCodec;
|
||||
use syndicate::value::packed::PackedWriter;
|
||||
|
||||
use std::convert::TryInto;
|
||||
use std::sync::Arc;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::during::DuringResult;
|
||||
use syndicate::schemas::gatekeeper;
|
||||
use syndicate::enclose;
|
||||
use syndicate::value::NestedValue;
|
||||
use syndicate::schemas::dataspace;
|
||||
use syndicate::schemas::gatekeeper;
|
||||
use syndicate::schemas::noise;
|
||||
use syndicate::schemas::sturdy;
|
||||
|
||||
use crate::language::language;
|
||||
|
||||
// pub fn bind(
|
||||
// t: &mut Activation,
|
||||
// ds: &Arc<Cap>,
|
||||
// oid: syndicate::schemas::sturdy::_Any,
|
||||
// key: [u8; 16],
|
||||
// target: Arc<Cap>,
|
||||
// ) {
|
||||
// let sr = sturdy::SturdyRef::mint(oid.clone(), &key);
|
||||
// tracing::info!(cap = ?language().unparse(&sr), hex = %sr.to_hex());
|
||||
// ds.assert(t, language(), &gatekeeper::Bind { oid, key: key.to_vec(), target });
|
||||
// }
|
||||
use syndicate_macros::during;
|
||||
use syndicate_macros::pattern;
|
||||
|
||||
pub fn handle_resolve(
|
||||
fn sturdy_step_type() -> String {
|
||||
language().unparse(&sturdy::SturdyStepType).value().to_symbol().unwrap().clone()
|
||||
}
|
||||
|
||||
fn noise_step_type() -> String {
|
||||
language().unparse(&noise::NoiseStepType).value().to_symbol().unwrap().clone()
|
||||
}
|
||||
|
||||
pub fn handle_binds(t: &mut Activation, ds: &Arc<Cap>) -> ActorResult {
|
||||
during!(t, ds, language(), <bind <ref $desc> $target $observer>, |t: &mut Activation| {
|
||||
t.spawn_link(None, move |t| {
|
||||
target.value().to_embedded()?;
|
||||
let observer = language().parse::<gatekeeper::BindObserver>(&observer)?;
|
||||
let desc = language().parse::<sturdy::SturdyDescriptionDetail>(&desc)?;
|
||||
let sr = sturdy::SturdyRef::mint(desc.oid, &desc.key);
|
||||
if let gatekeeper::BindObserver::Present(o) = observer {
|
||||
o.assert(t, language(), &gatekeeper::Bound::Bound {
|
||||
path_step: Box::new(gatekeeper::PathStep {
|
||||
step_type: sturdy_step_type(),
|
||||
detail: language().unparse(&sr.parameters),
|
||||
}),
|
||||
});
|
||||
}
|
||||
Ok(())
|
||||
});
|
||||
Ok(())
|
||||
});
|
||||
during!(t, ds, language(), <bind <noise $desc> $target $observer>, |t: &mut Activation| {
|
||||
t.spawn_link(None, move |t| {
|
||||
target.value().to_embedded()?;
|
||||
let observer = language().parse::<gatekeeper::BindObserver>(&observer)?;
|
||||
let spec = language().parse::<noise::NoiseDescriptionDetail<AnyValue>>(&desc)?.0;
|
||||
match validate_noise_spec(spec) {
|
||||
Ok(spec) => if let gatekeeper::BindObserver::Present(o) = observer {
|
||||
o.assert(t, language(), &gatekeeper::Bound::Bound {
|
||||
path_step: Box::new(gatekeeper::PathStep {
|
||||
step_type: noise_step_type(),
|
||||
detail: language().unparse(&noise::NoisePathStepDetail(noise::NoiseSpec {
|
||||
key: spec.public_key,
|
||||
service: noise::ServiceSelector(spec.service),
|
||||
protocol: if spec.protocol == default_noise_protocol() {
|
||||
noise::NoiseProtocol::Absent
|
||||
} else {
|
||||
noise::NoiseProtocol::Present {
|
||||
protocol: spec.protocol,
|
||||
}
|
||||
},
|
||||
pre_shared_keys: if spec.psks.is_empty() {
|
||||
noise::NoisePreSharedKeys::Absent
|
||||
} else {
|
||||
noise::NoisePreSharedKeys::Present {
|
||||
pre_shared_keys: spec.psks,
|
||||
}
|
||||
},
|
||||
})),
|
||||
}),
|
||||
});
|
||||
},
|
||||
Err(e) => {
|
||||
if let gatekeeper::BindObserver::Present(o) = observer {
|
||||
o.assert(t, language(), &gatekeeper::Bound::Rejected(
|
||||
Box::new(gatekeeper::Rejected {
|
||||
detail: AnyValue::new(format!("{}", &e)),
|
||||
})));
|
||||
}
|
||||
tracing::error!("Invalid noise bind description: {}", e);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
});
|
||||
Ok(())
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn facet_handle_resolve(
|
||||
ds: &mut Arc<Cap>,
|
||||
t: &mut Activation,
|
||||
a: gatekeeper::Resolve,
|
||||
) -> DuringResult<Arc<Cap>> {
|
||||
use syndicate::schemas::dataspace;
|
||||
) -> ActorResult {
|
||||
let mut detail: &'static str = "unsupported";
|
||||
|
||||
let gatekeeper::Resolve { sturdyref, observer } = a;
|
||||
let queried_oid = sturdyref.oid.clone();
|
||||
if a.step.step_type == sturdy_step_type() {
|
||||
detail = "invalid";
|
||||
if let Ok(s) = language().parse::<sturdy::SturdyStepDetail>(&a.step.detail) {
|
||||
t.facet(|t| {
|
||||
let f = handle_direct_resolution(ds, t, a.clone())?;
|
||||
await_bind_sturdyref(ds, t, sturdy::SturdyRef { parameters: s.0 }, a.observer, f)
|
||||
})?;
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
if a.step.step_type == noise_step_type() {
|
||||
detail = "invalid";
|
||||
if let Ok(s) = language().parse::<noise::NoiseStepDetail<AnyValue>>(&a.step.detail) {
|
||||
t.facet(|t| {
|
||||
let f = handle_direct_resolution(ds, t, a.clone())?;
|
||||
await_bind_noise(ds, t, s.0.0, a.observer, f)
|
||||
})?;
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
a.observer.assert(t, language(), &gatekeeper::Rejected {
|
||||
detail: AnyValue::symbol(detail),
|
||||
});
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn handle_direct_resolution(
|
||||
ds: &mut Arc<Cap>,
|
||||
t: &mut Activation,
|
||||
a: gatekeeper::Resolve,
|
||||
) -> Result<FacetId, ActorError> {
|
||||
let outer_facet = t.facet_id();
|
||||
t.facet(move |t| {
|
||||
let handler = syndicate::entity(a.observer)
|
||||
.on_asserted(move |observer, t, a: AnyValue| {
|
||||
t.stop_facet_and_continue(outer_facet, Some(
|
||||
enclose!((observer, a) move |t: &mut Activation| {
|
||||
observer.assert(t, language(), &a);
|
||||
Ok(())
|
||||
})))?;
|
||||
Ok(None)
|
||||
})
|
||||
.create_cap(t);
|
||||
ds.assert(t, language(), &gatekeeper::Resolve {
|
||||
step: a.step.clone(),
|
||||
observer: handler,
|
||||
});
|
||||
Ok(())
|
||||
})
|
||||
}
|
||||
|
||||
fn await_bind_sturdyref(
|
||||
ds: &mut Arc<Cap>,
|
||||
t: &mut Activation,
|
||||
sturdyref: sturdy::SturdyRef,
|
||||
observer: Arc<Cap>,
|
||||
direct_resolution_facet: FacetId,
|
||||
) -> ActorResult {
|
||||
let queried_oid = sturdyref.parameters.oid.clone();
|
||||
let handler = syndicate::entity(observer)
|
||||
.on_asserted(move |observer, t, a: AnyValue| {
|
||||
t.stop_facet(direct_resolution_facet);
|
||||
let bindings = a.value().to_sequence()?;
|
||||
let key = bindings[0].value().to_bytestring()?;
|
||||
let unattenuated_target = bindings[1].value().to_embedded()?;
|
||||
|
@ -39,28 +181,320 @@ pub fn handle_resolve(
|
|||
Err(e) => {
|
||||
tracing::warn!(sturdyref = ?language().unparse(&sturdyref),
|
||||
"sturdyref failed validation: {}", e);
|
||||
Ok(None)
|
||||
observer.assert(t, language(), &gatekeeper::Resolved::Rejected(
|
||||
Box::new(gatekeeper::Rejected {
|
||||
detail: AnyValue::symbol("sturdyref-failed-validation"),
|
||||
})));
|
||||
},
|
||||
Ok(target) => {
|
||||
tracing::trace!(sturdyref = ?language().unparse(&sturdyref),
|
||||
?target,
|
||||
"sturdyref resolved");
|
||||
if let Some(h) = observer.assert(t, &(), &AnyValue::domain(target)) {
|
||||
Ok(Some(Box::new(move |_observer, t| Ok(t.retract(h)))))
|
||||
} else {
|
||||
Ok(None)
|
||||
}
|
||||
observer.assert(t, language(), &gatekeeper::Resolved::Accepted {
|
||||
responder_session: target,
|
||||
});
|
||||
}
|
||||
}
|
||||
Ok(None)
|
||||
})
|
||||
.create_cap(t);
|
||||
if let Some(oh) = ds.assert(t, language(), &dataspace::Observe {
|
||||
ds.assert(t, language(), &dataspace::Observe {
|
||||
// TODO: codegen plugin to generate pattern constructors
|
||||
pattern: syndicate_macros::pattern!{<bind #(&queried_oid) $ $>},
|
||||
pattern: pattern!{<bind <ref { oid: #(&queried_oid), key: $ }> $ _>},
|
||||
observer: handler,
|
||||
}) {
|
||||
Ok(Some(Box::new(move |_ds, t| Ok(t.retract(oh)))))
|
||||
} else {
|
||||
Ok(None)
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
struct ValidatedNoiseSpec {
|
||||
service: AnyValue,
|
||||
protocol: String,
|
||||
pattern: HandshakePattern,
|
||||
psks: Vec<Vec<u8>>,
|
||||
secret_key: Option<Vec<u8>>,
|
||||
public_key: Vec<u8>,
|
||||
}
|
||||
|
||||
fn default_noise_protocol() -> String {
|
||||
language().unparse(&noise::DefaultProtocol).value().to_string().unwrap().clone()
|
||||
}
|
||||
|
||||
fn validate_noise_spec(
|
||||
spec: noise::NoiseServiceSpec<AnyValue>,
|
||||
) -> Result<ValidatedNoiseSpec, ActorError> {
|
||||
let protocol = match spec.base.protocol {
|
||||
noise::NoiseProtocol::Present { protocol } => protocol,
|
||||
noise::NoiseProtocol::Invalid { protocol } =>
|
||||
Err(format!("Invalid noise protocol {:?}", protocol))?,
|
||||
noise::NoiseProtocol::Absent => default_noise_protocol(),
|
||||
};
|
||||
|
||||
const PREFIX: &'static str = "Noise_";
|
||||
const SUFFIX: &'static str = "_25519_ChaChaPoly_BLAKE2s";
|
||||
if !protocol.starts_with(PREFIX) || !protocol.ends_with(SUFFIX) {
|
||||
Err(format!("Unsupported protocol {:?}", protocol))?;
|
||||
}
|
||||
|
||||
let pattern_name = &protocol[PREFIX.len()..(protocol.len()-SUFFIX.len())];
|
||||
let pattern = lookup_pattern(pattern_name).ok_or_else::<ActorError, _>(
|
||||
|| format!("Unsupported handshake pattern {:?}", pattern_name).into())?;
|
||||
|
||||
let psks = match spec.base.pre_shared_keys {
|
||||
noise::NoisePreSharedKeys::Present { pre_shared_keys } => pre_shared_keys,
|
||||
noise::NoisePreSharedKeys::Invalid { pre_shared_keys } =>
|
||||
Err(format!("Invalid pre-shared-keys {:?}", pre_shared_keys))?,
|
||||
noise::NoisePreSharedKeys::Absent => vec![],
|
||||
};
|
||||
|
||||
let secret_key = match spec.secret_key {
|
||||
noise::SecretKeyField::Present { secret_key } => Some(secret_key),
|
||||
noise::SecretKeyField::Invalid { secret_key } =>
|
||||
Err(format!("Invalid secret key {:?}", secret_key))?,
|
||||
noise::SecretKeyField::Absent => None,
|
||||
};
|
||||
|
||||
Ok(ValidatedNoiseSpec {
|
||||
service: spec.base.service.0,
|
||||
protocol,
|
||||
pattern,
|
||||
psks,
|
||||
secret_key,
|
||||
public_key: spec.base.key,
|
||||
})
|
||||
}
|
||||
|
||||
fn await_bind_noise(
|
||||
ds: &mut Arc<Cap>,
|
||||
t: &mut Activation,
|
||||
service_selector: AnyValue,
|
||||
observer: Arc<Cap>,
|
||||
direct_resolution_facet: FacetId,
|
||||
) -> ActorResult {
|
||||
let handler = syndicate::entity(())
|
||||
.on_asserted_facet(move |_state, t, a: AnyValue| {
|
||||
t.stop_facet(direct_resolution_facet);
|
||||
let observer = Arc::clone(&observer);
|
||||
t.spawn_link(None, move |t| {
|
||||
let bindings = a.value().to_sequence()?;
|
||||
let spec = validate_noise_spec(language().parse(&bindings[0])?)?;
|
||||
let service = bindings[1].value().to_embedded()?;
|
||||
run_noise_responder(t, spec, observer, Arc::clone(service))
|
||||
});
|
||||
Ok(())
|
||||
})
|
||||
.create_cap(t);
|
||||
ds.assert(t, language(), &dataspace::Observe {
|
||||
// TODO: codegen plugin to generate pattern constructors
|
||||
pattern: pattern!{
|
||||
<bind <noise $spec:NoiseServiceSpec{ { service: #(&service_selector) } }> $service _>
|
||||
},
|
||||
observer: handler,
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
type HandshakeState = noise_protocol::HandshakeState<X25519, ChaCha20Poly1305, Blake2s>;
|
||||
|
||||
enum ResponderState {
|
||||
Invalid, // used during state transitions
|
||||
Introduction {
|
||||
service: Arc<Cap>,
|
||||
hs: HandshakeState,
|
||||
},
|
||||
Handshake {
|
||||
initiator_session: Arc<Cap>,
|
||||
service: Arc<Cap>,
|
||||
hs: HandshakeState,
|
||||
},
|
||||
Transport {
|
||||
relay_input: Arc<Mutex<Option<TunnelRelay>>>,
|
||||
c_recv: CipherState<ChaCha20Poly1305>,
|
||||
},
|
||||
}
|
||||
|
||||
impl Entity<noise::SessionItem> for ResponderState {
|
||||
fn assert(&mut self, _t: &mut Activation, item: noise::SessionItem, _handle: Handle) -> ActorResult {
|
||||
let initiator_session = match item {
|
||||
noise::SessionItem::Initiator(i_box) => i_box.initiator_session,
|
||||
noise::SessionItem::Packet(_) => Err("Unexpected Packet assertion")?,
|
||||
};
|
||||
match std::mem::replace(self, ResponderState::Invalid) {
|
||||
ResponderState::Introduction { service, hs } => {
|
||||
*self = ResponderState::Handshake { initiator_session, service, hs };
|
||||
Ok(())
|
||||
}
|
||||
_ =>
|
||||
Err("Received second Initiator")?,
|
||||
}
|
||||
}
|
||||
|
||||
fn message(&mut self, t: &mut Activation, item: noise::SessionItem) -> ActorResult {
|
||||
let p = match item {
|
||||
noise::SessionItem::Initiator(_) => Err("Unexpected Initiator message")?,
|
||||
noise::SessionItem::Packet(p_box) => *p_box,
|
||||
};
|
||||
match self {
|
||||
ResponderState::Invalid | ResponderState::Introduction { .. } =>
|
||||
Err("Received Packet in invalid ResponderState")?,
|
||||
ResponderState::Handshake { initiator_session, service, hs } => match p {
|
||||
noise::Packet::Complete(bs) => {
|
||||
if bs.len() < hs.get_next_message_overhead() {
|
||||
Err("Invalid handshake message for pattern")?;
|
||||
}
|
||||
if bs.len() > hs.get_next_message_overhead() {
|
||||
Err("Cannot accept payload during handshake")?;
|
||||
}
|
||||
hs.read_message(&bs, &mut [])?;
|
||||
let mut reply = vec![0u8; hs.get_next_message_overhead()];
|
||||
hs.write_message(&[], &mut reply[..])?;
|
||||
initiator_session.message(t, language(), &noise::Packet::Complete(reply.into()));
|
||||
if hs.completed() {
|
||||
let (c_recv, mut c_send) = hs.get_ciphers();
|
||||
let (_, relay_input, mut relay_output) =
|
||||
TunnelRelay::_run(t, Some(Arc::clone(service)), None, false);
|
||||
let trace_collector = t.trace_collector();
|
||||
let initiator_session = Arc::clone(initiator_session);
|
||||
let relay_output_name = Some(AnyValue::symbol("relay_output"));
|
||||
let transport_facet = t.facet_ref();
|
||||
t.linked_task(relay_output_name.clone(), async move {
|
||||
let account = Account::new(relay_output_name, trace_collector);
|
||||
let cause = TurnCause::external("relay_output");
|
||||
loop {
|
||||
match relay_output.recv().await {
|
||||
None => return Ok(LinkedTaskTermination::KeepFacet),
|
||||
Some(loaned_item) => {
|
||||
const MAXSIZE: usize = 65535 - 16; /* Noise tag length is 16 */
|
||||
let p = if loaned_item.item.len() > MAXSIZE {
|
||||
noise::Packet::Fragmented(
|
||||
loaned_item.item
|
||||
.chunks(MAXSIZE)
|
||||
.map(|c| c_send.encrypt_vec(c))
|
||||
.collect())
|
||||
} else {
|
||||
noise::Packet::Complete(c_send.encrypt_vec(&loaned_item.item))
|
||||
};
|
||||
if !transport_facet.activate(&account, Some(cause.clone()), |t| {
|
||||
initiator_session.message(t, language(), &p);
|
||||
Ok(())
|
||||
}) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(LinkedTaskTermination::Normal)
|
||||
});
|
||||
*self = ResponderState::Transport { relay_input, c_recv };
|
||||
}
|
||||
}
|
||||
_ => Err("Fragmented handshake is not allowed")?,
|
||||
},
|
||||
ResponderState::Transport { relay_input, c_recv } => {
|
||||
let bs = match p {
|
||||
noise::Packet::Complete(bs) =>
|
||||
c_recv.decrypt_vec(&bs[..]).map_err(|_| "Cannot decrypt packet")?,
|
||||
noise::Packet::Fragmented(pieces) => {
|
||||
let mut result = Vec::with_capacity(1024);
|
||||
for piece in pieces {
|
||||
result.extend(c_recv.decrypt_vec(&piece[..])
|
||||
.map_err(|_| "Cannot decrypt packet fragment")?);
|
||||
}
|
||||
result
|
||||
}
|
||||
};
|
||||
let mut g = relay_input.lock();
|
||||
let tr = g.as_mut().expect("initialized");
|
||||
tr.handle_inbound_datagram(t, &bs[..])?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn lookup_pattern(name: &str) -> Option<HandshakePattern> {
|
||||
use noise_protocol::patterns::*;
|
||||
Some(match name {
|
||||
"N" => noise_n(),
|
||||
"K" => noise_k(),
|
||||
"X" => noise_x(),
|
||||
"NN" => noise_nn(),
|
||||
"NK" => noise_nk(),
|
||||
"NX" => noise_nx(),
|
||||
"XN" => noise_xn(),
|
||||
"XK" => noise_xk(),
|
||||
"XX" => noise_xx(),
|
||||
"KN" => noise_kn(),
|
||||
"KK" => noise_kk(),
|
||||
"KX" => noise_kx(),
|
||||
"IN" => noise_in(),
|
||||
"IK" => noise_ik(),
|
||||
"IX" => noise_ix(),
|
||||
"Npsk0" => noise_n_psk0(),
|
||||
"Kpsk0" => noise_k_psk0(),
|
||||
"Xpsk1" => noise_x_psk1(),
|
||||
"NNpsk0" => noise_nn_psk0(),
|
||||
"NNpsk2" => noise_nn_psk2(),
|
||||
"NKpsk0" => noise_nk_psk0(),
|
||||
"NKpsk2" => noise_nk_psk2(),
|
||||
"NXpsk2" => noise_nx_psk2(),
|
||||
"XNpsk3" => noise_xn_psk3(),
|
||||
"XKpsk3" => noise_xk_psk3(),
|
||||
"XXpsk3" => noise_xx_psk3(),
|
||||
"KNpsk0" => noise_kn_psk0(),
|
||||
"KNpsk2" => noise_kn_psk2(),
|
||||
"KKpsk0" => noise_kk_psk0(),
|
||||
"KKpsk2" => noise_kk_psk2(),
|
||||
"KXpsk2" => noise_kx_psk2(),
|
||||
"INpsk1" => noise_in_psk1(),
|
||||
"INpsk2" => noise_in_psk2(),
|
||||
"IKpsk1" => noise_ik_psk1(),
|
||||
"IKpsk2" => noise_ik_psk2(),
|
||||
"IXpsk2" => noise_ix_psk2(),
|
||||
"NNpsk0+psk2" => noise_nn_psk0_psk2(),
|
||||
"NXpsk0+psk1+psk2" => noise_nx_psk0_psk1_psk2(),
|
||||
"XNpsk1+psk3" => noise_xn_psk1_psk3(),
|
||||
"XKpsk0+psk3" => noise_xk_psk0_psk3(),
|
||||
"KNpsk1+psk2" => noise_kn_psk1_psk2(),
|
||||
"KKpsk0+psk2" => noise_kk_psk0_psk2(),
|
||||
"INpsk1+psk2" => noise_in_psk1_psk2(),
|
||||
"IKpsk0+psk2" => noise_ik_psk0_psk2(),
|
||||
"IXpsk0+psk2" => noise_ix_psk0_psk2(),
|
||||
"XXpsk0+psk1" => noise_xx_psk0_psk1(),
|
||||
"XXpsk0+psk2" => noise_xx_psk0_psk2(),
|
||||
"XXpsk0+psk3" => noise_xx_psk0_psk3(),
|
||||
"XXpsk0+psk1+psk2+psk3" => noise_xx_psk0_psk1_psk2_psk3(),
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
fn run_noise_responder(
|
||||
t: &mut Activation,
|
||||
spec: ValidatedNoiseSpec,
|
||||
observer: Arc<Cap>,
|
||||
service: Arc<Cap>,
|
||||
) -> ActorResult {
|
||||
let hs = {
|
||||
let mut builder = noise_protocol::HandshakeStateBuilder::new();
|
||||
builder.set_pattern(spec.pattern);
|
||||
builder.set_is_initiator(false);
|
||||
let prologue = PackedWriter::encode(&mut NoEmbeddedDomainCodec, &spec.service)?;
|
||||
builder.set_prologue(&prologue);
|
||||
match spec.secret_key {
|
||||
None => (),
|
||||
Some(sk) => {
|
||||
let sk: [u8; 32] = sk.try_into().map_err(|_| "Bad secret key length")?;
|
||||
builder.set_s(U8Array::from_slice(&sk));
|
||||
},
|
||||
}
|
||||
let mut hs = builder.build_handshake_state();
|
||||
for psk in spec.psks.into_iter() {
|
||||
hs.push_psk(&psk);
|
||||
}
|
||||
hs
|
||||
};
|
||||
|
||||
let responder_session =
|
||||
Cap::guard(crate::Language::arc(), t.create(ResponderState::Introduction{ service, hs }));
|
||||
observer.assert(t, language(), &gatekeeper::Resolved::Accepted { responder_session });
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -0,0 +1,195 @@
|
|||
use std::convert::TryInto;
|
||||
use std::sync::Arc;
|
||||
use std::sync::atomic::AtomicU64;
|
||||
use std::sync::atomic::Ordering;
|
||||
|
||||
use hyper::{Request, Response, Body, StatusCode};
|
||||
use hyper::body;
|
||||
use hyper::header::HeaderName;
|
||||
use hyper::header::HeaderValue;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::error::Error;
|
||||
use syndicate::trace;
|
||||
use syndicate::value::Map;
|
||||
use syndicate::value::NestedValue;
|
||||
|
||||
use syndicate::schemas::http;
|
||||
|
||||
use tokio::sync::oneshot;
|
||||
use tokio::sync::mpsc::{UnboundedSender, unbounded_channel};
|
||||
use tokio_stream::wrappers::UnboundedReceiverStream;
|
||||
|
||||
use crate::language;
|
||||
|
||||
static NEXT_SEQ: AtomicU64 = AtomicU64::new(0);
|
||||
|
||||
pub fn empty_response(code: StatusCode) -> Response<Body> {
|
||||
let mut r = Response::new(Body::empty());
|
||||
*r.status_mut() = code;
|
||||
r
|
||||
}
|
||||
|
||||
type ChunkItem = Result<body::Bytes, Box<dyn std::error::Error + Send + Sync>>;
|
||||
|
||||
struct ResponseCollector {
|
||||
tx_res: Option<(oneshot::Sender<Response<Body>>, Response<Body>)>,
|
||||
body_tx: Option<UnboundedSender<ChunkItem>>,
|
||||
}
|
||||
|
||||
impl ResponseCollector {
|
||||
fn new(tx: oneshot::Sender<Response<Body>>) -> Self {
|
||||
let (body_tx, body_rx) = unbounded_channel();
|
||||
let body_stream: Box<dyn futures::Stream<Item = ChunkItem> + Send> =
|
||||
Box::new(UnboundedReceiverStream::new(body_rx));
|
||||
let mut res = Response::new(body_stream.into());
|
||||
*res.status_mut() = StatusCode::OK;
|
||||
ResponseCollector {
|
||||
tx_res: Some((tx, res)),
|
||||
body_tx: Some(body_tx),
|
||||
}
|
||||
}
|
||||
|
||||
fn with_res<F: FnOnce(&mut Response<Body>) -> ActorResult>(&mut self, f: F) -> ActorResult {
|
||||
if let Some((_, res)) = &mut self.tx_res {
|
||||
f(res)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn deliver_res(&mut self) {
|
||||
if let Some((tx, res)) = std::mem::replace(&mut self.tx_res, None) {
|
||||
let _ = tx.send(res);
|
||||
}
|
||||
}
|
||||
|
||||
fn add_chunk(&mut self, value: http::Chunk) -> ActorResult {
|
||||
self.deliver_res();
|
||||
|
||||
if let Some(body_tx) = self.body_tx.as_mut() {
|
||||
body_tx.send(Ok(match value {
|
||||
http::Chunk::Bytes(bs) => bs.into(),
|
||||
http::Chunk::String(s) => s.as_bytes().to_vec().into(),
|
||||
}))?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn finish(&mut self, t: &mut Activation) -> ActorResult {
|
||||
self.deliver_res();
|
||||
self.body_tx = None;
|
||||
t.stop();
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl Entity<http::HttpResponse> for ResponseCollector {
|
||||
fn message(&mut self, t: &mut Activation, message: http::HttpResponse) -> ActorResult {
|
||||
match message {
|
||||
http::HttpResponse::Status { code, .. } => self.with_res(|r| {
|
||||
*r.status_mut() = StatusCode::from_u16(
|
||||
(&code).try_into().map_err(|_| "bad status code")?)?;
|
||||
Ok(())
|
||||
}),
|
||||
http::HttpResponse::Header { name, value } => self.with_res(|r| {
|
||||
r.headers_mut().insert(HeaderName::from_bytes(name.as_bytes())?,
|
||||
HeaderValue::from_str(value.as_str())?);
|
||||
Ok(())
|
||||
}),
|
||||
http::HttpResponse::Chunk { chunk } => {
|
||||
self.add_chunk(*chunk)
|
||||
}
|
||||
http::HttpResponse::Done { chunk } => {
|
||||
self.add_chunk(*chunk)?;
|
||||
self.finish(t)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn serve(
|
||||
trace_collector: Option<trace::TraceCollector>,
|
||||
facet: FacetRef,
|
||||
httpd: Arc<Cap>,
|
||||
mut req: Request<Body>,
|
||||
port: u16,
|
||||
) -> Result<Response<Body>, Error> {
|
||||
let host = match req.headers().get("host").and_then(|v| v.to_str().ok()) {
|
||||
None => http::RequestHost::Absent,
|
||||
Some(h) => http::RequestHost::Present(match h.rsplit_once(':') {
|
||||
None => h.to_string(),
|
||||
Some((h, _port)) => h.to_string(),
|
||||
})
|
||||
};
|
||||
|
||||
let uri = req.uri();
|
||||
let mut path: Vec<String> = uri.path().split('/').map(|s| s.to_string()).collect();
|
||||
path.remove(0);
|
||||
|
||||
let mut query: Map<String, Vec<http::QueryValue>> = Map::new();
|
||||
for piece in uri.query().unwrap_or("").split('&').into_iter() {
|
||||
match piece.split_once('=') {
|
||||
Some((k, v)) => {
|
||||
let key = k.to_string();
|
||||
let value = v.to_string();
|
||||
match query.get_mut(&key) {
|
||||
None => { query.insert(key, vec![http::QueryValue::String(value)]); },
|
||||
Some(vs) => { vs.push(http::QueryValue::String(value)); },
|
||||
}
|
||||
}
|
||||
None => {
|
||||
if piece.len() > 0 {
|
||||
let key = piece.to_string();
|
||||
if !query.contains_key(&key) {
|
||||
query.insert(key, vec![]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let mut headers: Map<String, String> = Map::new();
|
||||
for h in req.headers().into_iter() {
|
||||
match h.1.to_str() {
|
||||
Ok(v) => { headers.insert(h.0.as_str().to_string().to_lowercase(), v.to_string()); },
|
||||
Err(_) => return Ok(empty_response(StatusCode::BAD_REQUEST)),
|
||||
}
|
||||
}
|
||||
|
||||
let body = match body::to_bytes(req.body_mut()).await {
|
||||
Ok(b) => http::RequestBody::Present(b.to_vec()),
|
||||
Err(_) => return Ok(empty_response(StatusCode::BAD_REQUEST)),
|
||||
};
|
||||
|
||||
let account = Account::new(Some(AnyValue::symbol("http")), trace_collector);
|
||||
|
||||
let (tx, rx) = oneshot::channel();
|
||||
|
||||
facet.activate(&account, Some(trace::TurnCause::external("http")), |t| {
|
||||
t.facet(move |t| {
|
||||
let sreq = http::HttpRequest {
|
||||
sequence_number: NEXT_SEQ.fetch_add(1, Ordering::Relaxed).into(),
|
||||
host,
|
||||
port: port.into(),
|
||||
method: req.method().to_string().to_lowercase(),
|
||||
path,
|
||||
headers: http::Headers(headers),
|
||||
query,
|
||||
body,
|
||||
};
|
||||
tracing::debug!(?sreq);
|
||||
let srep = Cap::guard(&language().syndicate, t.create(ResponseCollector::new(tx)));
|
||||
httpd.assert(t, language(), &http::HttpContext { req: sreq, res: srep });
|
||||
Ok(())
|
||||
})?;
|
||||
Ok(())
|
||||
});
|
||||
|
||||
let response_result = rx.await;
|
||||
|
||||
match response_result {
|
||||
Ok(response) => Ok(response),
|
||||
Err(_ /* sender dropped */) => Ok(empty_response(StatusCode::INTERNAL_SERVER_ERROR)),
|
||||
}
|
||||
}
|
|
@ -1,5 +1,7 @@
|
|||
use preserves_schema::Codec;
|
||||
|
||||
use std::convert::TryInto;
|
||||
use std::io;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
|
||||
|
@ -11,6 +13,7 @@ use syndicate::enclose;
|
|||
use syndicate::relay;
|
||||
use syndicate::schemas::service;
|
||||
use syndicate::schemas::transport_address;
|
||||
use syndicate::trace;
|
||||
|
||||
use syndicate::value::Map;
|
||||
use syndicate::value::NestedValue;
|
||||
|
@ -18,16 +21,22 @@ use syndicate::value::NestedValue;
|
|||
mod counter;
|
||||
mod dependencies;
|
||||
mod gatekeeper;
|
||||
mod http;
|
||||
mod language;
|
||||
mod lifecycle;
|
||||
mod protocol;
|
||||
mod script;
|
||||
mod services;
|
||||
|
||||
#[cfg(feature = "jemalloc")]
|
||||
#[global_allocator]
|
||||
static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
|
||||
|
||||
mod schemas {
|
||||
include!(concat!(env!("OUT_DIR"), "/src/schemas/mod.rs"));
|
||||
}
|
||||
|
||||
use language::Language;
|
||||
use language::language;
|
||||
use schemas::internal_services;
|
||||
|
||||
|
@ -50,10 +59,17 @@ struct ServerConfig {
|
|||
|
||||
#[structopt(long)]
|
||||
no_banner: bool,
|
||||
|
||||
#[structopt(short = "t", long)]
|
||||
trace_file: Option<PathBuf>,
|
||||
|
||||
/// Enable `$control` entity.
|
||||
#[structopt(long)]
|
||||
control: bool,
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
async fn main() -> ActorResult {
|
||||
let config = Arc::new(ServerConfig::from_args());
|
||||
|
||||
syndicate::convenient_logging()?;
|
||||
|
@ -74,7 +90,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
eprintln!(r"{} \____{}/{}_/ {} /____/\__, /_/ /_/\____/_/\___/\__/_/\__/\___/", GREEN, BRIGHT_GREEN, GREEN, NORMAL);
|
||||
eprintln!(r" /____/");
|
||||
eprintln!(r"");
|
||||
eprintln!(r" {}version {}{}", BRIGHT_YELLOW, env!("CARGO_PKG_VERSION"), NORMAL);
|
||||
eprintln!(r" {}version {} [syndicate {}]{}", BRIGHT_YELLOW, env!("CARGO_PKG_VERSION"), syndicate::syndicate_package_version(), NORMAL);
|
||||
eprintln!(r"");
|
||||
eprintln!(r" documentation & reference material: https://syndicate-lang.org/");
|
||||
eprintln!(r" source code & bugs: https://git.syndicate-lang.org/syndicate-lang/syndicate-rs");
|
||||
|
@ -83,13 +99,18 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
|
||||
tracing::trace!("startup");
|
||||
|
||||
Actor::new(None).boot(tracing::Span::current(), move |t| {
|
||||
let server_config_ds = Cap::new(&t.create(Dataspace::new(Some(syndicate::name!("config")))));
|
||||
let log_ds = Cap::new(&t.create(Dataspace::new(Some(syndicate::name!("log")))));
|
||||
let trace_collector = config.trace_file.clone().map(
|
||||
|p| Ok::<trace::TraceCollector, io::Error>(trace::TraceCollector::ascii(
|
||||
io::BufWriter::new(std::fs::File::create(p)?))))
|
||||
.transpose()?;
|
||||
|
||||
Actor::top(trace_collector, move |t| {
|
||||
let server_config_ds = Cap::new(&t.create(Dataspace::new(Some(AnyValue::symbol("config")))));
|
||||
let log_ds = Cap::new(&t.create(Dataspace::new(Some(AnyValue::symbol("log")))));
|
||||
|
||||
if config.inferior {
|
||||
tracing::info!("inferior server instance");
|
||||
t.spawn(syndicate::name!("parent"), enclose!((server_config_ds) move |t| {
|
||||
t.spawn(Some(AnyValue::symbol("parent")), enclose!((server_config_ds) move |t| {
|
||||
protocol::run_io_relay(t,
|
||||
relay::Input::Bytes(Box::pin(tokio::io::stdin())),
|
||||
relay::Output::Bytes(Box::pin(tokio::io::stdout())),
|
||||
|
@ -97,20 +118,36 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
}));
|
||||
}
|
||||
|
||||
let gatekeeper = Cap::guard(Arc::clone(&language().syndicate), t.create(
|
||||
let gatekeeper = Cap::guard(Language::arc(), t.create(
|
||||
syndicate::entity(Arc::clone(&server_config_ds))
|
||||
.on_asserted(gatekeeper::handle_resolve)));
|
||||
.on_asserted_facet(gatekeeper::facet_handle_resolve)));
|
||||
gatekeeper::handle_binds(t, &server_config_ds)?;
|
||||
|
||||
let mut env = Map::new();
|
||||
env.insert("config".to_owned(), AnyValue::domain(Arc::clone(&server_config_ds)));
|
||||
env.insert("log".to_owned(), AnyValue::domain(Arc::clone(&log_ds)));
|
||||
env.insert("gatekeeper".to_owned(), AnyValue::domain(Arc::clone(&gatekeeper)));
|
||||
|
||||
if config.control {
|
||||
env.insert("control".to_owned(), AnyValue::domain(Cap::guard(Language::arc(), t.create(
|
||||
syndicate::entity(())
|
||||
.on_message(|_, _t, m: crate::schemas::control::ExitServer| {
|
||||
tracing::info!("$control received exit request with code {}", m.code);
|
||||
std::process::exit((&m.code).try_into().unwrap_or_else(|_| {
|
||||
tracing::warn!(
|
||||
"exit code {} out-of-range of 32-bit signed integer, using 1 instead",
|
||||
m.code);
|
||||
1
|
||||
}))
|
||||
})))));
|
||||
}
|
||||
|
||||
dependencies::boot(t, Arc::clone(&server_config_ds));
|
||||
services::config_watcher::on_demand(t, Arc::clone(&server_config_ds));
|
||||
services::daemon::on_demand(t, Arc::clone(&server_config_ds), Arc::clone(&log_ds));
|
||||
services::debt_reporter::on_demand(t, Arc::clone(&server_config_ds));
|
||||
services::milestone::on_demand(t, Arc::clone(&server_config_ds));
|
||||
services::gatekeeper::on_demand(t, Arc::clone(&server_config_ds));
|
||||
services::http_router::on_demand(t, Arc::clone(&server_config_ds));
|
||||
services::tcp_relay_listener::on_demand(t, Arc::clone(&server_config_ds));
|
||||
services::unix_relay_listener::on_demand(t, Arc::clone(&server_config_ds));
|
||||
|
||||
|
@ -124,7 +161,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
|
||||
for port in config.ports.clone() {
|
||||
server_config_ds.assert(t, language(), &service::RunService {
|
||||
service_name: language().unparse(&internal_services::TcpRelayListener {
|
||||
service_name: language().unparse(&internal_services::TcpWithoutHttp {
|
||||
addr: transport_address::Tcp {
|
||||
host: "0.0.0.0".to_owned(),
|
||||
port: (port as i32).into(),
|
||||
|
@ -154,7 +191,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
});
|
||||
}
|
||||
|
||||
t.spawn(tracing::Span::current(), enclose!((log_ds) move |t| {
|
||||
t.spawn(Some(AnyValue::symbol("logger")), enclose!((log_ds) move |t| {
|
||||
let n_unknown: AnyValue = AnyValue::symbol("-");
|
||||
let n_pid: AnyValue = AnyValue::symbol("pid");
|
||||
let n_line: AnyValue = AnyValue::symbol("line");
|
||||
|
|
|
@ -1,26 +1,30 @@
|
|||
use futures::SinkExt;
|
||||
use futures::StreamExt;
|
||||
use hyper::header::HeaderValue;
|
||||
use hyper::service::service_fn;
|
||||
|
||||
use std::future::ready;
|
||||
use std::io;
|
||||
use std::sync::Arc;
|
||||
use std::sync::atomic::AtomicBool;
|
||||
use std::sync::atomic::Ordering;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::enclose;
|
||||
use syndicate::error::Error;
|
||||
use syndicate::error::error;
|
||||
use syndicate::relay;
|
||||
use syndicate::trace;
|
||||
use syndicate::value::NestedValue;
|
||||
|
||||
use tokio::net::TcpStream;
|
||||
|
||||
use tungstenite::Message;
|
||||
use hyper_tungstenite::tungstenite::Message;
|
||||
|
||||
struct ExitListener;
|
||||
|
||||
impl Entity<()> for ExitListener {
|
||||
fn exit_hook(&mut self, _t: &mut Activation, exit_status: &Arc<ActorResult>) -> ActorResult {
|
||||
fn exit_hook(&mut self, _t: &mut Activation, exit_status: &Arc<ExitStatus>) {
|
||||
tracing::info!(?exit_status, "disconnect");
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -31,52 +35,97 @@ pub fn run_io_relay(
|
|||
initial_ref: Arc<Cap>,
|
||||
) -> ActorResult {
|
||||
let exit_listener = t.create(ExitListener);
|
||||
t.state.add_exit_hook(&exit_listener);
|
||||
t.add_exit_hook(&exit_listener);
|
||||
relay::TunnelRelay::run(t, i, o, Some(initial_ref), None, false);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn run_connection(
|
||||
trace_collector: Option<trace::TraceCollector>,
|
||||
facet: FacetRef,
|
||||
i: relay::Input,
|
||||
o: relay::Output,
|
||||
initial_ref: Arc<Cap>,
|
||||
) -> ActorResult {
|
||||
facet.activate(Account::new(syndicate::name!("start-session")),
|
||||
|t| run_io_relay(t, i, o, initial_ref))
|
||||
) {
|
||||
let cause = trace_collector.as_ref().map(|_| trace::TurnCause::external("start-session"));
|
||||
let account = Account::new(Some(AnyValue::symbol("start-session")), trace_collector);
|
||||
facet.activate(&account, cause, |t| run_io_relay(t, i, o, initial_ref));
|
||||
}
|
||||
|
||||
pub async fn detect_protocol(
|
||||
trace_collector: Option<trace::TraceCollector>,
|
||||
facet: FacetRef,
|
||||
stream: TcpStream,
|
||||
gateway: Arc<Cap>,
|
||||
httpd: Option<Arc<Cap>>,
|
||||
addr: std::net::SocketAddr,
|
||||
server_port: u16,
|
||||
) -> ActorResult {
|
||||
let (i, o) = {
|
||||
let mut buf = [0; 1]; // peek at the first byte to see what kind of connection to expect
|
||||
match stream.peek(&mut buf).await? {
|
||||
1 => match buf[0] {
|
||||
b'G' /* ASCII 'G' for "GET" */ => {
|
||||
tracing::info!(protocol = %"websocket", peer = ?addr);
|
||||
let s = tokio_tungstenite::accept_async(stream).await
|
||||
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
|
||||
let (o, i) = s.split();
|
||||
let i = i.filter_map(|r| ready(extract_binary_packets(r).transpose()));
|
||||
let o = o.sink_map_err(message_error).with(|bs| ready(Ok(Message::Binary(bs))));
|
||||
(relay::Input::Packets(Box::pin(i)), relay::Output::Packets(Box::pin(o)))
|
||||
},
|
||||
_ => {
|
||||
tracing::info!(protocol = %"raw", peer = ?addr);
|
||||
let (i, o) = stream.into_split();
|
||||
(relay::Input::Bytes(Box::pin(i)),
|
||||
relay::Output::Bytes(Box::pin(o /* BufWriter::new(o) */)))
|
||||
}
|
||||
let mut buf = [0; 1]; // peek at the first byte to see what kind of connection to expect
|
||||
match stream.peek(&mut buf).await? {
|
||||
1 => match buf[0] {
|
||||
v if v == b'[' /* Turn */ || v == b'<' /* Error and Extension */ || v >= 128 => {
|
||||
tracing::info!(protocol = %(if v >= 128 { "application/syndicate" } else { "text/syndicate" }), peer = ?addr);
|
||||
let (i, o) = stream.into_split();
|
||||
let i = relay::Input::Bytes(Box::pin(i));
|
||||
let o = relay::Output::Bytes(Box::pin(o /* BufWriter::new(o) */));
|
||||
run_connection(trace_collector, facet, i, o, gateway);
|
||||
Ok(())
|
||||
}
|
||||
0 => Err(error("closed before starting", AnyValue::new(false)))?,
|
||||
_ => unreachable!()
|
||||
_ => {
|
||||
let upgraded = Arc::new(AtomicBool::new(false));
|
||||
let keepalive = facet.actor.keep_alive();
|
||||
let mut http = hyper::server::conn::Http::new();
|
||||
http.http1_keep_alive(true);
|
||||
http.http1_only(true);
|
||||
let service = service_fn(|mut req| enclose!(
|
||||
(upgraded, keepalive, trace_collector, facet, gateway, httpd) async move {
|
||||
if hyper_tungstenite::is_upgrade_request(&req) {
|
||||
tracing::info!(protocol = %"websocket",
|
||||
method=%req.method(),
|
||||
uri=?req.uri(),
|
||||
host=?req.headers().get("host").unwrap_or(&HeaderValue::from_static("")));
|
||||
let (response, websocket) = hyper_tungstenite::upgrade(&mut req, None)
|
||||
.map_err(|e| message_error(e))?;
|
||||
upgraded.store(true, Ordering::SeqCst);
|
||||
tokio::spawn(enclose!(() async move {
|
||||
let (o, i) = websocket.await?.split();
|
||||
let i = i.filter_map(|r| ready(extract_binary_packets(r).transpose()));
|
||||
let o = o.sink_map_err(message_error).with(|bs| ready(Ok(Message::Binary(bs))));
|
||||
let i = relay::Input::Packets(Box::pin(i));
|
||||
let o = relay::Output::Packets(Box::pin(o));
|
||||
run_connection(trace_collector, facet, i, o, gateway);
|
||||
drop(keepalive);
|
||||
Ok(()) as ActorResult
|
||||
}));
|
||||
Ok(response)
|
||||
} else {
|
||||
match httpd {
|
||||
None => Ok(crate::http::empty_response(
|
||||
hyper::StatusCode::SERVICE_UNAVAILABLE)),
|
||||
Some(httpd) => {
|
||||
tracing::info!(protocol = %"http",
|
||||
method=%req.method(),
|
||||
uri=?req.uri(),
|
||||
host=?req.headers().get("host").unwrap_or(&HeaderValue::from_static("")));
|
||||
crate::http::serve(trace_collector, facet, httpd, req, server_port).await
|
||||
}
|
||||
}
|
||||
}
|
||||
}));
|
||||
http.serve_connection(stream, service).with_upgrades().await?;
|
||||
if upgraded.load(Ordering::SeqCst) {
|
||||
tracing::debug!("serve_connection completed after upgrade to websocket");
|
||||
} else {
|
||||
tracing::debug!("serve_connection completed after regular HTTP session");
|
||||
facet.activate(&Account::new(None, None), None, |t| Ok(t.stop()));
|
||||
}
|
||||
Ok(())
|
||||
},
|
||||
}
|
||||
};
|
||||
run_connection(facet, i, o, gateway)
|
||||
0 => Err(error("closed before starting", AnyValue::new(false)))?,
|
||||
_ => unreachable!()
|
||||
}
|
||||
}
|
||||
|
||||
fn message_error<E: std::fmt::Display>(e: E) -> Error {
|
||||
|
@ -84,7 +133,7 @@ fn message_error<E: std::fmt::Display>(e: E) -> Error {
|
|||
}
|
||||
|
||||
fn extract_binary_packets(
|
||||
r: Result<Message, tungstenite::Error>,
|
||||
r: Result<Message, hyper_tungstenite::tungstenite::Error>,
|
||||
) -> Result<Option<Vec<u8>>, Error> {
|
||||
match r {
|
||||
Ok(m) => match m {
|
||||
|
@ -98,6 +147,8 @@ fn extract_binary_packets(
|
|||
Ok(None), // unsolicited pongs are to be ignored
|
||||
Message::Close(_) =>
|
||||
Ok(None), // we're about to see the end of the stream, so ignore this
|
||||
Message::Frame(_) =>
|
||||
Err("Raw frames are not accepted")?,
|
||||
},
|
||||
Err(e) => Err(message_error(e)),
|
||||
}
|
||||
|
|
|
@ -9,14 +9,16 @@ use syndicate::actor::*;
|
|||
use syndicate::dataspace::Dataspace;
|
||||
use syndicate::during;
|
||||
use syndicate::enclose;
|
||||
use syndicate::pattern::{lift_literal, drop_literal};
|
||||
use syndicate::pattern::{lift_literal, drop_literal, pattern_seq_from_dictionary};
|
||||
use syndicate::schemas::dataspace;
|
||||
use syndicate::schemas::dataspace_patterns as P;
|
||||
use syndicate::schemas::sturdy;
|
||||
use syndicate::value::Map;
|
||||
use syndicate::value::NestedValue;
|
||||
use syndicate::value::NoEmbeddedDomainCodec;
|
||||
use syndicate::value::Record;
|
||||
use syndicate::value::Set;
|
||||
use syndicate::value::TextWriter;
|
||||
use syndicate::value::Value;
|
||||
|
||||
use crate::language::language;
|
||||
|
@ -76,6 +78,12 @@ pub enum Instruction {
|
|||
pattern_template: AnyValue,
|
||||
expr: Expr,
|
||||
},
|
||||
Cond {
|
||||
value_var: String,
|
||||
pattern_template: AnyValue,
|
||||
on_match: Box<Instruction>,
|
||||
on_nomatch: Box<Instruction>,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
|
@ -86,11 +94,14 @@ pub enum Expr {
|
|||
Dataspace,
|
||||
Timestamp,
|
||||
Facet,
|
||||
Stringify {
|
||||
expr: Box<Expr>,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
enum RewriteTemplate {
|
||||
Filter {
|
||||
Accept {
|
||||
pattern_template: AnyValue,
|
||||
},
|
||||
Rewrite {
|
||||
|
@ -99,6 +110,16 @@ enum RewriteTemplate {
|
|||
},
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
enum CaveatTemplate {
|
||||
Alts {
|
||||
alternatives: Vec<RewriteTemplate>,
|
||||
},
|
||||
Reject {
|
||||
pattern_template: AnyValue,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
enum Symbolic {
|
||||
Reference(String),
|
||||
|
@ -152,7 +173,7 @@ fn bad_instruction(message: &str) -> io::Error {
|
|||
}
|
||||
|
||||
fn discard() -> P::Pattern {
|
||||
P::Pattern::DDiscard(Box::new(P::DDiscard))
|
||||
P::Pattern::Discard
|
||||
}
|
||||
|
||||
fn dlit(value: AnyValue) -> P::Pattern {
|
||||
|
@ -163,62 +184,83 @@ fn tlit(value: AnyValue) -> sturdy::Template {
|
|||
sturdy::Template::Lit(Box::new(sturdy::Lit { value }))
|
||||
}
|
||||
|
||||
fn parse_attenuation(r: &Record<AnyValue>) -> io::Result<Option<(String, Vec<RewriteTemplate>)>> {
|
||||
fn parse_rewrite(raw_base_name: &AnyValue, e: &AnyValue) -> io::Result<RewriteTemplate> {
|
||||
if let Some(fields) = e.value().as_simple_record("accept", Some(1)) {
|
||||
return Ok(RewriteTemplate::Accept {
|
||||
pattern_template: fields[0].clone(),
|
||||
});
|
||||
}
|
||||
|
||||
if let Some(fields) = e.value().as_simple_record("rewrite", Some(2)) {
|
||||
return Ok(RewriteTemplate::Rewrite {
|
||||
pattern_template: fields[0].clone(),
|
||||
template_template: fields[1].clone(),
|
||||
});
|
||||
}
|
||||
|
||||
Err(bad_instruction(&format!("Bad rewrite in attenuation of {:?}: {:?}", raw_base_name, e)))
|
||||
}
|
||||
|
||||
fn parse_caveat(raw_base_name: &AnyValue, e: &AnyValue) -> io::Result<CaveatTemplate> {
|
||||
if let Some(fields) = e.value().as_simple_record("or", Some(1)) {
|
||||
let raw_rewrites = match fields[0].value().as_sequence() {
|
||||
None => Err(bad_instruction(&format!(
|
||||
"Alternatives in <or> in attenuation of {:?} must have sequence of rewrites; got {:?}",
|
||||
raw_base_name,
|
||||
fields[0])))?,
|
||||
Some(vs) => vs,
|
||||
};
|
||||
let alternatives =
|
||||
raw_rewrites.iter().map(|r| parse_rewrite(raw_base_name, r)).collect::<Result<Vec<_>, _>>()?;
|
||||
return Ok(CaveatTemplate::Alts{ alternatives });
|
||||
}
|
||||
|
||||
if let Some(fields) = e.value().as_simple_record("reject", Some(1)) {
|
||||
return Ok(CaveatTemplate::Reject{ pattern_template: fields[0].clone() });
|
||||
}
|
||||
|
||||
if let Ok(r) = parse_rewrite(raw_base_name, e) {
|
||||
return Ok(CaveatTemplate::Alts { alternatives: vec![r] });
|
||||
}
|
||||
|
||||
Err(bad_instruction(&format!("Bad caveat in attenuation of {:?}: {:?}", raw_base_name, e)))
|
||||
}
|
||||
|
||||
fn parse_attenuation(r: &Record<AnyValue>) -> io::Result<Option<(String, Vec<CaveatTemplate>)>> {
|
||||
if r.label() != &AnyValue::symbol("*") {
|
||||
return Ok(None);
|
||||
}
|
||||
|
||||
if r.fields().len() != 2 {
|
||||
Err(bad_instruction(&format!(
|
||||
"Attenuation requires a reference and a sequence of rewrites; got {:?}",
|
||||
"Attenuation requires a reference and a sequence of caveats; got {:?}",
|
||||
r)))?;
|
||||
}
|
||||
|
||||
let base_name = match r.fields()[0].value().as_symbol().map(|s| analyze(&s)) {
|
||||
let raw_base_name = &r.fields()[0];
|
||||
let base_name = match raw_base_name.value().as_symbol().map(|s| analyze(&s)) {
|
||||
Some(Symbolic::Reference(s)) => s,
|
||||
_ => Err(bad_instruction(&format!(
|
||||
"Attenuation must have variable reference as first argument; got {:?}",
|
||||
r.fields()[0])))?,
|
||||
raw_base_name)))?,
|
||||
};
|
||||
|
||||
let raw_alternatives = match r.fields()[1].value().as_sequence() {
|
||||
let raw_caveats = match r.fields()[1].value().as_sequence() {
|
||||
None => Err(bad_instruction(&format!(
|
||||
"Attenuation of {:?} must have sequence of rewrites; got {:?}",
|
||||
r.fields()[0],
|
||||
"Attenuation of {:?} must have sequence of caveats; got {:?}",
|
||||
raw_base_name,
|
||||
r.fields()[1])))?,
|
||||
Some(vs) => vs,
|
||||
};
|
||||
|
||||
let mut alternatives = Vec::new();
|
||||
|
||||
for e in raw_alternatives.iter() {
|
||||
match e.value().as_simple_record("filter", Some(1)) {
|
||||
Some(fields) =>
|
||||
alternatives.push(RewriteTemplate::Filter {
|
||||
pattern_template: fields[0].clone()
|
||||
}),
|
||||
None => match e.value().as_simple_record("rewrite", Some(2)) {
|
||||
Some(fields) =>
|
||||
alternatives.push(RewriteTemplate::Rewrite {
|
||||
pattern_template: fields[0].clone(),
|
||||
template_template: fields[1].clone(),
|
||||
}),
|
||||
None => Err(bad_instruction(&format!(
|
||||
"Bad rewrite in attenuation of {:?}: {:?}",
|
||||
r.fields()[0],
|
||||
e)))?,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(Some((base_name, alternatives)))
|
||||
let caveats = raw_caveats.iter().map(|c| parse_caveat(raw_base_name, c)).collect::<Result<Vec<_>, _>>()?;
|
||||
Ok(Some((base_name, caveats)))
|
||||
}
|
||||
|
||||
impl<'env> PatternInstantiator<'env> {
|
||||
fn instantiate_pattern(&mut self, template: &AnyValue) -> io::Result<P::Pattern> {
|
||||
Ok(match template.value() {
|
||||
Value::Boolean(_) |
|
||||
Value::Float(_) |
|
||||
Value::Double(_) |
|
||||
Value::SignedInteger(_) |
|
||||
Value::String(_) |
|
||||
|
@ -230,7 +272,7 @@ impl<'env> PatternInstantiator<'env> {
|
|||
Symbolic::Discard => discard(),
|
||||
Symbolic::Binder(s) => {
|
||||
self.binding_names.push(s);
|
||||
P::Pattern::DBind(Box::new(P::DBind { pattern: discard() }))
|
||||
P::Pattern::Bind { pattern: Box::new(discard()) }
|
||||
}
|
||||
Symbolic::Reference(s) =>
|
||||
dlit(self.env.lookup(&s, "pattern-template variable")?.clone()),
|
||||
|
@ -239,49 +281,53 @@ impl<'env> PatternInstantiator<'env> {
|
|||
},
|
||||
|
||||
Value::Record(r) => match parse_attenuation(r)? {
|
||||
Some((base_name, alternatives)) =>
|
||||
dlit(self.env.eval_attenuation(base_name, alternatives)?),
|
||||
Some((base_name, caveats)) =>
|
||||
dlit(self.env.eval_attenuation(base_name, caveats)?),
|
||||
None => match self.maybe_binder_with_pattern(r)? {
|
||||
Some(pat) => pat,
|
||||
None => {
|
||||
let label = self.instantiate_pattern(r.label())?;
|
||||
let fields = r.fields().iter().map(|p| self.instantiate_pattern(p))
|
||||
.collect::<io::Result<Vec<P::Pattern>>>()?;
|
||||
P::Pattern::DCompound(Box::new(P::DCompound::Rec {
|
||||
label: drop_literal(&label)
|
||||
.ok_or(bad_instruction("Record pattern must have literal label"))?,
|
||||
fields,
|
||||
}))
|
||||
let entries = r.fields().iter().enumerate()
|
||||
.map(|(i, p)| Ok((AnyValue::new(i), self.instantiate_pattern(p)?)))
|
||||
.collect::<io::Result<Map<AnyValue, P::Pattern>>>()?;
|
||||
P::Pattern::Group {
|
||||
type_: Box::new(P::GroupType::Rec {
|
||||
label: drop_literal(&label)
|
||||
.ok_or(bad_instruction("Record pattern must have literal label"))?,
|
||||
}),
|
||||
entries,
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
Value::Sequence(v) =>
|
||||
P::Pattern::DCompound(Box::new(P::DCompound::Arr {
|
||||
items: v.iter()
|
||||
.map(|p| self.instantiate_pattern(p))
|
||||
.collect::<io::Result<Vec<P::Pattern>>>()?,
|
||||
})),
|
||||
P::Pattern::Group {
|
||||
type_: Box::new(P::GroupType::Arr),
|
||||
entries: v.iter().enumerate()
|
||||
.map(|(i, p)| Ok((AnyValue::new(i), self.instantiate_pattern(p)?)))
|
||||
.collect::<io::Result<Map<AnyValue, P::Pattern>>>()?,
|
||||
},
|
||||
Value::Set(_) =>
|
||||
Err(bad_instruction(&format!("Sets not permitted in patterns: {:?}", template)))?,
|
||||
Value::Dictionary(v) =>
|
||||
P::Pattern::DCompound(Box::new(P::DCompound::Dict {
|
||||
P::Pattern::Group {
|
||||
type_: Box::new(P::GroupType::Dict),
|
||||
entries: v.iter()
|
||||
.map(|(a, b)| Ok((a.clone(), self.instantiate_pattern(b)?)))
|
||||
.collect::<io::Result<Map<AnyValue, P::Pattern>>>()?,
|
||||
})),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
fn maybe_binder_with_pattern(&mut self, r: &Record<AnyValue>) -> io::Result<Option<P::Pattern>> {
|
||||
match r.label().value().as_symbol().map(|s| analyze(&s)) {
|
||||
Some(Symbolic::Binder(formal)) => if r.fields().len() == 1 {
|
||||
Some(Symbolic::Binder(formal)) if r.fields().len() == 1 => {
|
||||
let pattern = self.instantiate_pattern(&r.fields()[0])?;
|
||||
self.binding_names.push(formal);
|
||||
return Ok(Some(P::Pattern::DBind(Box::new(P::DBind { pattern }))));
|
||||
Ok(Some(P::Pattern::Bind { pattern: Box::new(pattern) }))
|
||||
},
|
||||
_ => (),
|
||||
_ => Ok(None),
|
||||
}
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -329,7 +375,6 @@ impl Env {
|
|||
fn instantiate_value(&self, template: &AnyValue) -> io::Result<AnyValue> {
|
||||
Ok(match template.value() {
|
||||
Value::Boolean(_) |
|
||||
Value::Float(_) |
|
||||
Value::Double(_) |
|
||||
Value::SignedInteger(_) |
|
||||
Value::String(_) |
|
||||
|
@ -348,8 +393,8 @@ impl Env {
|
|||
},
|
||||
|
||||
Value::Record(r) => match parse_attenuation(r)? {
|
||||
Some((base_name, alternatives)) =>
|
||||
self.eval_attenuation(base_name, alternatives)?,
|
||||
Some((base_name, caveats)) =>
|
||||
self.eval_attenuation(base_name, caveats)?,
|
||||
None =>
|
||||
Value::Record(Record(r.fields_vec().iter().map(|a| self.instantiate_value(a))
|
||||
.collect::<Result<Vec<_>, _>>()?)).wrap(),
|
||||
|
@ -387,7 +432,7 @@ impl Env {
|
|||
fn eval_attenuation(
|
||||
&self,
|
||||
base_name: String,
|
||||
alternatives: Vec<RewriteTemplate>,
|
||||
caveats: Vec<CaveatTemplate>,
|
||||
) -> io::Result<AnyValue> {
|
||||
let base_value = self.lookup(&base_name, "attenuation-base variable")?;
|
||||
match base_value.value().as_embedded() {
|
||||
|
@ -395,9 +440,7 @@ impl Env {
|
|||
"Value to be attenuated is {:?} but must be capability",
|
||||
base_value))),
|
||||
Some(base_cap) => {
|
||||
match base_cap.attenuate(&sturdy::Attenuation(vec![
|
||||
self.instantiate_caveat(&alternatives)?]))
|
||||
{
|
||||
match base_cap.attenuate(&caveats.iter().map(|c| self.instantiate_caveat(c)).collect::<Result<Vec<_>, _>>()?) {
|
||||
Ok(derived_cap) => Ok(AnyValue::domain(derived_cap)),
|
||||
Err(caveat_error) =>
|
||||
Err(bad_instruction(&format!("Attenuation of {:?} failed: {:?}",
|
||||
|
@ -477,6 +520,17 @@ impl Env {
|
|||
}
|
||||
}
|
||||
}
|
||||
Instruction::Cond { value_var, pattern_template, on_match, on_nomatch } => {
|
||||
let (binding_names, pattern) = self.instantiate_pattern(pattern_template)?;
|
||||
let value = self.lookup(value_var, "value in conditional expression")?;
|
||||
match pattern.match_value(&value) {
|
||||
None => self.eval(t, on_nomatch)?,
|
||||
Some(captures) => {
|
||||
self.extend(&binding_names, captures);
|
||||
self.eval(t, on_match)?
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
@ -487,38 +541,58 @@ impl Env {
|
|||
Expr::Dataspace => Ok(AnyValue::domain(Cap::new(&t.create(Dataspace::new(None))))),
|
||||
Expr::Timestamp => Ok(AnyValue::new(chrono::Utc::now().to_rfc3339())),
|
||||
Expr::Facet => Ok(AnyValue::domain(Cap::new(&t.create(FacetHandle::new())))),
|
||||
Expr::Stringify { expr } => {
|
||||
let v = self.eval_expr(t, expr)?;
|
||||
let s = TextWriter::encode(&mut NoEmbeddedDomainCodec, &v)?;
|
||||
Ok(AnyValue::new(s))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn instantiate_rewrite(
|
||||
&self,
|
||||
rw: &RewriteTemplate,
|
||||
) -> io::Result<sturdy::Rewrite> {
|
||||
match rw {
|
||||
RewriteTemplate::Accept { pattern_template } => {
|
||||
let (_binding_names, pattern) = self.instantiate_pattern(pattern_template)?;
|
||||
Ok(sturdy::Rewrite {
|
||||
pattern: embed_pattern(&P::Pattern::Bind { pattern: Box::new(pattern) }),
|
||||
template: sturdy::Template::TRef(Box::new(sturdy::TRef { binding: 0.into() })),
|
||||
})
|
||||
}
|
||||
RewriteTemplate::Rewrite { pattern_template, template_template } => {
|
||||
let (binding_names, pattern) = self.instantiate_pattern(pattern_template)?;
|
||||
Ok(sturdy::Rewrite {
|
||||
pattern: embed_pattern(&pattern),
|
||||
template: self.instantiate_template(&binding_names, template_template)?,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn instantiate_caveat(
|
||||
&self,
|
||||
alternatives: &Vec<RewriteTemplate>,
|
||||
c: &CaveatTemplate,
|
||||
) -> io::Result<sturdy::Caveat> {
|
||||
let mut rewrites = Vec::new();
|
||||
for rw in alternatives {
|
||||
match rw {
|
||||
RewriteTemplate::Filter { pattern_template } => {
|
||||
let (_binding_names, pattern) = self.instantiate_pattern(pattern_template)?;
|
||||
rewrites.push(sturdy::Rewrite {
|
||||
pattern: embed_pattern(&P::Pattern::DBind(Box::new(P::DBind { pattern }))),
|
||||
template: sturdy::Template::TRef(Box::new(sturdy::TRef { binding: 0.into() })),
|
||||
})
|
||||
}
|
||||
RewriteTemplate::Rewrite { pattern_template, template_template } => {
|
||||
let (binding_names, pattern) = self.instantiate_pattern(pattern_template)?;
|
||||
rewrites.push(sturdy::Rewrite {
|
||||
pattern: embed_pattern(&pattern),
|
||||
template: self.instantiate_template(&binding_names, template_template)?,
|
||||
})
|
||||
match c {
|
||||
CaveatTemplate::Alts { alternatives } => {
|
||||
let mut rewrites =
|
||||
alternatives.iter().map(|r| self.instantiate_rewrite(r)).collect::<Result<Vec<_>, _>>()?;
|
||||
if rewrites.len() == 1 {
|
||||
Ok(sturdy::Caveat::Rewrite(Box::new(rewrites.pop().unwrap())))
|
||||
} else {
|
||||
Ok(sturdy::Caveat::Alts(Box::new(sturdy::Alts {
|
||||
alternatives: rewrites,
|
||||
})))
|
||||
}
|
||||
}
|
||||
}
|
||||
if rewrites.len() == 1 {
|
||||
Ok(sturdy::Caveat::Rewrite(Box::new(rewrites.pop().unwrap())))
|
||||
} else {
|
||||
Ok(sturdy::Caveat::Alts(Box::new(sturdy::Alts {
|
||||
alternatives: rewrites,
|
||||
})))
|
||||
CaveatTemplate::Reject { pattern_template } => {
|
||||
Ok(sturdy::Caveat::Reject(Box::new(
|
||||
sturdy::Reject {
|
||||
pattern: embed_pattern(&self.instantiate_pattern(pattern_template)?.1),
|
||||
})))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -533,7 +607,6 @@ impl Env {
|
|||
|
||||
Ok(match template.value() {
|
||||
Value::Boolean(_) |
|
||||
Value::Float(_) |
|
||||
Value::Double(_) |
|
||||
Value::SignedInteger(_) |
|
||||
Value::String(_) |
|
||||
|
@ -557,18 +630,19 @@ impl Env {
|
|||
},
|
||||
|
||||
Value::Record(r) => match parse_attenuation(r)? {
|
||||
Some((base_name, alternatives)) =>
|
||||
Some((base_name, caveats)) =>
|
||||
match find_bound(&base_name) {
|
||||
Some(i) =>
|
||||
sturdy::Template::TAttenuate(Box::new(sturdy::TAttenuate {
|
||||
template: sturdy::Template::TRef(Box::new(sturdy::TRef {
|
||||
binding: i.into(),
|
||||
})),
|
||||
attenuation: sturdy::Attenuation(vec![
|
||||
self.instantiate_caveat(&alternatives)?]),
|
||||
attenuation: caveats.iter()
|
||||
.map(|c| self.instantiate_caveat(c))
|
||||
.collect::<Result<Vec<_>, _>>()?,
|
||||
})),
|
||||
None =>
|
||||
tlit(self.eval_attenuation(base_name, alternatives)?),
|
||||
tlit(self.eval_attenuation(base_name, caveats)?),
|
||||
},
|
||||
None => {
|
||||
// TODO: properly consolidate constant templates into literals.
|
||||
|
@ -604,24 +678,26 @@ impl Env {
|
|||
|
||||
fn embed_pattern(p: &P::Pattern) -> sturdy::Pattern {
|
||||
match p {
|
||||
P::Pattern::DDiscard(_) => sturdy::Pattern::PDiscard(Box::new(sturdy::PDiscard)),
|
||||
P::Pattern::DBind(b) => sturdy::Pattern::PBind(Box::new(sturdy::PBind {
|
||||
pattern: embed_pattern(&b.pattern),
|
||||
P::Pattern::Discard => sturdy::Pattern::PDiscard(Box::new(sturdy::PDiscard)),
|
||||
P::Pattern::Bind { pattern } => sturdy::Pattern::PBind(Box::new(sturdy::PBind {
|
||||
pattern: embed_pattern(&**pattern),
|
||||
})),
|
||||
P::Pattern::DLit(b) => sturdy::Pattern::Lit(Box::new(sturdy::Lit {
|
||||
value: language().unparse(&b.value),
|
||||
P::Pattern::Lit { value } => sturdy::Pattern::Lit(Box::new(sturdy::Lit {
|
||||
value: language().unparse(&**value),
|
||||
})),
|
||||
P::Pattern::DCompound(b) => sturdy::Pattern::PCompound(Box::new(match &**b {
|
||||
P::DCompound::Rec { label, fields } =>
|
||||
P::Pattern::Group { type_, entries } => sturdy::Pattern::PCompound(Box::new(match &**type_ {
|
||||
P::GroupType::Rec { label } =>
|
||||
sturdy::PCompound::Rec {
|
||||
label: label.clone(),
|
||||
fields: fields.iter().map(embed_pattern).collect(),
|
||||
fields: pattern_seq_from_dictionary(entries).expect("correct field entries")
|
||||
.into_iter().map(embed_pattern).collect(),
|
||||
},
|
||||
P::DCompound::Arr { items } =>
|
||||
P::GroupType::Arr =>
|
||||
sturdy::PCompound::Arr {
|
||||
items: items.iter().map(embed_pattern).collect(),
|
||||
items: pattern_seq_from_dictionary(entries).expect("correct element entries")
|
||||
.into_iter().map(embed_pattern).collect(),
|
||||
},
|
||||
P::DCompound::Dict { entries } =>
|
||||
P::GroupType::Dict =>
|
||||
sturdy::PCompound::Dict {
|
||||
entries: entries.iter().map(|(k, v)| (k.clone(), embed_pattern(v))).collect(),
|
||||
},
|
||||
|
@ -664,7 +740,7 @@ impl<'t> Parser<'t> {
|
|||
T::default()
|
||||
}
|
||||
|
||||
pub fn parse(&mut self, target: &str) -> Parsed<Instruction> {
|
||||
pub fn parse(&mut self, target: &str, outer_target: &str) -> Parsed<Instruction> {
|
||||
if self.ateof() {
|
||||
return Parsed::Eof;
|
||||
}
|
||||
|
@ -679,7 +755,7 @@ impl<'t> Parser<'t> {
|
|||
if let Some(tokens) = self.peek().as_sequence() {
|
||||
self.drop();
|
||||
let mut inner_parser = Parser::new(tokens);
|
||||
let instructions = inner_parser.parse_all(target);
|
||||
let instructions = inner_parser.parse_all(target, outer_target);
|
||||
self.errors.extend(inner_parser.errors);
|
||||
return Parsed::Value(Instruction::Sequence { instructions });
|
||||
}
|
||||
|
@ -694,7 +770,7 @@ impl<'t> Parser<'t> {
|
|||
Instruction::During { target, pattern_template, body } },
|
||||
"?" => |target, pattern_template, body| { // "??"
|
||||
Instruction::OnMessage { target, pattern_template, body } },
|
||||
"-" => match self.parse(target) { // "?-"
|
||||
"-" => match self.parse(target, outer_target) { // "?-"
|
||||
Parsed::Value(i) => return Parsed::Value(Instruction::OnStop {
|
||||
body: Box::new(i),
|
||||
}),
|
||||
|
@ -709,7 +785,7 @@ impl<'t> Parser<'t> {
|
|||
}
|
||||
let pattern_template = self.shift();
|
||||
|
||||
return match self.parse(target) {
|
||||
return match self.parse(target, outer_target) {
|
||||
Parsed::Eof =>
|
||||
self.error(format!(
|
||||
"Missing instruction in react with pattern {:?}",
|
||||
|
@ -733,7 +809,7 @@ impl<'t> Parser<'t> {
|
|||
let m = format!("Missing instruction after retarget: {:?}", self.peek());
|
||||
return self.error(m);
|
||||
}
|
||||
return self.parse(&s);
|
||||
return self.parse(&s, target);
|
||||
}
|
||||
Symbolic::Bare(s) => {
|
||||
if s == "let" {
|
||||
|
@ -774,26 +850,30 @@ impl<'t> Parser<'t> {
|
|||
}
|
||||
Symbolic::Literal(s) => {
|
||||
if s == "~" { // "=~"
|
||||
// s.drop();
|
||||
// if self.ateof() {
|
||||
// return self.error("Missing pattern, true-instruction and false-continuation in match");
|
||||
// }
|
||||
// let match_template = self.shift();
|
||||
// return match self.parse(target) {
|
||||
// Parsed::Eof =>
|
||||
// self.error(format!(
|
||||
// "Missing true-instruction in conditional with pattern {:?}",
|
||||
// match_template)),
|
||||
// Parsed::Skip =>
|
||||
// Parsed::Skip,
|
||||
// Parsed::Value(true_instruction) => {
|
||||
// let false_instructions = self.parse_all();
|
||||
// Parsed::Value(Instruction::Cond {
|
||||
// value: target.to_owned(),
|
||||
// pattern: match_template,
|
||||
// on_match: true_instruction,
|
||||
// on_nomatch: self.parse_all(
|
||||
// };
|
||||
self.drop();
|
||||
if self.ateof() {
|
||||
return self.error("Missing pattern, true-instruction and false-continuation in match");
|
||||
}
|
||||
let match_template = self.shift();
|
||||
return match self.parse(outer_target, outer_target) {
|
||||
Parsed::Eof =>
|
||||
self.error(format!(
|
||||
"Missing true-instruction in conditional with pattern {:?}",
|
||||
match_template)),
|
||||
Parsed::Skip =>
|
||||
Parsed::Skip,
|
||||
Parsed::Value(true_instruction) => {
|
||||
let false_instructions = self.parse_all(outer_target, outer_target);
|
||||
Parsed::Value(Instruction::Cond {
|
||||
value_var: target.to_owned(),
|
||||
pattern_template: match_template,
|
||||
on_match: Box::new(true_instruction),
|
||||
on_nomatch: Box::new(Instruction::Sequence {
|
||||
instructions: false_instructions,
|
||||
}),
|
||||
})
|
||||
}
|
||||
};
|
||||
} else {
|
||||
/* fall through */
|
||||
}
|
||||
|
@ -807,10 +887,10 @@ impl<'t> Parser<'t> {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn parse_all(&mut self, target: &str) -> Vec<Instruction> {
|
||||
pub fn parse_all(&mut self, target: &str, outer_target: &str) -> Vec<Instruction> {
|
||||
let mut instructions = Vec::new();
|
||||
loop {
|
||||
match self.parse(target) {
|
||||
match self.parse(target, outer_target) {
|
||||
Parsed::Value(i) => instructions.push(i),
|
||||
Parsed::Skip => (),
|
||||
Parsed::Eof => break,
|
||||
|
@ -820,7 +900,7 @@ impl<'t> Parser<'t> {
|
|||
}
|
||||
|
||||
pub fn parse_top(&mut self, target: &str) -> Result<Option<Instruction>, Vec<String>> {
|
||||
let instructions = self.parse_all(target);
|
||||
let instructions = self.parse_all(target, target);
|
||||
if self.errors.is_empty() {
|
||||
match instructions.len() {
|
||||
0 => Ok(None),
|
||||
|
@ -851,6 +931,11 @@ impl<'t> Parser<'t> {
|
|||
return Some(Expr::Facet);
|
||||
}
|
||||
|
||||
if self.peek() == &Value::symbol("stringify") {
|
||||
self.drop();
|
||||
return Some(Expr::Stringify { expr: Box::new(self.parse_expr()?) });
|
||||
}
|
||||
|
||||
return Some(Expr::Template{ template: self.shift() });
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,6 +3,8 @@ use notify::Watcher;
|
|||
use notify::RecursiveMode;
|
||||
use notify::watcher;
|
||||
|
||||
use syndicate::preserves::rec;
|
||||
|
||||
use std::fs;
|
||||
use std::future;
|
||||
use std::io;
|
||||
|
@ -16,6 +18,7 @@ use syndicate::actor::*;
|
|||
use syndicate::error::Error;
|
||||
use syndicate::enclose;
|
||||
use syndicate::supervise::{Supervisor, SupervisorConfiguration};
|
||||
use syndicate::trace;
|
||||
use syndicate::value::BinarySource;
|
||||
use syndicate::value::BytesBinarySource;
|
||||
use syndicate::value::Map;
|
||||
|
@ -32,11 +35,11 @@ use crate::script;
|
|||
use syndicate_macros::during;
|
||||
|
||||
pub fn on_demand(t: &mut Activation, config_ds: Arc<Cap>) {
|
||||
t.spawn(syndicate::name!("config_watcher"), move |t| {
|
||||
Ok(during!(t, config_ds, language(), <run-service $spec: internal_services::ConfigWatcher>, |t| {
|
||||
t.spawn(Some(AnyValue::symbol("config_watcher")), move |t| {
|
||||
Ok(during!(t, config_ds, language(), <run-service $spec: internal_services::ConfigWatcher::<AnyValue>>, |t| {
|
||||
Supervisor::start(
|
||||
t,
|
||||
syndicate::name!(parent: None, "config", path = ?spec.path),
|
||||
Some(rec![AnyValue::symbol("config"), AnyValue::new(spec.path.clone())]),
|
||||
SupervisorConfiguration::default(),
|
||||
enclose!((config_ds, spec) lifecycle::updater(config_ds, spec)),
|
||||
enclose!((config_ds) move |t| enclose!((config_ds, spec) run(t, config_ds, spec))))
|
||||
|
@ -142,13 +145,20 @@ fn initial_scan(
|
|||
scan_file(t, path_state, env);
|
||||
} else {
|
||||
match fs::read_dir(&env.path) {
|
||||
Ok(entries) => for er in entries {
|
||||
match er {
|
||||
Ok(e) =>
|
||||
initial_scan(t, path_state, config_ds, env.clone_with_path(e.path())),
|
||||
Err(e) =>
|
||||
tracing::warn!(
|
||||
"initial_scan: transient during scan of {:?}: {:?}", &env.path, e),
|
||||
Ok(unsorted_entries) => {
|
||||
let mut entries: Vec<fs::DirEntry> = Vec::new();
|
||||
for er in unsorted_entries {
|
||||
match er {
|
||||
Ok(e) =>
|
||||
entries.push(e),
|
||||
Err(e) =>
|
||||
tracing::warn!(
|
||||
"initial_scan: transient during scan of {:?}: {:?}", &env.path, e),
|
||||
}
|
||||
}
|
||||
entries.sort_by_key(|e| e.file_name());
|
||||
for e in entries {
|
||||
initial_scan(t, path_state, config_ds, env.clone_with_path(e.path()));
|
||||
}
|
||||
}
|
||||
Err(e) => tracing::warn!("initial_scan: enumerating {:?}: {:?}", &env.path, e),
|
||||
|
@ -174,7 +184,8 @@ fn run(
|
|||
let mut watcher = watcher(tx, Duration::from_millis(100)).map_err(convert_notify_error)?;
|
||||
watcher.watch(&env.path, RecursiveMode::Recursive).map_err(convert_notify_error)?;
|
||||
|
||||
let facet = t.facet.clone();
|
||||
let facet = t.facet_ref();
|
||||
let trace_collector = t.trace_collector();
|
||||
let span = tracing::Span::current();
|
||||
thread::spawn(move || {
|
||||
let _entry = span.enter();
|
||||
|
@ -182,16 +193,24 @@ fn run(
|
|||
let mut path_state: Map<PathBuf, FacetId> = Map::new();
|
||||
|
||||
{
|
||||
facet.activate(Account::new(syndicate::name!("initial_scan")), |t| {
|
||||
initial_scan(t, &mut path_state, &config_ds, env.clone());
|
||||
config_ds.assert(t, language(), &lifecycle::ready(&spec));
|
||||
Ok(())
|
||||
}).unwrap();
|
||||
tracing::trace!("initial_scan complete");
|
||||
let cause = trace_collector.as_ref().map(|_| trace::TurnCause::external("initial_scan"));
|
||||
let account = Account::new(Some(AnyValue::symbol("initial_scan")), trace_collector.clone());
|
||||
if !facet.activate(
|
||||
&account, cause, |t| {
|
||||
initial_scan(t, &mut path_state, &config_ds, env.clone());
|
||||
config_ds.assert(t, language(), &lifecycle::ready(&spec));
|
||||
Ok(())
|
||||
})
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
tracing::trace!("initial_scan complete");
|
||||
|
||||
let mut rescan = |paths: Vec<PathBuf>| {
|
||||
facet.activate(Account::new(syndicate::name!("rescan")), |t| {
|
||||
let cause = trace_collector.as_ref().map(|_| trace::TurnCause::external("rescan"));
|
||||
let account = Account::new(Some(AnyValue::symbol("rescan")), trace_collector.clone());
|
||||
facet.activate(&account, cause, |t| {
|
||||
let mut to_stop = Vec::new();
|
||||
for path in paths.into_iter() {
|
||||
let maybe_facet_id = path_state.remove(&path);
|
||||
|
@ -209,15 +228,15 @@ fn run(
|
|||
t.stop_facet(facet_id);
|
||||
}
|
||||
Ok(())
|
||||
}).unwrap()
|
||||
})
|
||||
};
|
||||
|
||||
while let Ok(event) = rx.recv() {
|
||||
tracing::trace!("notification: {:?}", &event);
|
||||
match event {
|
||||
let keep_running = match event {
|
||||
DebouncedEvent::NoticeWrite(_p) |
|
||||
DebouncedEvent::NoticeRemove(_p) =>
|
||||
(),
|
||||
true,
|
||||
DebouncedEvent::Create(p) |
|
||||
DebouncedEvent::Write(p) |
|
||||
DebouncedEvent::Chmod(p) |
|
||||
|
@ -225,20 +244,27 @@ fn run(
|
|||
rescan(vec![p]),
|
||||
DebouncedEvent::Rename(p, q) =>
|
||||
rescan(vec![p, q]),
|
||||
_ =>
|
||||
tracing::info!("{:?}", event),
|
||||
}
|
||||
_ => {
|
||||
tracing::info!("{:?}", event);
|
||||
true
|
||||
}
|
||||
};
|
||||
if !keep_running { break; }
|
||||
}
|
||||
|
||||
let _ = facet.activate(Account::new(syndicate::name!("termination")), |t| {
|
||||
tracing::trace!("linked thread terminating associated facet");
|
||||
Ok(t.stop())
|
||||
});
|
||||
{
|
||||
let cause = trace_collector.as_ref().map(|_| trace::TurnCause::external("termination"));
|
||||
let account = Account::new(Some(AnyValue::symbol("termination")), trace_collector);
|
||||
facet.activate(&account, cause, |t| {
|
||||
tracing::trace!("linked thread terminating associated facet");
|
||||
Ok(t.stop())
|
||||
});
|
||||
}
|
||||
|
||||
tracing::trace!("linked thread done");
|
||||
});
|
||||
|
||||
t.linked_task(syndicate::name!("cancel-wait"), async move {
|
||||
t.linked_task(Some(AnyValue::symbol("cancel-wait")), async move {
|
||||
future::pending::<()>().await;
|
||||
drop(watcher);
|
||||
Ok(LinkedTaskTermination::KeepFacet)
|
||||
|
|
|
@ -4,8 +4,10 @@ use std::sync::Arc;
|
|||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::enclose;
|
||||
use syndicate::preserves::rec;
|
||||
use syndicate::schemas::service;
|
||||
use syndicate::supervise::{Supervisor, SupervisorConfiguration};
|
||||
use syndicate::trace;
|
||||
use syndicate::value::NestedValue;
|
||||
|
||||
use tokio::io::AsyncRead;
|
||||
|
@ -21,8 +23,8 @@ use crate::schemas::external_services::*;
|
|||
use syndicate_macros::during;
|
||||
|
||||
pub fn on_demand(t: &mut Activation, config_ds: Arc<Cap>, root_ds: Arc<Cap>) {
|
||||
t.spawn(syndicate::name!("daemon"), move |t| {
|
||||
Ok(during!(t, config_ds, language(), <run-service $spec: DaemonService>,
|
||||
t.spawn(Some(AnyValue::symbol("daemon_listener")), move |t| {
|
||||
Ok(during!(t, config_ds, language(), <run-service $spec: DaemonService::<AnyValue>>,
|
||||
enclose!((config_ds, root_ds) move |t: &mut Activation| {
|
||||
supervise_daemon(t, config_ds, root_ds, spec)
|
||||
})))
|
||||
|
@ -39,14 +41,14 @@ fn supervise_daemon(
|
|||
lifecycle::on_service_restart(t, &config_ds, &spec, enclose!(
|
||||
(config_ds, root_ds, spec) move |t| {
|
||||
tracing::info!(id = ?spec.id, "Terminating to restart");
|
||||
t.stop_facet_and_continue(t.facet.facet_id, Some(
|
||||
t.stop_facet_and_continue(t.facet_id(), Some(
|
||||
enclose!((config_ds, root_ds, spec) move |t: &mut Activation| {
|
||||
supervise_daemon(t, config_ds, root_ds, spec)
|
||||
})))
|
||||
}));
|
||||
Supervisor::start(
|
||||
t,
|
||||
syndicate::name!(parent: None, "daemon", id = ?spec.id),
|
||||
Some(language().unparse(&spec)),
|
||||
SupervisorConfiguration::on_error_only(),
|
||||
enclose!((config_ds, spec) lifecycle::updater(config_ds, spec)),
|
||||
enclose!((config_ds, root_ds) move |t|
|
||||
|
@ -137,7 +139,7 @@ impl DaemonProcessSpec {
|
|||
},
|
||||
DaemonProcessSpec::OneShot { setup } => FullDaemonProcess {
|
||||
process: Process::Simple(setup).elaborate(),
|
||||
ready_on_start: ReadyOnStart::Absent,
|
||||
ready_on_start: ReadyOnStart::Present { ready_on_start: false },
|
||||
restart: RestartField::Present { restart: Box::new(RestartPolicy::OnError) },
|
||||
protocol: ProtocolField::Absent,
|
||||
},
|
||||
|
@ -162,7 +164,6 @@ struct DaemonInstance {
|
|||
config_ds: Arc<Cap>,
|
||||
log_ds: Arc<Cap>,
|
||||
service: AnyValue,
|
||||
name: tracing::Span,
|
||||
cmd: process::Command,
|
||||
announce_presumed_readiness: bool,
|
||||
unready_configs: Arc<Field<isize>>,
|
||||
|
@ -175,7 +176,7 @@ impl DaemonInstance {
|
|||
fn handle_exit(self, t: &mut Activation, error_message: Option<String>) -> ActorResult {
|
||||
let delay =
|
||||
std::time::Duration::from_millis(if let None = error_message { 200 } else { 1000 });
|
||||
t.stop_facet_and_continue(t.facet.facet_id, Some(move |t: &mut Activation| {
|
||||
t.stop_facet_and_continue(t.facet_id(), Some(move |t: &mut Activation| {
|
||||
#[derive(Debug)]
|
||||
enum NextStep {
|
||||
SleepAndRestart,
|
||||
|
@ -198,6 +199,7 @@ impl DaemonInstance {
|
|||
Err(s.as_str())?
|
||||
}
|
||||
},
|
||||
RestartPolicy::Never => SignalSuccessfulCompletion,
|
||||
};
|
||||
|
||||
match error_message {
|
||||
|
@ -211,7 +213,6 @@ impl DaemonInstance {
|
|||
t.facet(|t| {
|
||||
let _ = t.prevent_inert_check();
|
||||
counter::adjust(t, &self.completed_processes, 1);
|
||||
counter::adjust(t, &self.unready_configs, -1);
|
||||
Ok(())
|
||||
})?;
|
||||
()
|
||||
|
@ -224,43 +225,47 @@ impl DaemonInstance {
|
|||
fn log<R: 'static + Send + AsyncRead + Unpin>(
|
||||
&self,
|
||||
t: &mut Activation,
|
||||
facet: FacetRef,
|
||||
pid: Option<u32>,
|
||||
r: R,
|
||||
kind: &str
|
||||
) {
|
||||
let log_ds = self.log_ds.clone();
|
||||
let service = self.service.clone();
|
||||
let kind = AnyValue::symbol(kind);
|
||||
let pid = match pid {
|
||||
Some(n) => AnyValue::new(n),
|
||||
None => AnyValue::symbol("unknown"),
|
||||
};
|
||||
t.spawn(syndicate::name!(parent: self.name.clone(), "log"), move |t| {
|
||||
t.linked_task(tracing::Span::current(), async move {
|
||||
) -> ActorResult {
|
||||
t.facet(|t| {
|
||||
let facet = t.facet_ref();
|
||||
let log_ds = self.log_ds.clone();
|
||||
let service = self.service.clone();
|
||||
let kind = AnyValue::symbol(kind);
|
||||
let pid = match pid {
|
||||
Some(n) => AnyValue::new(n),
|
||||
None => AnyValue::symbol("unknown"),
|
||||
};
|
||||
let trace_collector = t.trace_collector();
|
||||
t.linked_task(None, async move {
|
||||
let mut r = BufReader::new(r);
|
||||
let cause = trace_collector.as_ref().map(
|
||||
|_| trace::TurnCause::external(kind.value().as_symbol().unwrap()));
|
||||
let account = Account::new(None, trace_collector);
|
||||
loop {
|
||||
let mut buf = Vec::new();
|
||||
if r.read_until(b'\n', &mut buf).await? == 0 {
|
||||
return Ok(LinkedTaskTermination::Normal);
|
||||
match r.read_until(b'\n', &mut buf).await {
|
||||
Ok(0) | Err(_) => break,
|
||||
Ok(_) => (),
|
||||
}
|
||||
let buf = match std::str::from_utf8(&buf) {
|
||||
Ok(s) => AnyValue::new(s),
|
||||
Err(_) => AnyValue::bytestring(buf),
|
||||
};
|
||||
let now = AnyValue::new(chrono::Utc::now().to_rfc3339());
|
||||
if facet.activate(
|
||||
Account::new(tracing::Span::current()),
|
||||
enclose!((pid, service, kind) |t| {
|
||||
if !facet.activate(
|
||||
&account, cause.clone(), enclose!((pid, service, kind) |t| {
|
||||
log_ds.message(t, &(), &syndicate_macros::template!(
|
||||
"<log =now {
|
||||
pid: =pid,
|
||||
service: =service,
|
||||
stream: =kind,
|
||||
line: =buf,
|
||||
}>"));
|
||||
pid: =pid,
|
||||
service: =service,
|
||||
stream: =kind,
|
||||
line: =buf,
|
||||
}>"));
|
||||
Ok(())
|
||||
})).is_err()
|
||||
}))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
@ -268,7 +273,8 @@ impl DaemonInstance {
|
|||
Ok(LinkedTaskTermination::Normal)
|
||||
});
|
||||
Ok(())
|
||||
});
|
||||
})?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn start(mut self, t: &mut Activation) -> ActorResult {
|
||||
|
@ -284,10 +290,10 @@ impl DaemonInstance {
|
|||
let pid = child.id();
|
||||
tracing::debug!(?pid, cmd = ?self.cmd, "started");
|
||||
|
||||
let facet = t.facet.clone();
|
||||
let facet = t.facet_ref();
|
||||
|
||||
if let Some(r) = child.stderr.take() {
|
||||
self.log(t, facet.clone(), pid, r, "stderr");
|
||||
self.log(t, pid, r, "stderr")?;
|
||||
}
|
||||
|
||||
match self.protocol {
|
||||
|
@ -295,7 +301,7 @@ impl DaemonInstance {
|
|||
Protocol::BinarySyndicate => self.relay_facet(t, &mut child, false)?,
|
||||
Protocol::None => {
|
||||
if let Some(r) = child.stdout.take() {
|
||||
self.log(t, facet.clone(), pid, r, "stdout");
|
||||
self.log(t, pid, r, "stdout")?;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -304,16 +310,20 @@ impl DaemonInstance {
|
|||
counter::adjust(t, &self.unready_configs, -1);
|
||||
}
|
||||
|
||||
let trace_collector = t.trace_collector();
|
||||
t.linked_task(
|
||||
syndicate::name!(parent: self.name.clone(), "wait"),
|
||||
Some(rec![AnyValue::symbol("wait"), self.service.clone()]),
|
||||
enclose!((facet) async move {
|
||||
tracing::trace!("waiting for process exit");
|
||||
let status = child.wait().await?;
|
||||
tracing::debug!(?status);
|
||||
facet.activate(Account::new(syndicate::name!("instance-terminated")), |t| {
|
||||
let cause = trace_collector.as_ref().map(
|
||||
|_| trace::TurnCause::external("instance-terminated"));
|
||||
let account = Account::new(Some(AnyValue::symbol("instance-terminated")), trace_collector);
|
||||
facet.activate(&account, cause, |t| {
|
||||
let m = if status.success() { None } else { Some(format!("{}", status)) };
|
||||
self.handle_exit(t, m)
|
||||
})?;
|
||||
});
|
||||
Ok(LinkedTaskTermination::Normal)
|
||||
}));
|
||||
Ok(())
|
||||
|
@ -378,9 +388,10 @@ fn run(
|
|||
Ok(())
|
||||
}))?;
|
||||
|
||||
let trace_collector = t.trace_collector();
|
||||
enclose!((config_ds, unready_configs, completed_processes)
|
||||
during!(t, config_ds.clone(), language(), <daemon #(&service.id) $config>, {
|
||||
enclose!((spec, config_ds, root_ds, unready_configs, completed_processes)
|
||||
enclose!((spec, config_ds, root_ds, unready_configs, completed_processes, trace_collector)
|
||||
|t: &mut Activation| {
|
||||
tracing::debug!(?config, "new config");
|
||||
counter::adjust(t, &unready_configs, 1);
|
||||
|
@ -390,8 +401,8 @@ fn run(
|
|||
Ok(config) => {
|
||||
tracing::info!(?config);
|
||||
let config = config.elaborate();
|
||||
let facet = t.facet.clone();
|
||||
t.linked_task(syndicate::name!("subprocess"), async move {
|
||||
let facet = t.facet_ref();
|
||||
t.linked_task(Some(AnyValue::symbol("subprocess")), async move {
|
||||
let mut cmd = config.process.build_command().ok_or("Cannot start daemon process")?;
|
||||
|
||||
let announce_presumed_readiness = match config.ready_on_start {
|
||||
|
@ -432,7 +443,6 @@ fn run(
|
|||
config_ds,
|
||||
log_ds: root_ds,
|
||||
service: spec,
|
||||
name: tracing::Span::current(),
|
||||
cmd,
|
||||
announce_presumed_readiness,
|
||||
unready_configs,
|
||||
|
@ -441,9 +451,12 @@ fn run(
|
|||
protocol,
|
||||
};
|
||||
|
||||
facet.activate(Account::new(syndicate::name!("instance-startup")), |t| {
|
||||
let cause = trace_collector.as_ref().map(
|
||||
|_| trace::TurnCause::external("instance-startup"));
|
||||
let account = Account::new(Some(AnyValue::symbol("instance-startup")), trace_collector);
|
||||
facet.activate(&account, cause, |t| {
|
||||
daemon_instance.start(t)
|
||||
})?;
|
||||
});
|
||||
Ok(LinkedTaskTermination::KeepFacet)
|
||||
});
|
||||
Ok(())
|
||||
|
|
|
@ -1,7 +1,12 @@
|
|||
use preserves_schema::Codec;
|
||||
|
||||
use std::sync::Arc;
|
||||
use std::sync::atomic::Ordering;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::enclose;
|
||||
use syndicate::preserves::rec;
|
||||
use syndicate::preserves::value::NestedValue;
|
||||
|
||||
use crate::language::language;
|
||||
use crate::lifecycle;
|
||||
|
@ -10,9 +15,10 @@ use crate::schemas::internal_services::DebtReporter;
|
|||
use syndicate_macros::during;
|
||||
|
||||
pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
|
||||
t.spawn(syndicate::name!("debt_reporter"), move |t| {
|
||||
t.spawn(Some(AnyValue::symbol("debt_reporter_listener")), move |t| {
|
||||
Ok(during!(t, ds, language(), <run-service $spec: DebtReporter>, |t: &mut Activation| {
|
||||
t.spawn_link(tracing::Span::current(), enclose!((ds) |t| run(t, ds, spec)));
|
||||
t.spawn_link(Some(rec![AnyValue::symbol("debt_reporter"), language().unparse(&spec)]),
|
||||
enclose!((ds) |t| run(t, ds, spec)));
|
||||
Ok(())
|
||||
}))
|
||||
});
|
||||
|
@ -22,10 +28,38 @@ fn run(t: &mut Activation, ds: Arc<Cap>, spec: DebtReporter) -> ActorResult {
|
|||
ds.assert(t, language(), &lifecycle::started(&spec));
|
||||
ds.assert(t, language(), &lifecycle::ready(&spec));
|
||||
t.every(core::time::Duration::from_millis((spec.interval_seconds.0 * 1000.0) as u64), |_t| {
|
||||
for (id, (name, debt)) in syndicate::actor::ACCOUNTS.read().iter() {
|
||||
let _enter = name.enter();
|
||||
tracing::info!(id, debt = ?debt.load(std::sync::atomic::Ordering::Relaxed));
|
||||
for (account_id, (name, debt)) in syndicate::actor::ACCOUNTS.read().iter() {
|
||||
tracing::info!(account_id, ?name, debt = ?debt.load(Ordering::Relaxed));
|
||||
}
|
||||
|
||||
// let snapshot = syndicate::actor::ACTORS.read().clone();
|
||||
// for (id, (name, ac_ref)) in snapshot.iter() {
|
||||
// if *id == _t.state.actor_id {
|
||||
// tracing::debug!("skipping report on the reporting actor, to avoid deadlock");
|
||||
// continue;
|
||||
// }
|
||||
// tracing::trace!(?id, "about to lock");
|
||||
// tracing::info_span!("actor", id, ?name).in_scope(|| match &*ac_ref.state.lock() {
|
||||
// ActorState::Terminated { exit_status } =>
|
||||
// tracing::info!(?exit_status, "terminated"),
|
||||
// ActorState::Running(state) => {
|
||||
// tracing::info!(field_count = ?state.fields.len(),
|
||||
// outbound_assertion_count = ?state.outbound_assertions.len(),
|
||||
// facet_count = ?state.facet_nodes.len());
|
||||
// tracing::info_span!("facets").in_scope(|| {
|
||||
// for (facet_id, f) in state.facet_nodes.iter() {
|
||||
// tracing::info!(
|
||||
// ?facet_id,
|
||||
// parent_id = ?f.parent_facet_id,
|
||||
// outbound_handle_count = ?f.outbound_handles.len(),
|
||||
// linked_task_count = ?f.linked_tasks.len(),
|
||||
// inert_check_preventers = ?f.inert_check_preventers.load(Ordering::Relaxed));
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
|
||||
Ok(())
|
||||
})
|
||||
}
|
||||
|
|
|
@ -0,0 +1,39 @@
|
|||
use preserves_schema::Codec;
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::enclose;
|
||||
use syndicate::preserves::rec;
|
||||
use syndicate::preserves::value::NestedValue;
|
||||
|
||||
use crate::gatekeeper;
|
||||
use crate::language::Language;
|
||||
use crate::language::language;
|
||||
use crate::lifecycle;
|
||||
use crate::schemas::internal_services::Gatekeeper;
|
||||
|
||||
use syndicate_macros::during;
|
||||
|
||||
pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
|
||||
t.spawn(Some(AnyValue::symbol("gatekeeper_listener")), move |t| {
|
||||
Ok(during!(t, ds, language(), <run-service $spec: Gatekeeper::<AnyValue>>, |t: &mut Activation| {
|
||||
t.spawn_link(Some(rec![AnyValue::symbol("gatekeeper"), language().unparse(&spec)]),
|
||||
enclose!((ds) |t| run(t, ds, spec)));
|
||||
Ok(())
|
||||
}))
|
||||
});
|
||||
}
|
||||
|
||||
fn run(t: &mut Activation, ds: Arc<Cap>, spec: Gatekeeper<AnyValue>) -> ActorResult {
|
||||
let resolver = t.create(syndicate::entity(Arc::clone(&spec.bindspace))
|
||||
.on_asserted_facet(gatekeeper::facet_handle_resolve));
|
||||
ds.assert(t, language(), &syndicate::schemas::service::ServiceObject {
|
||||
service_name: language().unparse(&spec),
|
||||
object: AnyValue::domain(Cap::guard(Language::arc(), resolver)),
|
||||
});
|
||||
gatekeeper::handle_binds(t, &spec.bindspace)?;
|
||||
ds.assert(t, language(), &lifecycle::started(&spec));
|
||||
ds.assert(t, language(), &lifecycle::ready(&spec));
|
||||
Ok(())
|
||||
}
|
|
@ -0,0 +1,348 @@
|
|||
use preserves_schema::Codec;
|
||||
|
||||
use std::convert::TryFrom;
|
||||
use std::io::Read;
|
||||
use std::sync::Arc;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::enclose;
|
||||
use syndicate::error::Error;
|
||||
use syndicate::preserves::rec;
|
||||
use syndicate::preserves::value::Map;
|
||||
use syndicate::preserves::value::NestedValue;
|
||||
use syndicate::schemas::http;
|
||||
use syndicate::value::signed_integer::SignedInteger;
|
||||
|
||||
use crate::language::language;
|
||||
use crate::lifecycle;
|
||||
use crate::schemas::internal_services::HttpRouter;
|
||||
use crate::schemas::internal_services::HttpStaticFileServer;
|
||||
|
||||
use syndicate_macros::during;
|
||||
|
||||
lazy_static::lazy_static! {
|
||||
pub static ref MIME_TABLE: Map<String, String> = load_mime_table("/etc/mime.types").unwrap_or_default();
|
||||
}
|
||||
|
||||
pub fn load_mime_table(path: &str) -> Result<Map<String, String>, std::io::Error> {
|
||||
let mut table = Map::new();
|
||||
let file = std::fs::read_to_string(path)?;
|
||||
for line in file.split('\n') {
|
||||
if line.starts_with('#') {
|
||||
continue;
|
||||
}
|
||||
let pieces = line.split(&[' ', '\t'][..]).collect::<Vec<&str>>();
|
||||
for i in 1..pieces.len() {
|
||||
table.insert(pieces[i].to_string(), pieces[0].to_string());
|
||||
}
|
||||
}
|
||||
Ok(table)
|
||||
}
|
||||
|
||||
pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
|
||||
t.spawn(Some(AnyValue::symbol("http_router_listener")), move |t| {
|
||||
enclose!((ds) during!(t, ds, language(), <run-service $spec: HttpRouter::<AnyValue>>, |t: &mut Activation| {
|
||||
t.spawn_link(Some(rec![AnyValue::symbol("http_router"), language().unparse(&spec)]),
|
||||
enclose!((ds) |t| run(t, ds, spec)));
|
||||
Ok(())
|
||||
}));
|
||||
enclose!((ds) during!(t, ds, language(), <run-service $spec: HttpStaticFileServer>, |t: &mut Activation| {
|
||||
t.spawn_link(Some(rec![AnyValue::symbol("http_static_file_server"), language().unparse(&spec)]),
|
||||
enclose!((ds) |t| run_static_file_server(t, ds, spec)));
|
||||
Ok(())
|
||||
}));
|
||||
Ok(())
|
||||
});
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
struct ActiveHandler {
|
||||
cap: Arc<Cap>,
|
||||
terminated: Arc<Field<bool>>,
|
||||
}
|
||||
type MethodTable = Map<http::MethodPattern, Vec<ActiveHandler>>;
|
||||
type HostTable = Map<http::HostPattern, Map<http::PathPattern, MethodTable>>;
|
||||
type RoutingTable = Map<SignedInteger, HostTable>;
|
||||
|
||||
fn request_host(value: &http::RequestHost) -> Option<String> {
|
||||
match value {
|
||||
http::RequestHost::Present(h) => Some(h.to_owned()),
|
||||
http::RequestHost::Absent => None,
|
||||
}
|
||||
}
|
||||
|
||||
fn run(t: &mut Activation, ds: Arc<Cap>, spec: HttpRouter) -> ActorResult {
|
||||
ds.assert(t, language(), &lifecycle::started(&spec));
|
||||
ds.assert(t, language(), &lifecycle::ready(&spec));
|
||||
let httpd = spec.httpd;
|
||||
|
||||
let routes: Arc<Field<RoutingTable>> = t.named_field("routes", Map::new());
|
||||
|
||||
enclose!((httpd, routes) during!(t, httpd, language(), <http-bind _ $port _ _ _>, |t: &mut Activation| {
|
||||
let port1 = port.clone();
|
||||
enclose!((httpd, routes) during!(t, httpd, language(), <http-listener #(&port1)>, enclose!((routes, port) |t: &mut Activation| {
|
||||
let port2 = port.clone();
|
||||
during!(t, httpd, language(), <http-bind $host #(&port2) $method $path $handler>, |t: &mut Activation| {
|
||||
tracing::debug!("+HTTP binding {:?} {:?} {:?} {:?} {:?}", host, port, method, path, handler);
|
||||
let port = port.value().to_signedinteger()?;
|
||||
let host = language().parse::<http::HostPattern>(&host)?;
|
||||
let path = language().parse::<http::PathPattern>(&path)?;
|
||||
let method = language().parse::<http::MethodPattern>(&method)?;
|
||||
let handler_cap = handler.value().to_embedded()?.clone();
|
||||
let handler_terminated = t.named_field("handler-terminated", false);
|
||||
t.get_mut(&routes)
|
||||
.entry(port.clone()).or_default()
|
||||
.entry(host.clone()).or_default()
|
||||
.entry(path.clone()).or_default()
|
||||
.entry(method.clone()).or_default()
|
||||
.push(ActiveHandler {
|
||||
cap: handler_cap.clone(),
|
||||
terminated: handler_terminated,
|
||||
});
|
||||
t.on_stop(enclose!((routes, method, path, host, port) move |t| {
|
||||
tracing::debug!("-HTTP binding {:?} {:?} {:?} {:?} {:?}", host, port, method, path, handler);
|
||||
let port_map = t.get_mut(&routes);
|
||||
let host_map = port_map.entry(port.clone()).or_default();
|
||||
let path_map = host_map.entry(host.clone()).or_default();
|
||||
let method_map = path_map.entry(path.clone()).or_default();
|
||||
let handler_vec = method_map.entry(method.clone()).or_default();
|
||||
let handler = {
|
||||
let i = handler_vec.iter().position(|a| a.cap == handler_cap)
|
||||
.expect("Expected an index of an active handler to remove");
|
||||
handler_vec.swap_remove(i)
|
||||
};
|
||||
if handler_vec.is_empty() {
|
||||
method_map.remove(&method);
|
||||
}
|
||||
if method_map.is_empty() {
|
||||
path_map.remove(&path);
|
||||
}
|
||||
if path_map.is_empty() {
|
||||
host_map.remove(&host);
|
||||
}
|
||||
if host_map.is_empty() {
|
||||
port_map.remove(&port);
|
||||
}
|
||||
*t.get_mut(&handler.terminated) = true;
|
||||
Ok(())
|
||||
}));
|
||||
Ok(())
|
||||
});
|
||||
Ok(())
|
||||
})));
|
||||
Ok(())
|
||||
}));
|
||||
|
||||
during!(t, httpd, language(), <request $req $res>, |t: &mut Activation| {
|
||||
let req = match language().parse::<http::HttpRequest>(&req) { Ok(v) => v, Err(_) => return Ok(()) };
|
||||
let res = match res.value().to_embedded() { Ok(v) => v, Err(_) => return Ok(()) };
|
||||
|
||||
tracing::trace!("Looking up handler for {:#?} in {:#?}", &req, &t.get(&routes));
|
||||
|
||||
let host_map = match t.get(&routes).get(&req.port) {
|
||||
Some(host_map) => host_map,
|
||||
None => return send_empty(t, res, 404, "Not found"),
|
||||
};
|
||||
|
||||
let methods = match request_host(&req.host).and_then(|h| try_hostname(host_map, http::HostPattern::Host(h), &req.path).transpose()).transpose()? {
|
||||
Some(methods) => methods,
|
||||
None => match try_hostname(host_map, http::HostPattern::Any, &req.path)? {
|
||||
Some(methods) => methods,
|
||||
None => return send_empty(t, res, 404, "Not found"),
|
||||
}
|
||||
};
|
||||
|
||||
let handlers = match methods.get(&http::MethodPattern::Specific(req.method.clone())) {
|
||||
Some(handlers) => handlers,
|
||||
None => match methods.get(&http::MethodPattern::Any) {
|
||||
Some(handlers) => handlers,
|
||||
None => {
|
||||
let allowed = methods.keys().map(|k| match k {
|
||||
http::MethodPattern::Specific(m) => m.to_uppercase(),
|
||||
http::MethodPattern::Any => unreachable!(),
|
||||
}).collect::<Vec<String>>().join(", ");
|
||||
res.message(t, language(), &http::HttpResponse::Status {
|
||||
code: 405.into(), message: "Method Not Allowed".into() });
|
||||
res.message(t, language(), &http::HttpResponse::Header {
|
||||
name: "allow".into(), value: allowed });
|
||||
return send_done(t, res);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
if handlers.len() > 1 {
|
||||
tracing::warn!(?req, "Too many handlers available");
|
||||
}
|
||||
let ActiveHandler { cap, terminated } = handlers.first().expect("Nonempty handler set").clone();
|
||||
tracing::trace!("Handler for {:?} is {:?}", &req, &cap);
|
||||
|
||||
t.dataflow(enclose!((terminated, req, res) move |t| {
|
||||
if *t.get(&terminated) {
|
||||
tracing::trace!("Handler for {:?} terminated", &req);
|
||||
send_empty(t, &res, 500, "Internal Server Error")?;
|
||||
}
|
||||
Ok(())
|
||||
}))?;
|
||||
|
||||
cap.assert(t, language(), &http::HttpContext { req, res: res.clone() });
|
||||
Ok(())
|
||||
});
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn send_done(t: &mut Activation, res: &Arc<Cap>) -> ActorResult {
|
||||
res.message(t, language(), &http::HttpResponse::Done {
|
||||
chunk: Box::new(http::Chunk::Bytes(vec![])) });
|
||||
Ok(())
|
||||
}
|
||||
fn send_empty(t: &mut Activation, res: &Arc<Cap>, code: u16, message: &str) -> ActorResult {
|
||||
res.message(t, language(), &http::HttpResponse::Status {
|
||||
code: code.into(), message: message.into() });
|
||||
send_done(t, res)
|
||||
}
|
||||
|
||||
fn path_pattern_matches(path_pat: &http::PathPattern, path: &Vec<String>) -> bool {
|
||||
let mut path_iter = path.iter();
|
||||
for pat_elem in path_pat.0.iter() {
|
||||
match pat_elem {
|
||||
http::PathPatternElement::Label(v) => match path_iter.next() {
|
||||
Some(path_elem) => {
|
||||
if v != path_elem {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
None => return false,
|
||||
},
|
||||
http::PathPatternElement::Wildcard => match path_iter.next() {
|
||||
Some(_) => (),
|
||||
None => return false,
|
||||
},
|
||||
http::PathPatternElement::Rest => return true,
|
||||
}
|
||||
}
|
||||
match path_iter.next() {
|
||||
Some(_more) => false,
|
||||
None => true,
|
||||
}
|
||||
}
|
||||
|
||||
fn try_hostname<'table>(
|
||||
host_map: &'table HostTable,
|
||||
host_pat: http::HostPattern,
|
||||
path: &Vec<String>,
|
||||
) -> Result<Option<&'table MethodTable>, Error> {
|
||||
match host_map.get(&host_pat) {
|
||||
None => Ok(None),
|
||||
Some(path_table) => {
|
||||
for (path_pat, method_table) in path_table.iter() {
|
||||
tracing::trace!("Checking path {:?} against pattern {:?}", &path, &path_pat);
|
||||
if path_pattern_matches(path_pat, path) {
|
||||
return Ok(Some(method_table));
|
||||
}
|
||||
}
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn render_dir(path: std::path::PathBuf) -> Result<(Vec<u8>, Option<&'static str>), Error> {
|
||||
let mut body = String::new();
|
||||
for entry in std::fs::read_dir(&path)? {
|
||||
if let Ok(entry) = entry {
|
||||
let is_dir = entry.metadata().map(|m| m.is_dir()).unwrap_or(false);
|
||||
let name = entry.file_name().to_string_lossy()
|
||||
.replace('&', "&")
|
||||
.replace('<', "<")
|
||||
.replace('>', ">")
|
||||
.replace('\'', "'")
|
||||
.replace('"', """) + (if is_dir { "/" } else { "" });
|
||||
body.push_str(&format!("<a href=\"{}\">{}</a><br>\n", name, name));
|
||||
}
|
||||
}
|
||||
Ok((body.into_bytes(), Some("text/html")))
|
||||
}
|
||||
|
||||
impl HttpStaticFileServer {
|
||||
fn respond(&mut self, t: &mut Activation, req: &http::HttpRequest, res: &Arc<Cap>) -> ActorResult {
|
||||
let path_prefix_elements = usize::try_from(&self.path_prefix_elements)
|
||||
.map_err(|_| "Bad pathPrefixElements")?;
|
||||
let mut is_index = false;
|
||||
|
||||
let mut path = req.path[path_prefix_elements..].iter().cloned().collect::<Vec<String>>();
|
||||
if let Some(e) = path.last_mut() {
|
||||
if e.len() == 0 {
|
||||
*e = "index.html".into();
|
||||
is_index = true;
|
||||
}
|
||||
}
|
||||
|
||||
let mut realpath = std::path::PathBuf::from(&self.dir);
|
||||
for element in path.into_iter() {
|
||||
if element.contains('/') || element.starts_with('.') { Err("Invalid path element")?; }
|
||||
realpath.push(element);
|
||||
}
|
||||
|
||||
let (body, mime_type) = match std::fs::File::open(&realpath) {
|
||||
Err(_) => {
|
||||
if is_index {
|
||||
realpath.pop();
|
||||
}
|
||||
if std::fs::metadata(&realpath).is_ok_and(|m| m.is_dir()) {
|
||||
render_dir(realpath)?
|
||||
} else {
|
||||
return send_empty(t, res, 404, "Not found")
|
||||
}
|
||||
},
|
||||
Ok(mut fh) => {
|
||||
if fh.metadata().is_ok_and(|m| m.is_dir()) {
|
||||
drop(fh);
|
||||
res.message(t, language(), &http::HttpResponse::Status {
|
||||
code: 301.into(), message: "Moved permanently".into() });
|
||||
res.message(t, language(), &http::HttpResponse::Header {
|
||||
name: "location".into(), value: format!("/{}/", req.path.join("/")) });
|
||||
return send_done(t, res);
|
||||
} else {
|
||||
let mut buf = Vec::new();
|
||||
fh.read_to_end(&mut buf)?;
|
||||
if let Some(extension) = realpath.extension().and_then(|e| e.to_str()) {
|
||||
(buf, MIME_TABLE.get(extension).map(|m| m.as_str()))
|
||||
} else {
|
||||
(buf, None)
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
res.message(t, language(), &http::HttpResponse::Status {
|
||||
code: 200.into(), message: "OK".into() });
|
||||
if let Some(mime_type) = mime_type {
|
||||
res.message(t, language(), &http::HttpResponse::Header {
|
||||
name: "content-type".into(), value: mime_type.to_owned() });
|
||||
}
|
||||
res.message(t, language(), &http::HttpResponse::Done {
|
||||
chunk: Box::new(http::Chunk::Bytes(body)) });
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl Entity<http::HttpContext<AnyValue>> for HttpStaticFileServer {
|
||||
fn assert(&mut self, t: &mut Activation, assertion: http::HttpContext<AnyValue>, _handle: Handle) -> ActorResult {
|
||||
let http::HttpContext { req, res } = assertion;
|
||||
if let Err(e) = self.respond(t, &req, &res) {
|
||||
tracing::error!(?req, error=?e);
|
||||
send_empty(t, &res, 500, "Internal server error")?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn run_static_file_server(t: &mut Activation, ds: Arc<Cap>, spec: HttpStaticFileServer) -> ActorResult {
|
||||
let object = Cap::guard(&language().syndicate, t.create(spec.clone()));
|
||||
ds.assert(t, language(), &syndicate::schemas::service::ServiceObject {
|
||||
service_name: language().unparse(&spec),
|
||||
object: AnyValue::domain(object),
|
||||
});
|
||||
Ok(())
|
||||
}
|
|
@ -1,37 +0,0 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::enclose;
|
||||
use syndicate::supervise::{Supervisor, SupervisorConfiguration};
|
||||
|
||||
use crate::language::language;
|
||||
use crate::lifecycle;
|
||||
use crate::schemas::internal_services::Milestone;
|
||||
|
||||
use syndicate_macros::during;
|
||||
|
||||
pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
|
||||
t.spawn(syndicate::name!("milestone"), move |t| {
|
||||
Ok(during!(t, ds, language(), <run-service $spec: Milestone>, |t: &mut Activation| {
|
||||
Supervisor::start(
|
||||
t,
|
||||
syndicate::name!(parent: None, "milestone", name = ?spec.name),
|
||||
SupervisorConfiguration::default(),
|
||||
|_, _| Ok(()),
|
||||
enclose!((ds) move |t| enclose!((ds, spec) run(t, ds, spec))))
|
||||
}))
|
||||
});
|
||||
}
|
||||
|
||||
fn run(
|
||||
t: &mut Activation,
|
||||
ds: Arc<Cap>,
|
||||
spec: Milestone,
|
||||
) -> ActorResult {
|
||||
lifecycle::terminate_on_service_restart(t, &ds, &spec);
|
||||
tracing::info!(milestone = ?spec.name, "entered");
|
||||
ds.assert(t, language(), &lifecycle::started(&spec));
|
||||
ds.assert(t, language(), &lifecycle::ready(&spec));
|
||||
t.on_stop(move |_| { tracing::info!(milestone = ?spec.name, "exited"); Ok(()) });
|
||||
Ok(())
|
||||
}
|
|
@ -1,6 +1,7 @@
|
|||
pub mod config_watcher;
|
||||
pub mod daemon;
|
||||
pub mod debt_reporter;
|
||||
pub mod milestone;
|
||||
pub mod gatekeeper;
|
||||
pub mod http_router;
|
||||
pub mod tcp_relay_listener;
|
||||
pub mod unix_relay_listener;
|
||||
|
|
|
@ -1,62 +1,119 @@
|
|||
use preserves_schema::Codec;
|
||||
|
||||
use std::convert::TryFrom;
|
||||
use std::sync::Arc;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::enclose;
|
||||
use syndicate::preserves::rec;
|
||||
use syndicate::preserves::value::NestedValue;
|
||||
use syndicate::supervise::{Supervisor, SupervisorConfiguration};
|
||||
use syndicate::trace;
|
||||
|
||||
use tokio::net::TcpListener;
|
||||
|
||||
use crate::language::language;
|
||||
use crate::lifecycle;
|
||||
use crate::protocol::detect_protocol;
|
||||
use crate::schemas::internal_services::TcpRelayListener;
|
||||
use crate::schemas::internal_services::TcpWithoutHttp;
|
||||
|
||||
use syndicate_macros::during;
|
||||
|
||||
pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
|
||||
t.spawn(syndicate::name!("tcp_relay_listener"), move |t| {
|
||||
Ok(during!(t, ds, language(), <run-service $spec: TcpRelayListener>, |t| {
|
||||
Supervisor::start(
|
||||
t,
|
||||
syndicate::name!(parent: None, "relay", addr = ?spec),
|
||||
SupervisorConfiguration::default(),
|
||||
enclose!((ds, spec) lifecycle::updater(ds, spec)),
|
||||
enclose!((ds) move |t| enclose!((ds, spec) run(t, ds, spec))))
|
||||
}))
|
||||
t.spawn(Some(AnyValue::symbol("tcp_relay_listener")), move |t| {
|
||||
enclose!((ds) during!(t, ds, language(), <run-service $spec: TcpWithoutHttp::<AnyValue>>, |t| {
|
||||
run_supervisor(t, ds.clone(), spec)
|
||||
}));
|
||||
Ok(())
|
||||
});
|
||||
}
|
||||
|
||||
fn run(t: &mut Activation, ds: Arc<Cap>, spec: TcpRelayListener) -> ActorResult {
|
||||
fn run_supervisor(t: &mut Activation, ds: Arc<Cap>, spec: TcpWithoutHttp) -> ActorResult {
|
||||
Supervisor::start(
|
||||
t,
|
||||
Some(rec![AnyValue::symbol("relay"), language().unparse(&spec)]),
|
||||
SupervisorConfiguration::default(),
|
||||
enclose!((ds, spec) lifecycle::updater(ds, spec)),
|
||||
enclose!((ds) move |t| enclose!((ds, spec) run(t, ds, spec))))
|
||||
}
|
||||
|
||||
fn run(t: &mut Activation, ds: Arc<Cap>, spec: TcpWithoutHttp) -> ActorResult {
|
||||
lifecycle::terminate_on_service_restart(t, &ds, &spec);
|
||||
let host = spec.addr.host.clone();
|
||||
let port = u16::try_from(&spec.addr.port).map_err(|_| "Invalid TCP port number")?;
|
||||
let parent_span = tracing::Span::current();
|
||||
let facet = t.facet.clone();
|
||||
t.linked_task(syndicate::name!("listener"), async move {
|
||||
|
||||
let httpd = t.named_field("httpd", None::<Arc<Cap>>);
|
||||
|
||||
{
|
||||
let ad = spec.addr.clone();
|
||||
let ad2 = ad.clone();
|
||||
let gk = spec.gatekeeper.clone();
|
||||
enclose!((ds, httpd) during!(t, ds, language(),
|
||||
<run-service <relay-listener #(&language().unparse(&ad)) #(&AnyValue::domain(gk)) $h>>, |t: &mut Activation| {
|
||||
if let Some(h) = h.value().as_embedded().cloned() {
|
||||
h.assert(t, language(), &syndicate::schemas::http::HttpListener { port: ad2.port.clone() });
|
||||
*t.get_mut(&httpd) = Some(h.clone());
|
||||
t.on_stop(enclose!((httpd) move |t| {
|
||||
let f = t.get_mut(&httpd);
|
||||
if *f == Some(h.clone()) { *f = None; }
|
||||
Ok(())
|
||||
}));
|
||||
}
|
||||
Ok(())
|
||||
}));
|
||||
}
|
||||
|
||||
let TcpWithoutHttp { addr, gatekeeper } = spec.clone();
|
||||
|
||||
let host = addr.host.clone();
|
||||
let port = u16::try_from(&addr.port).map_err(|_| "Invalid TCP port number")?;
|
||||
let facet = t.facet_ref();
|
||||
let trace_collector = t.trace_collector();
|
||||
t.linked_task(Some(AnyValue::symbol("listener")), async move {
|
||||
let listen_addr = format!("{}:{}", host, port);
|
||||
let listener = TcpListener::bind(listen_addr).await?;
|
||||
facet.activate(Account::new(syndicate::name!("readiness")), |t| {
|
||||
tracing::info!("listening");
|
||||
ds.assert(t, language(), &lifecycle::ready(&spec));
|
||||
Ok(())
|
||||
})?;
|
||||
|
||||
{
|
||||
let cause = trace_collector.as_ref().map(|_| trace::TurnCause::external("readiness"));
|
||||
let account = Account::new(Some(AnyValue::symbol("readiness")), trace_collector.clone());
|
||||
if !facet.activate(
|
||||
&account, cause, |t| {
|
||||
tracing::info!("listening");
|
||||
ds.assert(t, language(), &lifecycle::ready(&spec));
|
||||
Ok(())
|
||||
})
|
||||
{
|
||||
return Ok(LinkedTaskTermination::Normal);
|
||||
}
|
||||
}
|
||||
|
||||
loop {
|
||||
let (stream, addr) = listener.accept().await?;
|
||||
let gatekeeper = spec.gatekeeper.clone();
|
||||
let name = syndicate::name!(parent: parent_span.clone(), "conn");
|
||||
facet.activate(Account::new(name.clone()), move |t| {
|
||||
t.spawn(name, move |t| {
|
||||
Ok(t.linked_task(tracing::Span::current(), {
|
||||
let facet = t.facet.clone();
|
||||
async move {
|
||||
detect_protocol(facet, stream, gatekeeper, addr).await?;
|
||||
Ok(LinkedTaskTermination::KeepFacet)
|
||||
}
|
||||
}))
|
||||
});
|
||||
Ok(())
|
||||
})?;
|
||||
let gatekeeper = gatekeeper.clone();
|
||||
let name = Some(rec![AnyValue::symbol("tcp"), AnyValue::new(format!("{}", &addr))]);
|
||||
let cause = trace_collector.as_ref().map(|_| trace::TurnCause::external("connect"));
|
||||
let account = Account::new(name.clone(), trace_collector.clone());
|
||||
if !facet.activate(
|
||||
&account, cause, enclose!((trace_collector, httpd) move |t| {
|
||||
let httpd = t.get(&httpd).clone();
|
||||
t.spawn(name, move |t| {
|
||||
Ok(t.linked_task(None, {
|
||||
let facet = t.facet_ref();
|
||||
async move {
|
||||
detect_protocol(trace_collector,
|
||||
facet,
|
||||
stream,
|
||||
gatekeeper,
|
||||
httpd,
|
||||
addr,
|
||||
port).await?;
|
||||
Ok(LinkedTaskTermination::KeepFacet)
|
||||
}
|
||||
}))
|
||||
});
|
||||
Ok(())
|
||||
}))
|
||||
{
|
||||
return Ok(LinkedTaskTermination::Normal);
|
||||
}
|
||||
}
|
||||
});
|
||||
Ok(())
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
use preserves_schema::Codec;
|
||||
|
||||
use std::io;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
|
@ -5,8 +7,11 @@ use std::sync::Arc;
|
|||
use syndicate::actor::*;
|
||||
use syndicate::enclose;
|
||||
use syndicate::error::Error;
|
||||
use syndicate::preserves::rec;
|
||||
use syndicate::preserves::value::NestedValue;
|
||||
use syndicate::relay;
|
||||
use syndicate::supervise::{Supervisor, SupervisorConfiguration};
|
||||
use syndicate::trace;
|
||||
|
||||
use tokio::net::UnixListener;
|
||||
use tokio::net::UnixStream;
|
||||
|
@ -19,11 +24,11 @@ use crate::schemas::internal_services::UnixRelayListener;
|
|||
use syndicate_macros::during;
|
||||
|
||||
pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
|
||||
t.spawn(syndicate::name!("unix_relay_listener"), move |t| {
|
||||
Ok(during!(t, ds, language(), <run-service $spec: UnixRelayListener>, |t| {
|
||||
t.spawn(Some(AnyValue::symbol("unix_relay_listener")), move |t| {
|
||||
Ok(during!(t, ds, language(), <run-service $spec: UnixRelayListener::<AnyValue>>, |t| {
|
||||
Supervisor::start(
|
||||
t,
|
||||
syndicate::name!(parent: None, "relay", addr = ?spec),
|
||||
Some(rec![AnyValue::symbol("relay"), language().unparse(&spec)]),
|
||||
SupervisorConfiguration::default(),
|
||||
enclose!((ds, spec) lifecycle::updater(ds, spec)),
|
||||
enclose!((ds) move |t| enclose!((ds, spec) run(t, ds, spec))))
|
||||
|
@ -34,39 +39,56 @@ pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
|
|||
fn run(t: &mut Activation, ds: Arc<Cap>, spec: UnixRelayListener) -> ActorResult {
|
||||
lifecycle::terminate_on_service_restart(t, &ds, &spec);
|
||||
let path_str = spec.addr.path.clone();
|
||||
let parent_span = tracing::Span::current();
|
||||
let facet = t.facet.clone();
|
||||
t.linked_task(syndicate::name!("listener"), async move {
|
||||
let facet = t.facet_ref();
|
||||
let trace_collector = t.trace_collector();
|
||||
t.linked_task(Some(AnyValue::symbol("listener")), async move {
|
||||
let listener = bind_unix_listener(&PathBuf::from(path_str)).await?;
|
||||
facet.activate(Account::new(syndicate::name!("readiness")), |t| {
|
||||
tracing::info!("listening");
|
||||
ds.assert(t, language(), &lifecycle::ready(&spec));
|
||||
Ok(())
|
||||
})?;
|
||||
|
||||
{
|
||||
let cause = trace_collector.as_ref().map(|_| trace::TurnCause::external("readiness"));
|
||||
let account = Account::new(Some(AnyValue::symbol("readiness")), trace_collector.clone());
|
||||
if !facet.activate(
|
||||
&account, cause, |t| {
|
||||
tracing::info!("listening");
|
||||
ds.assert(t, language(), &lifecycle::ready(&spec));
|
||||
Ok(())
|
||||
})
|
||||
{
|
||||
return Ok(LinkedTaskTermination::Normal);
|
||||
}
|
||||
}
|
||||
|
||||
loop {
|
||||
let (stream, _addr) = listener.accept().await?;
|
||||
let peer = stream.peer_cred()?;
|
||||
let gatekeeper = spec.gatekeeper.clone();
|
||||
let name = syndicate::name!(parent: parent_span.clone(), "conn",
|
||||
pid = ?peer.pid().unwrap_or(-1),
|
||||
uid = peer.uid());
|
||||
facet.activate(Account::new(name.clone()), move |t| {
|
||||
t.spawn(name, |t| {
|
||||
Ok(t.linked_task(tracing::Span::current(), {
|
||||
let facet = t.facet.clone();
|
||||
async move {
|
||||
tracing::info!(protocol = %"unix");
|
||||
let (i, o) = stream.into_split();
|
||||
run_connection(facet,
|
||||
relay::Input::Bytes(Box::pin(i)),
|
||||
relay::Output::Bytes(Box::pin(o)),
|
||||
gatekeeper)?;
|
||||
Ok(LinkedTaskTermination::KeepFacet)
|
||||
}
|
||||
}))
|
||||
});
|
||||
Ok(())
|
||||
})?;
|
||||
let name = Some(rec![AnyValue::symbol("unix"),
|
||||
AnyValue::new(peer.pid().unwrap_or(-1)),
|
||||
AnyValue::new(peer.uid())]);
|
||||
let cause = trace_collector.as_ref().map(|_| trace::TurnCause::external("connect"));
|
||||
let account = Account::new(name.clone(), trace_collector.clone());
|
||||
if !facet.activate(
|
||||
&account, cause, enclose!((trace_collector) move |t| {
|
||||
t.spawn(name, |t| {
|
||||
Ok(t.linked_task(None, {
|
||||
let facet = t.facet_ref();
|
||||
async move {
|
||||
tracing::info!(protocol = %"unix");
|
||||
let (i, o) = stream.into_split();
|
||||
run_connection(trace_collector,
|
||||
facet,
|
||||
relay::Input::Bytes(Box::pin(i)),
|
||||
relay::Output::Bytes(Box::pin(o)),
|
||||
gatekeeper);
|
||||
Ok(LinkedTaskTermination::KeepFacet)
|
||||
}
|
||||
}))
|
||||
});
|
||||
Ok(())
|
||||
}))
|
||||
{
|
||||
return Ok(LinkedTaskTermination::Normal);
|
||||
}
|
||||
}
|
||||
});
|
||||
Ok(())
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
[package]
|
||||
name = "syndicate-tools"
|
||||
version = "0.18.0"
|
||||
authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"]
|
||||
edition = "2018"
|
||||
|
||||
description = "Syndicate command-line utilities."
|
||||
homepage = "https://syndicate-lang.org/"
|
||||
repository = "https://git.syndicate-lang.org/syndicate-lang/syndicate-rs"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
preserves = "4.995"
|
||||
syndicate = { path = "../syndicate", version = "0.40.0"}
|
||||
|
||||
clap = { version = "^4.0", features = ["derive"] }
|
||||
clap_complete = "^4.0"
|
||||
|
||||
noise-protocol = "0.1"
|
||||
noise-rust-crypto = "0.5"
|
||||
|
||||
[package.metadata.workspaces]
|
||||
independent = true
|
|
@ -0,0 +1,168 @@
|
|||
use std::io;
|
||||
use std::str::FromStr;
|
||||
|
||||
use clap::ArgGroup;
|
||||
use clap::CommandFactory;
|
||||
use clap::Parser;
|
||||
use clap::Subcommand;
|
||||
use clap::arg;
|
||||
use clap_complete::{generate, Shell};
|
||||
use noise_protocol::DH;
|
||||
use noise_protocol::Hash;
|
||||
use noise_rust_crypto::Blake2s;
|
||||
use noise_rust_crypto::X25519;
|
||||
use preserves::hex::HexParser;
|
||||
use preserves::value::BytesBinarySource;
|
||||
use preserves::value::NestedValue;
|
||||
use preserves::value::NoEmbeddedDomainCodec;
|
||||
use preserves::value::Reader;
|
||||
use preserves::value::TextReader;
|
||||
use preserves::value::ViaCodec;
|
||||
use preserves::value::TextWriter;
|
||||
use syndicate::language;
|
||||
use syndicate::preserves_schema::Codec;
|
||||
use syndicate::preserves_schema::ParseError;
|
||||
use syndicate::schemas::noise;
|
||||
use syndicate::sturdy::Caveat;
|
||||
use syndicate::sturdy::SturdyRef;
|
||||
use syndicate::sturdy::_Any;
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
struct Preserves<N: NestedValue>(N);
|
||||
|
||||
#[derive(Subcommand, Debug)]
|
||||
enum Action {
|
||||
#[command(group(ArgGroup::new("key").required(true)))]
|
||||
/// Generate a fresh SturdyRef from an OID value and a key
|
||||
Mint {
|
||||
#[arg(long, value_name="VALUE")]
|
||||
/// Preserves value to use as SturdyRef OID
|
||||
oid: Preserves<_Any>,
|
||||
|
||||
#[arg(long, group="key")]
|
||||
/// Key phrase
|
||||
phrase: Option<String>,
|
||||
|
||||
#[arg(long, group="key")]
|
||||
/// Key bytes, encoded as hex
|
||||
hex: Option<String>,
|
||||
|
||||
#[arg(long)]
|
||||
/// Caveats to add
|
||||
caveat: Vec<Preserves<_Any>>,
|
||||
},
|
||||
|
||||
#[command(group(ArgGroup::new("key").required(true)))]
|
||||
/// Generate a fresh NoiseServiceSpec from a service selector and a key
|
||||
Noise {
|
||||
#[arg(long, value_name="VALUE")]
|
||||
/// Preserves value to use as the service selector
|
||||
service: Preserves<_Any>,
|
||||
|
||||
#[arg(long, value_name="PROTOCOL")]
|
||||
/// Noise handshake protocol name
|
||||
protocol: Option<String>,
|
||||
|
||||
#[arg(long, group="key")]
|
||||
/// Key phrase
|
||||
phrase: Option<String>,
|
||||
|
||||
#[arg(long, group="key")]
|
||||
/// Key bytes, encoded as hex
|
||||
hex: Option<String>,
|
||||
|
||||
#[arg(long, group="key")]
|
||||
/// Generate a random key
|
||||
random: bool,
|
||||
},
|
||||
|
||||
/// Emit shell completion code
|
||||
Completions {
|
||||
/// Shell dialect to generate
|
||||
shell: Shell,
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(version)]
|
||||
struct Cli {
|
||||
#[command(subcommand)]
|
||||
action: Action,
|
||||
}
|
||||
|
||||
impl<N: NestedValue> FromStr for Preserves<N> {
|
||||
type Err = ParseError;
|
||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||
Ok(Preserves(TextReader::new(&mut BytesBinarySource::new(s.as_bytes()),
|
||||
ViaCodec::new(NoEmbeddedDomainCodec)).demand_next(false)?))
|
||||
}
|
||||
}
|
||||
|
||||
fn main() -> io::Result<()> {
|
||||
let args = <Cli as Parser>::parse();
|
||||
|
||||
match args.action {
|
||||
Action::Completions { shell } => {
|
||||
let mut cmd = <Cli as CommandFactory>::command();
|
||||
let name = cmd.get_name().to_string();
|
||||
generate(shell, &mut cmd, name, &mut io::stdout());
|
||||
}
|
||||
|
||||
Action::Noise { service, protocol, phrase, hex, random } => {
|
||||
let key =
|
||||
if random {
|
||||
X25519::genkey()
|
||||
} else if let Some(hex) = hex {
|
||||
let mut hash = Blake2s::default();
|
||||
hash.input(hex.as_bytes());
|
||||
hash.result()
|
||||
} else if let Some(phrase) = phrase {
|
||||
let mut hash = Blake2s::default();
|
||||
hash.input(phrase.as_bytes());
|
||||
hash.result()
|
||||
} else {
|
||||
unreachable!()
|
||||
};
|
||||
let n = noise::NoiseServiceSpec {
|
||||
base: noise::NoiseSpec {
|
||||
key: X25519::pubkey(&key).to_vec(),
|
||||
service: noise::ServiceSelector(service.0),
|
||||
pre_shared_keys: noise::NoisePreSharedKeys::Absent,
|
||||
protocol: if let Some(p) = protocol {
|
||||
noise::NoiseProtocol::Present { protocol: p }
|
||||
} else {
|
||||
noise::NoiseProtocol::Absent
|
||||
},
|
||||
},
|
||||
secret_key: noise::SecretKeyField::Present {
|
||||
secret_key: key.to_vec(),
|
||||
},
|
||||
};
|
||||
println!("{}", TextWriter::encode(&mut NoEmbeddedDomainCodec,
|
||||
&language().unparse(&n))?);
|
||||
}
|
||||
|
||||
Action::Mint { oid, phrase, hex, caveat: caveats } => {
|
||||
let key =
|
||||
if let Some(hex) = hex {
|
||||
HexParser::Liberal.decode(&hex).expect("hex encoded sturdyref")
|
||||
} else if let Some(phrase) = phrase {
|
||||
phrase.as_bytes().to_owned()
|
||||
} else {
|
||||
unreachable!()
|
||||
};
|
||||
let attenuation = caveats.into_iter().map(|c| {
|
||||
let r = language().parse(&c.0);
|
||||
if let Ok(Caveat::Unknown(_)) = &r {
|
||||
eprintln!("Warning: Unknown caveat format: {:?}", &c.0);
|
||||
}
|
||||
r
|
||||
}).collect::<Result<Vec<Caveat>, _>>()?;
|
||||
let m = SturdyRef::mint(oid.0, &key).attenuate(&attenuation)?;
|
||||
println!("{}", TextWriter::encode(&mut NoEmbeddedDomainCodec,
|
||||
&language().unparse(&m))?);
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "syndicate"
|
||||
version = "0.20.0"
|
||||
version = "0.40.0"
|
||||
authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"]
|
||||
edition = "2018"
|
||||
|
||||
|
@ -13,23 +13,23 @@ license = "Apache-2.0"
|
|||
vendored-openssl = ["openssl/vendored"]
|
||||
|
||||
[build-dependencies]
|
||||
preserves-schema = "^2"
|
||||
preserves-schema = "5.995"
|
||||
|
||||
[dependencies]
|
||||
preserves = "^2"
|
||||
preserves-schema = "^2"
|
||||
preserves = "4.995"
|
||||
preserves-schema = "5.995"
|
||||
|
||||
tokio = { version = "1.10", features = ["io-util", "macros", "rt", "rt-multi-thread", "time"] }
|
||||
tokio = { version = "1.10", features = ["io-std", "io-util", "macros", "rt", "rt-multi-thread", "time"] }
|
||||
tokio-util = "0.6"
|
||||
bytes = "1.0"
|
||||
|
||||
futures = "0.3"
|
||||
|
||||
blake2 = "0.10"
|
||||
getrandom = "0.2"
|
||||
hmac = "0.11"
|
||||
hmac = "0.12"
|
||||
lazy_static = "1.4"
|
||||
parking_lot = "0.11"
|
||||
sha2 = "0.9"
|
||||
|
||||
tracing = "0.1"
|
||||
tracing-subscriber = "0.2"
|
||||
|
@ -48,3 +48,6 @@ harness = false
|
|||
[[bench]]
|
||||
name = "ring"
|
||||
harness = false
|
||||
|
||||
[package.metadata.workspaces]
|
||||
independent = true
|
||||
|
|
|
@ -9,9 +9,9 @@ use syndicate::language;
|
|||
use syndicate::actor::*;
|
||||
use syndicate::during::entity;
|
||||
use syndicate::dataspace::Dataspace;
|
||||
use syndicate::enclose;
|
||||
use syndicate::schemas::dataspace::Observe;
|
||||
use syndicate::schemas::dataspace_patterns as p;
|
||||
use syndicate::value::Map;
|
||||
use syndicate::value::NestedValue;
|
||||
use syndicate::value::Value;
|
||||
|
||||
|
@ -52,24 +52,18 @@ pub fn bench_pub(c: &mut Criterion) {
|
|||
b.iter_custom(|iters| {
|
||||
let start = Instant::now();
|
||||
rt.block_on(async move {
|
||||
Actor::new(None).boot(syndicate::name!("dataspace"), move |t| {
|
||||
let ds = t.create(Dataspace::new());
|
||||
Actor::top(None, move |t| {
|
||||
let _ = t.prevent_inert_check();
|
||||
// The reason this works is that all the messages to `ds` will be delivered
|
||||
// before the message to `shutdown`, because `ds` and `shutdown` are in the
|
||||
// same Actor.
|
||||
let ds = t.create(Dataspace::new(None));
|
||||
let shutdown = t.create(ShutdownEntity);
|
||||
let account = Account::new(syndicate::name!("sender-account"));
|
||||
t.linked_task(syndicate::name!("sender"), async move {
|
||||
for _ in 0..iters {
|
||||
external_event(&ds.mailbox, &account, Box::new(
|
||||
enclose!((ds) move |t| t.with_entity(
|
||||
&ds,
|
||||
|t, e| e.message(t, says(AnyValue::new("bench_pub"),
|
||||
Value::ByteString(vec![]).wrap()))))))?
|
||||
}
|
||||
external_event(&shutdown.mailbox, &account, Box::new(
|
||||
enclose!((shutdown) move |t| t.with_entity(
|
||||
&shutdown,
|
||||
|t, e| e.message(t, AnyValue::new(true))))))?;
|
||||
Ok(LinkedTaskTermination::KeepFacet)
|
||||
});
|
||||
for _ in 0..iters {
|
||||
t.message(&ds, says(AnyValue::new("bench_pub"),
|
||||
Value::ByteString(vec![]).wrap()));
|
||||
}
|
||||
t.message(&shutdown, AnyValue::new(true));
|
||||
Ok(())
|
||||
}).await.unwrap().unwrap();
|
||||
});
|
||||
|
@ -83,27 +77,27 @@ pub fn bench_pub(c: &mut Criterion) {
|
|||
rt.block_on(async move {
|
||||
let turn_count = Arc::new(AtomicU64::new(0));
|
||||
|
||||
Actor::new(None).boot(syndicate::name!("dataspace"), {
|
||||
Actor::top(None, {
|
||||
let iters = iters.clone();
|
||||
let turn_count = Arc::clone(&turn_count);
|
||||
|
||||
move |t| {
|
||||
let ds = Cap::new(&t.create(Dataspace::new()));
|
||||
let ds = Cap::new(&t.create(Dataspace::new(None)));
|
||||
|
||||
let shutdown = entity(())
|
||||
.on_asserted(|_, _, _| Ok(Some(Box::new(|_, t| Ok(t.stop())))))
|
||||
.create_cap(t);
|
||||
|
||||
ds.assert(t, language(), &Observe {
|
||||
pattern: p::Pattern::DBind(Box::new(p::DBind {
|
||||
pattern: p::Pattern::DLit(Box::new(p::DLit {
|
||||
value: p::AnyAtom::Symbol("consumer".to_owned()),
|
||||
})),
|
||||
})),
|
||||
pattern: p::Pattern::Bind {
|
||||
pattern: Box::new(p::Pattern::Lit {
|
||||
value: Box::new(p::AnyAtom::Symbol("consumer".to_owned())),
|
||||
}),
|
||||
},
|
||||
observer: shutdown,
|
||||
});
|
||||
|
||||
t.spawn(syndicate::name!("consumer"), move |t| {
|
||||
t.spawn(Some(AnyValue::symbol("consumer")), move |t| {
|
||||
struct Receiver(Arc<AtomicU64>);
|
||||
impl Entity<AnyValue> for Receiver {
|
||||
fn message(&mut self, _t: &mut Activation, _m: AnyValue) -> ActorResult {
|
||||
|
@ -117,46 +111,39 @@ pub fn bench_pub(c: &mut Criterion) {
|
|||
|
||||
ds.assert(t, &(), &AnyValue::symbol("consumer"));
|
||||
ds.assert(t, language(), &Observe {
|
||||
pattern: p::Pattern::DCompound(Box::new(p::DCompound::Rec {
|
||||
label: AnyValue::symbol("Says"),
|
||||
fields: vec![
|
||||
p::Pattern::DLit(Box::new(p::DLit {
|
||||
value: p::AnyAtom::String("bench_pub".to_owned()),
|
||||
})),
|
||||
p::Pattern::DBind(Box::new(p::DBind {
|
||||
pattern: p::Pattern::DDiscard(Box::new(p::DDiscard)),
|
||||
})),
|
||||
]})),
|
||||
pattern: p::Pattern::Group {
|
||||
type_: Box::new(p::GroupType::Rec {
|
||||
label: AnyValue::symbol("Says"),
|
||||
}),
|
||||
entries: Map::from([
|
||||
(p::_Any::new(0), p::Pattern::Lit {
|
||||
value: Box::new(p::AnyAtom::String("bench_pub".to_owned())),
|
||||
}),
|
||||
(p::_Any::new(1), p::Pattern::Bind {
|
||||
pattern: Box::new(p::Pattern::Discard),
|
||||
}),
|
||||
]),
|
||||
},
|
||||
observer: receiver,
|
||||
});
|
||||
ds.assert(t, language(), &Observe {
|
||||
pattern: p::Pattern::DBind(Box::new(p::DBind {
|
||||
pattern: p::Pattern::DLit(Box::new(p::DLit {
|
||||
value: p::AnyAtom::Bool(true),
|
||||
})),
|
||||
})),
|
||||
pattern: p::Pattern::Bind {
|
||||
pattern: Box::new(p::Pattern::Lit {
|
||||
value: Box::new(p::AnyAtom::Bool(true)),
|
||||
}),
|
||||
},
|
||||
observer: shutdown,
|
||||
});
|
||||
|
||||
let account = Arc::clone(t.account());
|
||||
t.linked_task(syndicate::name!("sender"), async move {
|
||||
t.after(core::time::Duration::from_secs(0), move |t| {
|
||||
for _i in 0..iters {
|
||||
let ds = Arc::clone(&ds);
|
||||
external_event(&Arc::clone(&ds.underlying.mailbox), &account, Box::new(
|
||||
move |t| t.with_entity(
|
||||
&ds.underlying,
|
||||
|t, e| e.message(t, says(AnyValue::new("bench_pub"),
|
||||
Value::ByteString(vec![]).wrap())))))?
|
||||
ds.message(t, &(), &says(AnyValue::new("bench_pub"),
|
||||
Value::ByteString(vec![]).wrap()));
|
||||
}
|
||||
{
|
||||
let ds = Arc::clone(&ds);
|
||||
external_event(&Arc::clone(&ds.underlying.mailbox), &account, Box::new(
|
||||
move |t| t.with_entity(
|
||||
&ds.underlying,
|
||||
|t, e| e.message(t, AnyValue::new(true)))))?;
|
||||
}
|
||||
Ok(LinkedTaskTermination::KeepFacet)
|
||||
ds.message(t, &(), &AnyValue::new(true));
|
||||
Ok(())
|
||||
});
|
||||
|
||||
Ok(())
|
||||
});
|
||||
Ok(())
|
||||
|
|
|
@ -7,6 +7,8 @@ use std::time::Duration;
|
|||
use std::time::Instant;
|
||||
|
||||
use syndicate::actor::*;
|
||||
use syndicate::preserves::rec;
|
||||
use syndicate::value::NestedValue;
|
||||
|
||||
use tokio::runtime::Runtime;
|
||||
|
||||
|
@ -88,14 +90,16 @@ pub fn bench_ring(c: &mut Criterion) {
|
|||
self.i += 1;
|
||||
let spawner_ref = Arc::clone(&self.self_ref);
|
||||
ACTORS_CREATED.fetch_add(1, Ordering::Relaxed);
|
||||
t.spawn(syndicate::name!("forwarder", ?i), move |t| {
|
||||
let _ = t.prevent_inert_check();
|
||||
let f = t.create(Forwarder {
|
||||
next,
|
||||
t.spawn(
|
||||
Some(rec![AnyValue::symbol("forwarder"), AnyValue::new(i)]),
|
||||
move |t| {
|
||||
let _ = t.prevent_inert_check();
|
||||
let f = t.create(Forwarder {
|
||||
next,
|
||||
});
|
||||
t.message(&spawner_ref, f);
|
||||
Ok(())
|
||||
});
|
||||
t.message(&spawner_ref, f);
|
||||
Ok(())
|
||||
});
|
||||
} else {
|
||||
let mut c_state = Counter {
|
||||
start: Instant::now(),
|
||||
|
@ -118,7 +122,7 @@ pub fn bench_ring(c: &mut Criterion) {
|
|||
}
|
||||
|
||||
ACTORS_CREATED.fetch_add(1, Ordering::Relaxed);
|
||||
Actor::new(None).boot(syndicate::name!("counter"), move |t| {
|
||||
Actor::top(None, move |t| {
|
||||
let _ = t.prevent_inert_check();
|
||||
let mut s = Spawner {
|
||||
self_ref: t.create_inert(),
|
||||
|
|
|
@ -26,11 +26,11 @@ fn main() -> std::io::Result<()> {
|
|||
let mut gen_dir = buildroot.clone();
|
||||
gen_dir.push("src/schemas");
|
||||
|
||||
let mut c = CompilerConfig::new(gen_dir, "crate::schemas".to_owned());
|
||||
let mut c = CompilerConfig::new("crate::schemas".to_owned());
|
||||
c.plugins.push(Box::new(syndicate_plugins::PatternPlugin));
|
||||
c.add_external_module(ExternalModule::new(vec!["EntityRef".to_owned()], "crate::actor"));
|
||||
|
||||
let inputs = expand_inputs(&vec!["protocols/schema-bundle.bin".to_owned()])?;
|
||||
c.load_schemas_and_bundles(&inputs)?;
|
||||
compile(&c)
|
||||
c.load_schemas_and_bundles(&inputs, &vec![])?;
|
||||
compile(&c, &mut CodeCollector::files(gen_dir))
|
||||
}
|
||||
|
|
|
@ -1,17 +1,44 @@
|
|||
´³bundle·µ³tcp„´³schema·³version‘³definitions·³TcpLocal´³rec´³lit³ tcp-local„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³ TcpRemote´³rec´³lit³
|
||||
tcp-remote„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³TcpPeerInfo´³rec´³lit³tcp-peer„´³tupleµ´³named³handle´³embedded³any„„´³named³local´³refµ„³TcpLocal„„´³named³remote´³refµ„³ TcpRemote„„„„„„³embeddedType´³refµ³ EntityRef„³Cap„„„µ³timer„´³schema·³version‘³definitions·³SetTimer´³rec´³lit³ set-timer„´³tupleµ´³named³label³any„´³named³msecs´³atom³Double„„´³named³kind´³refµ„³ TimerKind„„„„„³ LaterThan´³rec´³lit³
|
||||
later-than„´³tupleµ´³named³msecs´³atom³Double„„„„„³ TimerKind´³orµµ±relative´³lit³relative„„µ±absolute´³lit³absolute„„µ±clear´³lit³clear„„„„³TimerExpired´³rec´³lit³
timer-expired„´³tupleµ´³named³label³any„´³named³msecs´³atom³Double„„„„„„³embeddedType€„„µ³stream„´³schema·³version‘³definitions·³Mode´³orµµ±bytes´³lit³bytes„„µ±lines´³refµ„³LineMode„„µ±packet´³rec´³lit³packet„´³tupleµ´³named³size´³atom³
SignedInteger„„„„„„µ±object´³rec´³lit³object„´³tupleµ´³named³description³any„„„„„„„³Sink´³orµµ±source´³rec´³lit³source„´³tupleµ´³named³
|
||||
´³bundle·µ³tcp„´³schema·³version°³definitions·³TcpLocal´³rec´³lit³ tcp-local„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³ TcpRemote´³rec´³lit³
|
||||
tcp-remote„´³tupleµ´³named³host´³atom³String„„´³named³port´³atom³
SignedInteger„„„„„³TcpPeerInfo´³rec´³lit³tcp-peer„´³tupleµ´³named³handle´³embedded³any„„´³named³local´³refµ„³TcpLocal„„´³named³remote´³refµ„³ TcpRemote„„„„„„³embeddedType´³refµ³ EntityRef„³Cap„„„µ³http„´³schema·³version°³definitions·³Chunk´³orµµ±string´³atom³String„„µ±bytes´³atom³
|
||||
ByteString„„„„³Headers´³dictof´³atom³Symbol„´³atom³String„„³MimeType´³atom³Symbol„³
|
||||
QueryValue´³orµµ±string´³atom³String„„µ±file´³rec´³lit³file„´³tupleµ´³named³filename´³atom³String„„´³named³headers´³refµ„³Headers„„´³named³body´³atom³
|
||||
ByteString„„„„„„„„³HostPattern´³orµµ±host´³atom³String„„µ±any´³lit€„„„„³HttpBinding´³rec´³lit³ http-bind„´³tupleµ´³named³host´³refµ„³HostPattern„„´³named³port´³atom³
SignedInteger„„´³named³method´³refµ„³
MethodPattern„„´³named³path´³refµ„³PathPattern„„´³named³handler´³embedded´³refµ„³HttpRequest„„„„„„³HttpContext´³rec´³lit³request„´³tupleµ´³named³req´³refµ„³HttpRequest„„´³named³res´³embedded´³refµ„³HttpResponse„„„„„„³HttpRequest´³rec´³lit³http-request„´³tupleµ´³named³sequenceNumber´³atom³
SignedInteger„„´³named³host´³refµ„³RequestHost„„´³named³port´³atom³
SignedInteger„„´³named³method´³atom³Symbol„„´³named³path´³seqof´³atom³String„„„´³named³headers´³refµ„³Headers„„´³named³query´³dictof´³atom³Symbol„´³seqof´³refµ„³
|
||||
QueryValue„„„„´³named³body´³refµ„³RequestBody„„„„„³HttpService´³rec´³lit³http-service„´³tupleµ´³named³host´³refµ„³HostPattern„„´³named³port´³atom³
SignedInteger„„´³named³method´³refµ„³
MethodPattern„„´³named³path´³refµ„³PathPattern„„„„„³PathPattern´³seqof´³refµ„³PathPatternElement„„³RequestBody´³orµµ±present´³atom³
|
||||
ByteString„„µ±absent´³lit€„„„„³RequestHost´³orµµ±present´³atom³String„„µ±absent´³lit€„„„„³HttpListener´³rec´³lit³
http-listener„´³tupleµ´³named³port´³atom³
SignedInteger„„„„„³HttpResponse´³orµµ±status´³rec´³lit³status„´³tupleµ´³named³code´³atom³
SignedInteger„„´³named³message´³atom³String„„„„„„µ±header´³rec´³lit³header„´³tupleµ´³named³name´³atom³Symbol„„´³named³value´³atom³String„„„„„„µ±chunk´³rec´³lit³chunk„´³tupleµ´³named³chunk´³refµ„³Chunk„„„„„„µ±done´³rec´³lit³done„´³tupleµ´³named³chunk´³refµ„³Chunk„„„„„„„„³
MethodPattern´³orµµ±any´³lit€„„µ±specific´³atom³Symbol„„„„³PathPatternElement´³orµµ±label´³atom³String„„µ±wildcard´³lit³_„„µ±rest´³lit³...„„„„„³embeddedType€„„µ³noise„´³schema·³version°³definitions·³Packet´³orµµ±complete´³atom³
|
||||
ByteString„„µ±
|
||||
fragmented´³seqof´³atom³
|
||||
ByteString„„„„„³ Initiator´³rec´³lit³ initiator„´³tupleµ´³named³initiatorSession´³embedded´³refµ„³Packet„„„„„„³ NoiseSpec´³andµ´³dict·³key´³named³key´³atom³
|
||||
ByteString„„³service´³named³service´³refµ„³ServiceSelector„„„„´³named³protocol´³refµ„³
NoiseProtocol„„´³named³
preSharedKeys´³refµ„³NoisePreSharedKeys„„„„³SessionItem´³orµµ± Initiator´³refµ„³ Initiator„„µ±Packet´³refµ„³Packet„„„„³
NoiseProtocol´³orµµ±present´³dict·³protocol´³named³protocol´³atom³String„„„„„µ±invalid´³dict·³protocol´³named³protocol³any„„„„µ±absent´³dict·„„„„„³
NoiseStepType´³lit³noise„³SecretKeyField´³orµµ±present´³dict·³ secretKey´³named³ secretKey´³atom³
|
||||
ByteString„„„„„µ±invalid´³dict·³ secretKey´³named³ secretKey³any„„„„µ±absent´³dict·„„„„„³DefaultProtocol´³lit±!Noise_NK_25519_ChaChaPoly_BLAKE2s„³NoiseStepDetail´³refµ„³ServiceSelector„³ServiceSelector³any³NoiseServiceSpec´³andµ´³named³base´³refµ„³ NoiseSpec„„´³named³ secretKey´³refµ„³SecretKeyField„„„„³NoisePreSharedKeys´³orµµ±present´³dict·³
preSharedKeys´³named³
preSharedKeys´³seqof´³atom³
|
||||
ByteString„„„„„„µ±invalid´³dict·³
preSharedKeys´³named³
preSharedKeys³any„„„„µ±absent´³dict·„„„„„³NoisePathStepDetail´³refµ„³ NoiseSpec„³NoiseDescriptionDetail´³refµ„³NoiseServiceSpec„„³embeddedType´³refµ³ EntityRef„³Cap„„„µ³timer„´³schema·³version°³definitions·³SetTimer´³rec´³lit³ set-timer„´³tupleµ´³named³label³any„´³named³seconds´³atom³Double„„´³named³kind´³refµ„³ TimerKind„„„„„³ LaterThan´³rec´³lit³
|
||||
later-than„´³tupleµ´³named³seconds´³atom³Double„„„„„³ TimerKind´³orµµ±relative´³lit³relative„„µ±absolute´³lit³absolute„„µ±clear´³lit³clear„„„„³TimerExpired´³rec´³lit³
timer-expired„´³tupleµ´³named³label³any„´³named³seconds´³atom³Double„„„„„„³embeddedType€„„µ³trace„´³schema·³version°³definitions·³Oid³any³Name´³orµµ± anonymous´³rec´³lit³ anonymous„´³tupleµ„„„„µ±named´³rec´³lit³named„´³tupleµ´³named³name³any„„„„„„„³Target´³rec´³lit³entity„´³tupleµ´³named³actor´³refµ„³ActorId„„´³named³facet´³refµ„³FacetId„„´³named³oid´³refµ„³Oid„„„„„³TaskId³any³TurnId³any³ActorId³any³FacetId³any³ TurnCause´³orµµ±turn´³rec´³lit³ caused-by„´³tupleµ´³named³id´³refµ„³TurnId„„„„„„µ±cleanup´³rec´³lit³cleanup„´³tupleµ„„„„µ±linkedTaskRelease´³rec´³lit³linked-task-release„´³tupleµ´³named³id´³refµ„³TaskId„„´³named³reason´³refµ„³LinkedTaskReleaseReason„„„„„„µ±periodicActivation´³rec´³lit³periodic-activation„´³tupleµ´³named³period´³atom³Double„„„„„„µ±delay´³rec´³lit³delay„´³tupleµ´³named³causingTurn´³refµ„³TurnId„„´³named³amount´³atom³Double„„„„„„µ±external´³rec´³lit³external„´³tupleµ´³named³description³any„„„„„„„³ TurnEvent´³orµµ±assert´³rec´³lit³assert„´³tupleµ´³named³ assertion´³refµ„³AssertionDescription„„´³named³handle´³refµ³protocol„³Handle„„„„„„µ±retract´³rec´³lit³retract„´³tupleµ´³named³handle´³refµ³protocol„³Handle„„„„„„µ±message´³rec´³lit³message„´³tupleµ´³named³body´³refµ„³AssertionDescription„„„„„„µ±sync´³rec´³lit³sync„´³tupleµ´³named³peer´³refµ„³Target„„„„„„µ± breakLink´³rec´³lit³
|
||||
break-link„´³tupleµ´³named³source´³refµ„³ActorId„„´³named³handle´³refµ³protocol„³Handle„„„„„„„„³
|
||||
ExitStatus´³orµµ±ok´³lit³ok„„µ±Error´³refµ³protocol„³Error„„„„³
|
||||
TraceEntry´³rec´³lit³trace„´³tupleµ´³named³ timestamp´³atom³Double„„´³named³actor´³refµ„³ActorId„„´³named³item´³refµ„³ActorActivation„„„„„³ActorActivation´³orµµ±start´³rec´³lit³start„´³tupleµ´³named³ actorName´³refµ„³Name„„„„„„µ±turn´³refµ„³TurnDescription„„µ±stop´³rec´³lit³stop„´³tupleµ´³named³status´³refµ„³
|
||||
ExitStatus„„„„„„„„³FacetStopReason´³orµµ±explicitAction´³lit³explicit-action„„µ±inert´³lit³inert„„µ±parentStopping´³lit³parent-stopping„„µ±
actorStopping´³lit³actor-stopping„„„„³TurnDescription´³rec´³lit³turn„´³tupleµ´³named³id´³refµ„³TurnId„„´³named³cause´³refµ„³ TurnCause„„´³named³actions´³seqof´³refµ„³ActionDescription„„„„„„³ActionDescription´³orµµ±dequeue´³rec´³lit³dequeue„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±enqueue´³rec´³lit³enqueue„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±dequeueInternal´³rec´³lit³dequeue-internal„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±enqueueInternal´³rec´³lit³enqueue-internal„´³tupleµ´³named³event´³refµ„³TargetedTurnEvent„„„„„„µ±spawn´³rec´³lit³spawn„´³tupleµ´³named³link´³atom³Boolean„„´³named³id´³refµ„³ActorId„„„„„„µ±link´³rec´³lit³link„´³tupleµ´³named³parentActor´³refµ„³ActorId„„´³named³
childToParent´³refµ³protocol„³Handle„„´³named³
|
||||
childActor´³refµ„³ActorId„„´³named³
parentToChild´³refµ³protocol„³Handle„„„„„„µ±
|
||||
facetStart´³rec´³lit³facet-start„´³tupleµ´³named³path´³seqof´³refµ„³FacetId„„„„„„„µ± facetStop´³rec´³lit³
|
||||
facet-stop„´³tupleµ´³named³path´³seqof´³refµ„³FacetId„„„´³named³reason´³refµ„³FacetStopReason„„„„„„µ±linkedTaskStart´³rec´³lit³linked-task-start„´³tupleµ´³named³taskName´³refµ„³Name„„´³named³id´³refµ„³TaskId„„„„„„„„³TargetedTurnEvent´³rec´³lit³event„´³tupleµ´³named³target´³refµ„³Target„„´³named³detail´³refµ„³ TurnEvent„„„„„³AssertionDescription´³orµµ±value´³rec´³lit³value„´³tupleµ´³named³value³any„„„„„µ±opaque´³rec´³lit³opaque„´³tupleµ´³named³description³any„„„„„„„³LinkedTaskReleaseReason´³orµµ± cancelled´³lit³ cancelled„„µ±normal´³lit³normal„„„„„³embeddedType´³refµ³ EntityRef„³Cap„„„µ³stdenv„´³schema·³version°³definitions·³
StandardRoute´³orµµ±standard´³tuplePrefixµ´³named³
|
||||
transports´³seqof´³refµ„³StandardTransport„„„´³named³key´³atom³
|
||||
ByteString„„´³named³service³any„´³named³sig´³atom³
|
||||
ByteString„„´³named³oid³any„„´³named³caveats´³seqof´³refµ³sturdy„³Caveat„„„„„µ±general´³refµ³
|
||||
gatekeeper„³Route„„„„³StandardTransport´³orµµ±wsUrl´³atom³String„„µ±other³any„„„„³embeddedType€„„µ³stream„´³schema·³version°³definitions·³Mode´³orµµ±bytes´³lit³bytes„„µ±lines´³refµ„³LineMode„„µ±packet´³rec´³lit³packet„´³tupleµ´³named³size´³atom³
SignedInteger„„„„„„µ±object´³rec´³lit³object„´³tupleµ´³named³description³any„„„„„„„³Sink´³orµµ±source´³rec´³lit³source„´³tupleµ´³named³
|
||||
controller´³embedded´³refµ„³Source„„„„„„„µ±StreamError´³refµ„³StreamError„„µ±data´³rec´³lit³data„´³tupleµ´³named³payload³any„´³named³mode´³refµ„³Mode„„„„„„µ±eof´³rec´³lit³eof„´³tupleµ„„„„„„³Source´³orµµ±sink´³rec´³lit³sink„´³tupleµ´³named³
|
||||
controller´³embedded´³refµ„³Sink„„„„„„„µ±StreamError´³refµ„³StreamError„„µ±credit´³rec´³lit³credit„´³tupleµ´³named³amount´³refµ„³CreditAmount„„´³named³mode´³refµ„³Mode„„„„„„„„³LineMode´³orµµ±lf´³lit³lf„„µ±crlf´³lit³crlf„„„„³StreamError´³rec´³lit³error„´³tupleµ´³named³message´³atom³String„„„„„³CreditAmount´³orµµ±count´³atom³
SignedInteger„„µ± unbounded´³lit³ unbounded„„„„³StreamConnection´³rec´³lit³stream-connection„´³tupleµ´³named³source´³embedded´³refµ„³Source„„„´³named³sink´³embedded´³refµ„³Sink„„„´³named³spec³any„„„„³StreamListenerError´³rec´³lit³stream-listener-error„´³tupleµ´³named³spec³any„´³named³message´³atom³String„„„„„³StreamListenerReady´³rec´³lit³stream-listener-ready„´³tupleµ´³named³spec³any„„„„„³embeddedType´³refµ³ EntityRef„³Cap„„„µ³sturdy„´³schema·³version‘³definitions·³Lit´³rec´³lit³lit„´³tupleµ´³named³value³any„„„„³Oid´³atom³
SignedInteger„³Alts´³rec´³lit³or„´³tupleµ´³named³alternatives´³seqof´³refµ„³Rewrite„„„„„„³PAnd´³rec´³lit³and„´³tupleµ´³named³patterns´³seqof´³refµ„³Pattern„„„„„„³PNot´³rec´³lit³not„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³TRef´³rec´³lit³ref„´³tupleµ´³named³binding´³atom³
SignedInteger„„„„„³PAtom´³orµµ±Boolean´³lit³Boolean„„µ±Float´³lit³Float„„µ±Double´³lit³Double„„µ±
SignedInteger´³lit³
SignedInteger„„µ±String´³lit³String„„µ±
|
||||
controller´³embedded´³refµ„³Sink„„„„„„„µ±StreamError´³refµ„³StreamError„„µ±credit´³rec´³lit³credit„´³tupleµ´³named³amount´³refµ„³CreditAmount„„´³named³mode´³refµ„³Mode„„„„„„„„³LineMode´³orµµ±lf´³lit³lf„„µ±crlf´³lit³crlf„„„„³StreamError´³rec´³lit³error„´³tupleµ´³named³message´³atom³String„„„„„³CreditAmount´³orµµ±count´³atom³
SignedInteger„„µ± unbounded´³lit³ unbounded„„„„³StreamConnection´³rec´³lit³stream-connection„´³tupleµ´³named³source´³embedded´³refµ„³Source„„„´³named³sink´³embedded´³refµ„³Sink„„„´³named³spec³any„„„„³StreamListenerError´³rec´³lit³stream-listener-error„´³tupleµ´³named³spec³any„´³named³message´³atom³String„„„„„³StreamListenerReady´³rec´³lit³stream-listener-ready„´³tupleµ´³named³spec³any„„„„„³embeddedType´³refµ³ EntityRef„³Cap„„„µ³sturdy„´³schema·³version°³definitions·³Lit´³rec´³lit³lit„´³tupleµ´³named³value³any„„„„³Oid´³atom³
SignedInteger„³Alts´³rec´³lit³or„´³tupleµ´³named³alternatives´³seqof´³refµ„³Rewrite„„„„„„³PAnd´³rec´³lit³and„´³tupleµ´³named³patterns´³seqof´³refµ„³Pattern„„„„„„³PNot´³rec´³lit³not„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³TRef´³rec´³lit³ref„´³tupleµ´³named³binding´³atom³
SignedInteger„„„„„³PAtom´³orµµ±Boolean´³lit³Boolean„„µ±Double´³lit³Double„„µ±
SignedInteger´³lit³
SignedInteger„„µ±String´³lit³String„„µ±
|
||||
ByteString´³lit³
|
||||
ByteString„„µ±Symbol´³lit³Symbol„„„„³PBind´³rec´³lit³bind„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³Caveat´³orµµ±Rewrite´³refµ„³Rewrite„„µ±Alts´³refµ„³Alts„„„„³Pattern´³orµµ±PDiscard´³refµ„³PDiscard„„µ±PAtom´³refµ„³PAtom„„µ± PEmbedded´³refµ„³ PEmbedded„„µ±PBind´³refµ„³PBind„„µ±PAnd´³refµ„³PAnd„„µ±PNot´³refµ„³PNot„„µ±Lit´³refµ„³Lit„„µ± PCompound´³refµ„³ PCompound„„„„³Rewrite´³rec´³lit³rewrite„´³tupleµ´³named³pattern´³refµ„³Pattern„„´³named³template´³refµ„³Template„„„„„³WireRef´³orµµ±mine´³tupleµ´³lit<69>„´³named³oid´³refµ„³Oid„„„„„µ±yours´³tuplePrefixµ´³lit‘„´³named³oid´³refµ„³Oid„„„´³named³attenuation´³seqof´³refµ„³Caveat„„„„„„„³PDiscard´³rec´³lit³_„´³tupleµ„„„³Template´³orµµ±
|
||||
ByteString„„µ±Symbol´³lit³Symbol„„„„³PBind´³rec´³lit³bind„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³Caveat´³orµµ±Rewrite´³refµ„³Rewrite„„µ±Alts´³refµ„³Alts„„µ±Reject´³refµ„³Reject„„µ±unknown³any„„„³Reject´³rec´³lit³reject„´³tupleµ´³named³pattern´³refµ„³Pattern„„„„„³Pattern´³orµµ±PDiscard´³refµ„³PDiscard„„µ±PAtom´³refµ„³PAtom„„µ± PEmbedded´³refµ„³ PEmbedded„„µ±PBind´³refµ„³PBind„„µ±PAnd´³refµ„³PAnd„„µ±PNot´³refµ„³PNot„„µ±Lit´³refµ„³Lit„„µ± PCompound´³refµ„³ PCompound„„„„³Rewrite´³rec´³lit³rewrite„´³tupleµ´³named³pattern´³refµ„³Pattern„„´³named³template´³refµ„³Template„„„„„³WireRef´³orµµ±mine´³tupleµ´³lit° |