tests

.github/workflows/quick-test.yml

@@ -42,7 +42,6 @@ jobs:
             libunwind: libunwind-12-dev
     steps:
       - uses: actions/checkout@v2
-      - uses: bazelbuild/setup-bazelisk@v2
       - name: install dependencies
         # I observed 404s for some packages and added an `apt-get update`. Then, I observed package
         # conflicts between LLVM 14 and 15, and added the line which removes LLVM 14, the default on

c++/.bazelrc

@@ -1,3 +1,4 @@
+common --noenable_bzlmod
 common --enable_platform_specific_config
 
 build:unix --cxxopt='-std=c++20' --host_cxxopt='-std=c++20' --force_pic --verbose_failures
@@ -6,14 +7,15 @@ build:unix --cxxopt='-Wextra' --host_cxxopt='-Wextra'
 build:unix --cxxopt='-Wno-strict-aliasing' --host_cxxopt='-Wno-strict-aliasing'
 build:unix --cxxopt='-Wno-sign-compare' --host_cxxopt='-Wno-sign-compare'
 build:unix --cxxopt='-Wno-unused-parameter' --host_cxxopt='-Wno-unused-parameter'
+build:unix --cxxopt='-Wno-deprecated-this-capture' --host_cxxopt='-Wno-deprecated-this-capture'
 
 # I needed these magic spells to build locally with clang-11 and clang-12 on Ubuntu. clang-13 and up
 # work out-of-the-box.
 # TODO(2.0): Remove this when we support g++ again.
-build:unix --action_env=CXXFLAGS=-stdlib=libc++
-build:unix --action_env=LDFLAGS=-stdlib=libc++
-build:unix --action_env=BAZEL_CXXOPTS=-stdlib=libc++
-build:unix --action_env=BAZEL_LINKOPTS=-lc++:-lm
+build:linux --action_env=CXXFLAGS=-stdlib=libc++
+build:linux --action_env=LDFLAGS=-stdlib=libc++
+build:linux --action_env=BAZEL_CXXOPTS=-stdlib=libc++
+build:linux --action_env=BAZEL_LINKOPTS=-lc++:-lm
 
 build:linux --config=unix
 build:macos --config=unix

c++/.bazelversion

@@ -1 +1 @@
-6.1.2
+7.0.0

c++/Makefile.am

@@ -151,6 +151,7 @@ includekj_HEADERS =                                            \
   src/kj/vector.h                                              \
   src/kj/string.h                                              \
   src/kj/string-tree.h                                         \
+  src/kj/glob-filter.h                                         \
   src/kj/hash.h                                                \
   src/kj/table.h                                               \
   src/kj/map.h                                                 \
@@ -165,7 +166,6 @@ includekj_HEADERS =                                            \
   src/kj/mutex.h                                               \
   src/kj/source-location.h                                     \
   src/kj/thread.h                                              \
-  src/kj/threadlocal.h                                         \
   src/kj/filesystem.h                                          \
   src/kj/async-prelude.h                                       \
   src/kj/async.h                                               \
@@ -229,8 +229,7 @@ includecapnp_HEADERS =                                         \
   src/capnp/rpc-twoparty.h                                     \
   src/capnp/rpc.capnp.h                                        \
   src/capnp/rpc-twoparty.capnp.h                               \
-  src/capnp/persistent.capnp.h                                 \
-  src/capnp/ez-rpc.h
+  src/capnp/persistent.capnp.h
 
 includecapnpcompat_HEADERS =                                   \
   src/capnp/compat/json.h                                      \
@@ -276,6 +275,7 @@ libkj_la_SOURCES=                                              \
   src/kj/string.c++                                            \
   src/kj/string-tree.c++                                       \
   src/kj/source-location.c++                                   \
+  src/kj/glob-filter.c++                                       \
   src/kj/hash.c++                                              \
   src/kj/table.c++                                             \
   src/kj/encoding.c++                                          \
@@ -374,8 +374,7 @@ libcapnp_rpc_la_SOURCES=                                       \
   src/capnp/rpc.capnp.c++                                      \
   src/capnp/rpc-twoparty.c++                                   \
   src/capnp/rpc-twoparty.capnp.c++                             \
-  src/capnp/persistent.capnp.c++                               \
-  src/capnp/ez-rpc.c++
+  src/capnp/persistent.capnp.c++
 
 libcapnp_json_la_LIBADD = libcapnp.la libkj.la $(PTHREAD_LIBS)
 libcapnp_json_la_LDFLAGS = -release $(SO_VERSION) -no-undefined
@@ -542,7 +541,6 @@ heavy_tests =                                                  \
   src/capnp/serialize-text-test.c++                            \
   src/capnp/rpc-test.c++                                       \
   src/capnp/rpc-twoparty-test.c++                              \
