diff --git a/httplib.h b/httplib.h index f6f53958..d9a4ba59 100644 --- a/httplib.h +++ b/httplib.h @@ -7961,10 +7961,12 @@ inline bool PollPoller::wait(int timeout_ms, std::vector &ready) { auto woken = fds_[0].revents != 0; if (woken) { n--; - // Clear the flag first: a wake() from here on sends another byte. - wake_pending_ = false; char buf[64]; read_socket(wake_read_, buf, sizeof(buf), CPPHTTPLIB_RECV_FLAGS); + // Only after the read, which could take the byte of a later wake() too. + // A wake() in between finds the flag still set and sends nothing, which + // is fine: the caller looks at what it was woken for after this returns. + wake_pending_ = false; } // Walk backwards: remove_at() moves the last entry, already seen, into the diff --git a/test/test.cc b/test/test.cc index ae16e172..cdde9d2a 100644 --- a/test/test.cc +++ b/test/test.cc @@ -34107,6 +34107,36 @@ TEST_P(PollerTest, WakesCoalesceAndAreConsumed) { EXPECT_TRUE(poller_->wait(0, ready)); } +TEST_P(PollerTest, ConcurrentWakesAreNeverLost) { + // Two threads publish changes and wake() after each, as a reactor's workers + // do. Every change must be seen without a wait() timing out. A lost wake() + // needs an unlucky interleaving, hence the rounds. + for (int round = 0; round < 5; round++) { + SCOPED_TRACE(round); + const int per_thread = 20000; + std::atomic posted{0}; + auto post = [&] { + for (int i = 0; i < per_thread; i++) { + posted++; + poller_->wake(); + } + }; + std::thread t1(post), t2(post); + + auto lost = false; + Tokens ready; + for (auto seen = 0; seen < 2 * per_thread; seen = posted) { + if (!poller_->wait(1000, ready)) { + lost = true; + break; + } + } + t1.join(); + t2.join(); + ASSERT_FALSE(lost); + } +} + TEST(PollerFactoryTest, MakePollerWorks) { auto poller = detail::make_poller(); ASSERT_TRUE(poller != nullptr);