guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply capnp patches again

Browse Source 
This partially reverts commit f68233ec43.

while more modern capnp in *does* have the build system changes, it
does *not* have the patches. and those patches are rather important
to us; the clock patch because our CI machiens don't behave the way
capnp expect and the nodiscard patch because it *is* a bugsquasher.

Change-Id: Ic273777f09fd8e5e7001f815db8998dae2dd7b88
This commit is contained in:
eldritch horrors
2025-10-17 19:21:17 +00:00
parent 6ea1d8e37e
commit a55fe35dac
4 changed files with 253 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
misc/capnproto-monotonic-clocks-are-a-lie.patch
+47
View File
@@ -0,0 +1,47 @@
From 11375442cf591f055ca95902f27c68b0e983d371 Mon Sep 17 00:00:00 2001
From: Fabio Rossetto <fabio.rossetto@zhinst.com>
Date: Thu, 8 May 2025 18:18:10 +0200
Subject: [PATCH] Remove check for monotonic time
The check was disabled on Mac, but in #2261 it was reported also on
Linux. At this point, it makes more sense to remove the KJ_REQUIRE for
monotonicity alltogether.
Backport of the original PR #2296 to v1.0.2.
Signed-off-by: Raito Bezarius <raito@lix.systems>
Co-authored-by: Raito Bezarius <raito@lix.systems>
---
c++/src/kj/timer.c++ | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/c++/src/kj/timer.c++ b/c++/src/kj/timer.c++
index e5cd2648..a659e5d0 100644
--- a/c++/src/kj/timer.c++
+++ b/c++/src/kj/timer.c++
@@ -110,16 +110,13 @@ Maybe<uint64_t> TimerImpl::timeoutToNextEvent(TimePoint start, Duration unit, ui
}
void TimerImpl::advanceTo(TimePoint newTime) {
- // On Macs, it has been observed that clock_gettime
- // may return non monotonic time, even when CLOCK_MONOTONIC is used.
- // This workaround is to avoid the assert triggering if this happens.
- // See also https://github.com/capnproto/capnproto/issues/1693
-#if __APPLE__
+ // It has been observed that clock_gettime may return non monotonic time,
+ // even when CLOCK_MONOTONIC is used.
+ // We use std::max to guard against this rare issue.
+ // - on Mac: https://github.com/capnproto/capnproto/issues/1693
+ // - on Linux: https://github.com/capnproto/capnproto/issues/2261
+
time = std::max(time, newTime);
-#else
- KJ_REQUIRE(newTime >= time, "can't advance backwards in time") { return; }
- time = newTime;
-#endif
for (;;) {
auto front = impl->timers.begin();
--
2.49.0
misc/capnproto-promise-nodiscard.patch
+194
View File
@@ -0,0 +1,194 @@
diff --git a/c++/src/kj/array.h b/c++/src/kj/array.h
index 3932f9f4..677c691a 100644
--- a/c++/src/kj/array.h
+++ b/c++/src/kj/array.h
@@ -780,7 +780,7 @@ struct CopyConstructArray_<T, Iterator, true, false> {
static T* apply(T* __restrict__ pos, Iterator start, Iterator end) {
// Verify that T can be *implicitly* constructed from the source values.
- if (false) implicitCast<T>(kj::mv(*start));
+ if (false) (void)implicitCast<T>(kj::mv(*start));
if (noexcept(T(kj::mv(*start)))) {
while (start != end) {
diff --git a/c++/src/kj/async-coroutine-test.c++ b/c++/src/kj/async-coroutine-test.c++
index de767eca..d6ed1359 100644
--- a/c++/src/kj/async-coroutine-test.c++
+++ b/c++/src/kj/async-coroutine-test.c++
@@ -288,5 +288,5 @@ KJ_TEST("Exceptions during suspended coroutine frame-unwind propagate via destru
WaitScope waitScope(loop);
auto exception = KJ_ASSERT_NONNULL(kj::runCatchingExceptions([&]() {
- deferredThrowCoroutine(kj::NEVER_DONE);
+ (void)deferredThrowCoroutine(kj::NEVER_DONE);
}));
KJ_EXPECT(exception.getDescription() == "thrown during unwind");
diff --git a/c++/src/kj/async-io-test.c++ b/c++/src/kj/async-io-test.c++
index e8892b79..dffcbb26 100644
--- a/c++/src/kj/async-io-test.c++
+++ b/c++/src/kj/async-io-test.c++
@@ -1577,7 +1577,7 @@ KJ_TEST("Userland pipe pump into zero-limited pipe, no data to pump") {
auto pipe2 = newOneWayPipe(uint64_t(0));
auto pumpPromise = KJ_ASSERT_NONNULL(pipe2.out->tryPumpFrom(*pipe.in));
- expectRead(*pipe2.in, "");
+ expectRead(*pipe2.in, "").wait(ws);
pipe.out = nullptr;
KJ_EXPECT(pumpPromise.wait(ws) == 0);
}
@@ -1590,7 +1590,7 @@ KJ_TEST("Userland pipe pump into zero-limited pipe, data is pumped") {
auto pipe2 = newOneWayPipe(uint64_t(0));
auto pumpPromise = KJ_ASSERT_NONNULL(pipe2.out->tryPumpFrom(*pipe.in));
- expectRead(*pipe2.in, "");
+ expectRead(*pipe2.in, "").wait(ws);
auto writePromise = pipe.out->write("foo", 3);
KJ_EXPECT_THROW_RECOVERABLE_MESSAGE("abortRead() has been called", pumpPromise.wait(ws));
}
diff --git a/c++/src/kj/async.h b/c++/src/kj/async.h
index 564b5171..d4f2d55c 100644
--- a/c++/src/kj/async.h
+++ b/c++/src/kj/async.h
@@ -118,7 +118,7 @@ private:
// Promises
template <typename T>
-class Promise: protected _::PromiseBase {
+class [[nodiscard]] Promise: protected _::PromiseBase {
// The basic primitive of asynchronous computation in KJ. Similar to "futures", but designed
// specifically for event loop concurrency. Similar to E promises and JavaScript Promises/A.
//
diff --git a/c++/src/kj/common-test.c++ b/c++/src/kj/common-test.c++
index 97856125..913a6be4 100644
--- a/c++/src/kj/common-test.c++
+++ b/c++/src/kj/common-test.c++
@@ -573,7 +573,7 @@ TEST(Common, Downcast) {
EXPECT_EQ(&bar, &downcast<Bar>(foo));
#if defined(KJ_DEBUG) && !KJ_NO_RTTI
- KJ_EXPECT_THROW_MESSAGE("Value cannot be downcast", downcast<Baz>(foo));
+ KJ_EXPECT_THROW_MESSAGE("Value cannot be downcast", (void)downcast<Baz>(foo));
#endif
#if KJ_NO_RTTI
diff --git a/c++/src/kj/compat/http-test.c++ b/c++/src/kj/compat/http-test.c++
index f10ff8d1..9003099d 100644
--- a/c++/src/kj/compat/http-test.c++
+++ b/c++/src/kj/compat/http-test.c++
@@ -6553,7 +6553,7 @@ KJ_TEST("Simple CONNECT Server works") {
"\r\n"
"hello"_kj).wait(waitScope);
- expectEnd(*pipe.ends[1]);
+ expectEnd(*pipe.ends[1]).wait(waitScope);
listenTask.wait(waitScope);
@@ -6628,7 +6628,7 @@ KJ_TEST("CONNECT Server (201 status)") {
"\r\n"
"hello"_kj).wait(waitScope);
- expectEnd(*pipe.ends[1]);
+ expectEnd(*pipe.ends[1]).wait(waitScope);
listenTask.wait(waitScope);
@@ -6706,7 +6706,7 @@ KJ_TEST("CONNECT Server rejected") {
"\r\n"
"boom"_kj).wait(waitScope);
- expectEnd(*pipe.ends[1]);
+ expectEnd(*pipe.ends[1]).wait(waitScope);
listenTask.wait(waitScope);
@@ -6774,7 +6774,7 @@ KJ_TEST("CONNECT Server cancels read") {
"HTTP/1.1 200 OK\r\n"
"\r\n"_kj).wait(waitScope);
- expectEnd(*pipe.ends[1]);
+ expectEnd(*pipe.ends[1]).wait(waitScope);
listenTask.wait(waitScope);
}
@@ -6840,7 +6840,7 @@ KJ_TEST("CONNECT Server cancels write") {
"HTTP/1.1 200 OK\r\n"
"\r\n"_kj).wait(waitScope);
- expectEnd(*pipe.ends[1]);
+ expectEnd(*pipe.ends[1]).wait(waitScope);
listenTask.wait(waitScope);
}
@@ -6913,7 +6913,7 @@ KJ_TEST("CONNECT rejects Transfer-Encoding") {
"\r\n"
"ERROR: Bad Request"_kj).wait(waitScope);
- expectEnd(*pipe.ends[1]);
+ expectEnd(*pipe.ends[1]).wait(waitScope);
listenTask.wait(waitScope);
}
@@ -6947,7 +6947,7 @@ KJ_TEST("CONNECT rejects Content-Length") {
"\r\n"
"ERROR: Bad Request"_kj).wait(waitScope);
- expectEnd(*pipe.ends[1]);
+ expectEnd(*pipe.ends[1]).wait(waitScope);
listenTask.wait(waitScope);
}
diff --git a/c++/src/kj/compat/tls-test.c++ b/c++/src/kj/compat/tls-test.c++
index dddefa57..52ccc68a 100644
--- a/c++/src/kj/compat/tls-test.c++
+++ b/c++/src/kj/compat/tls-test.c++
@@ -1037,15 +1037,15 @@ KJ_TEST("TLS receiver experiences pre-TLS error") {
TlsReceiverTest test;
KJ_LOG(INFO, "Accepting before a bad connect");
- auto promise = test.receiver->accept();
+ auto acceptPromise = test.receiver->accept();
KJ_LOG(INFO, "Disappointing our server");
- test.baseReceiver->badConnect();
+ auto connectPromise = test.baseReceiver->badConnect();
// Can't use KJ_EXPECT_THROW_RECOVERABLE_MESSAGE because wait() that returns a value can't throw
// recoverable exceptions. Can't use KJ_EXPECT_THROW_MESSAGE because non-recoverable exceptions
// will fork() in -fno-exception which screws up our state.
- promise.then([](auto) {
+ acceptPromise.then([](auto) {
KJ_FAIL_EXPECT("expected exception");
}, [](kj::Exception&& e) {
KJ_EXPECT(e.getDescription() == "Pipes are leaky");
diff --git a/c++/src/kj/test.h b/c++/src/kj/test.h
index 5acbb00d..de5efec2 100644
--- a/c++/src/kj/test.h
+++ b/c++/src/kj/test.h
@@ -92,6 +92,7 @@ private:
else KJ_FAIL_EXPECT("failed: expected " #cond, _kjCondition, ##__VA_ARGS__)
#endif
+// TODO(msvc): cast results to void like non-MSVC versions do
#if _MSC_VER && !defined(__clang__)
#define KJ_EXPECT_THROW_RECOVERABLE(type, code, ...) \
do { \
@@ -115,7 +116,7 @@ private:
#else
#define KJ_EXPECT_THROW_RECOVERABLE(type, code, ...) \
do { \
- KJ_IF_MAYBE(e, ::kj::runCatchingExceptions([&]() { code; })) { \
+ KJ_IF_MAYBE(e, ::kj::runCatchingExceptions([&]() { (void)({code}); })) { \
KJ_EXPECT(e->getType() == ::kj::Exception::Type::type, \
"code threw wrong exception type: " #code, *e, ##__VA_ARGS__); \
} else { \
@@ -125,7 +126,7 @@ private:
#define KJ_EXPECT_THROW_RECOVERABLE_MESSAGE(message, code, ...) \
do { \
- KJ_IF_MAYBE(e, ::kj::runCatchingExceptions([&]() { code; })) { \
+ KJ_IF_MAYBE(e, ::kj::runCatchingExceptions([&]() { (void)({code}); })) { \
KJ_EXPECT(::kj::_::hasSubstring(e->getDescription(), message), \
"exception description didn't contain expected substring", *e, ##__VA_ARGS__); \
} else { \