-  src/capnp/ez-rpc-test.c++                                    \
   src/capnp/compat/json-test.c++                               \
   src/capnp/compat/websocket-rpc-test.c++                      \
   src/capnp/compiler/lexer-test.c++                            \
@@ -587,10 +585,10 @@ capnp_test_SOURCES =                                           \
   src/kj/io-test.c++                                           \
   src/kj/mutex-test.c++                                        \
   src/kj/time-test.c++                                         \
-  src/kj/threadlocal-test.c++                                  \
   src/kj/filesystem-test.c++                                   \
   src/kj/filesystem-disk-test.c++                              \
   src/kj/test-test.c++                                         \
+  src/kj/glob-filter-test.c++                                  \
   src/capnp/common-test.c++                                    \
   src/capnp/blob-test.c++                                      \
   src/capnp/endian-test.c++                                    \

c++/WORKSPACE

@@ -1,7 +1,6 @@
 workspace(name = "capnp-cpp")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("//:build/load_br.bzl", "load_brotli")
 
 http_archive(
     name = "bazel_skylib",
@@ -16,6 +15,14 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
 bazel_skylib_workspace()
 
+http_archive(
+    name = "brotli",
+    sha256 = "e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff",
+    strip_prefix = "brotli-1.1.0",
+    type = "tgz",
+    urls = ["https://github.com/google/brotli/archive/refs/tags/v1.1.0.tar.gz"],
+)
+
 http_archive(
     name = "ssl",
     sha256 = "873ec711658f65192e9c58554ce058d1cfa4e57e13ab5366ee16f76d1c757efc",
@@ -38,6 +45,7 @@ cc_library(
         "-Dverbose=-1",
     ] + select({
         "@platforms//os:macos": [ "-Wno-implicit-function-declaration" ],
+        "@platforms//os:linux": [ "-Wno-implicit-function-declaration" ],
         "//conditions:default": [],
     }),
     visibility = ["//visibility:public"],
@@ -47,9 +55,7 @@ cc_library(
 http_archive(
     name = "zlib",
     build_file_content = _zlib_build,
-    sha256 = "8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7",
-    strip_prefix = "zlib-1.3",
-    urls = ["https://zlib.net/zlib-1.3.tar.xz"],
+    sha256 = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32",
+    strip_prefix = "zlib-1.3.1",
+    urls = ["https://zlib.net/zlib-1.3.1.tar.xz"],
 )
-
-load_brotli()

c++/build/configure.bzl

@@ -1,4 +1,4 @@
-load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "int_flag")
+load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 
 def kj_configure():
     """Generates set of flag, settings for kj configuration.

c++/samples/calculator-client.c++

@@ -20,7 +20,8 @@
 // THE SOFTWARE.
 
 #include "calculator.capnp.h"
-#include <capnp/ez-rpc.h>
+#include <kj/async-io.h>
+#include <capnp/rpc-twoparty.h>
 #include <kj/debug.h>
 #include <math.h>
 #include <iostream>
@@ -47,13 +48,26 @@ int main(int argc, const char* argv[]) {
     return 1;
   }
 
-  capnp::EzRpcClient client(argv[1]);
-  Calculator::Client calculator = client.getMain<Calculator>();
+  // First we need to set up the KJ async event loop. This should happen one
+  // per thread that needs to perform RPC.
+  auto io = kj::setupAsyncIo();
 
   // Keep an eye on `waitScope`.  Whenever you see it used is a place where we
   // stop and wait for the server to respond.  If a line of code does not use
   // `waitScope`, then it does not block!
-  auto& waitScope = client.getWaitScope();
+  auto& waitScope = io.waitScope;
+
+  // Using KJ APIs, let's parse our network address and connect to it.
+  kj::Network& network = io.provider->getNetwork();
+  kj::Own<kj::NetworkAddress> addr = network.parseAddress(argv[1]).wait(waitScope);
+  kj::Own<kj::AsyncIoStream> conn = addr->connect().wait(waitScope);
+
+  // Now we can start the Cap'n Proto RPC system on this connection.
+  capnp::TwoPartyClient client(*conn);
+
+  // The server exports a "bootstrap" capability implementing the
+  // `Calculator` interface.
+  Calculator::Client calculator = client.bootstrap().castAs<Calculator>();
 
   {
     // Make a request that just evaluates the literal value 123.

c++/samples/calculator-server.c++

@@ -20,8 +20,9 @@
 // THE SOFTWARE.
 
 #include "calculator.capnp.h"
+#include <kj/async-io.h>
+#include <capnp/rpc-twoparty.h>
 #include <kj/debug.h>
-#include <capnp/ez-rpc.h>
 #include <capnp/message.h>
 #include <iostream>
 
@@ -196,12 +197,17 @@ int main(int argc, const char* argv[]) {
     return 1;
   }
 
-  // Set up a server.
-  capnp::EzRpcServer server(kj::heap<CalculatorImpl>(), argv[1]);
+  // First we need to set up the KJ async event loop. This should happen one
+  // per thread that needs to perform RPC.
+  auto io = kj::setupAsyncIo();
+
+  // Using KJ APIs, let's parse our network address and listen on it.
+  kj::Network& network = io.provider->getNetwork();
+  kj::Own<kj::NetworkAddress> addr = network.parseAddress(argv[1]).wait(io.waitScope);
+  kj::Own<kj::ConnectionReceiver> listener = addr->listen();
 
   // Write the port number to stdout, in case it was chosen automatically.
-  auto& waitScope = server.getWaitScope();
-  uint port = server.getPort().wait(waitScope);
+  uint port = listener->getPort();
   if (port == 0) {
     // The address format "unix:/path/to/socket" opens a unix domain socket,
     // in which case the port will be zero.
@@ -210,6 +216,9 @@ int main(int argc, const char* argv[]) {
     std::cout << "Listening on port " << port << "..." << std::endl;
   }
 
+  // Start the RPC server.
+  capnp::TwoPartyServer server(kj::heap<CalculatorImpl>());
+
   // Run forever, accepting connections and handling requests.
-  kj::NEVER_DONE.wait(waitScope);
+  server.listen(*listener).wait(io.waitScope);
 }

c++/src/capnp/BUILD.bazel

@@ -60,7 +60,6 @@ cc_library(
     srcs = [
         "capability.c++",
         "dynamic-capability.c++",
-        "ez-rpc.c++",
         "membrane.c++",
         "persistent.capnp.c++",
         "reconnect.c++",
@@ -71,7 +70,6 @@ cc_library(
         "serialize-async.c++",
     ],
     hdrs = [
-        "ez-rpc.h",
         "persistent.capnp.h",
         "reconnect.h",
         "rpc.capnp.h",
@@ -231,7 +229,6 @@ cc_library(
     "dynamic-test.c++",
     "encoding-test.c++",
     "endian-test.c++",
-    "ez-rpc-test.c++",
     "layout-test.c++",
     "membrane-test.c++",
     "message-test.c++",

c++/src/capnp/CMakeLists.txt

@@ -87,7 +87,6 @@ set(capnp-rpc_sources
   rpc-twoparty.c++
   rpc-twoparty.capnp.c++
   persistent.capnp.c++
-  ez-rpc.c++
 )
 set(capnp-rpc_headers
   rpc-prelude.h
@@ -96,7 +95,6 @@ set(capnp-rpc_headers
   rpc.capnp.h
   rpc-twoparty.capnp.h
   persistent.capnp.h
-  ez-rpc.h
 )
 set(capnp-rpc_schemas
   rpc.capnp
@@ -292,7 +290,6 @@ if(BUILD_TESTING)
       serialize-text-test.c++
       rpc-test.c++
       rpc-twoparty-test.c++
-      ez-rpc-test.c++
       compiler/lexer-test.c++
       compiler/type-id-test.c++
       test-util.c++

c++/src/capnp/arena.h

@@ -330,7 +330,7 @@ class BuilderArena final: public Arena {
 
   SegmentBuilder* addExternalSegment(kj::ArrayPtr<const word> content);
   // Add a new segment to the arena which points to some existing memory region.  The segment is
-  // assumed to be completley full; the arena will never allocate from it.  In fact, the segment
+  // assumed to be completely full; the arena will never allocate from it.  In fact, the segment
   // is considered read-only.  Any attempt to get a Builder pointing into this segment will throw
   // an exception.  Readers are allowed, however.
   //

c++/src/capnp/capability.h

@@ -133,7 +133,7 @@ class Request: public Params::Builder {
   //   to complete (and possibly other things, if that RPC itself returned a promise capability),
   //   but when using `sendPipelineOnly()`, `whenResolved()` may complete immediately, or never, or
   //   at an arbitrary time. Do not rely on it.
-  // - Normal path shortening may not work with these capabilities. For exmaple, if the caller
+  // - Normal path shortening may not work with these capabilities. For example, if the caller
   //   forwards a pipelined capability back to the callee's vat, calls made by the callee to that
   //   capability may continue to proxy through the caller. Conversely, if the callee ends up
   //   returning a capability that points back to the caller's vat, calls on the pipelined

c++/src/capnp/cc_capnp_library.bzl

@@ -87,6 +87,7 @@ def cc_capnp_library(
         data = [],
         deps = [],
         src_prefix = "",
+        tags = ["off-by-default"],
         visibility = None,
         target_compatible_with = None,
         **kwargs):
@@ -122,6 +123,8 @@ def cc_capnp_library(
         srcs = srcs_cpp,
         hdrs = hdrs,
         deps = deps + ["@capnp-cpp//src/capnp:capnp_runtime"],
+        # Allows us to avoid building the library archive when using start_end_lib
+        tags = tags,
         visibility = visibility,
         target_compatible_with = target_compatible_with,
         **kwargs