From 9b6b475c7563af2caf0c5c816ebc4f25a03da4be Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 14 Feb 2020 16:35:29 -0800 Subject: [PATCH] test_alien_echo: convert Condition to use readable_eventfd Should have been included in 5f05a50bae8bb4889dba0d249ed5fc3a2fcdcfa5. Signed-off-by: Samuel Just --- src/test/crimson/test_alien_echo.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/crimson/test_alien_echo.cc b/src/test/crimson/test_alien_echo.cc index abccc5034ec..876d5490ed4 100644 --- a/src/test/crimson/test_alien_echo.cc +++ b/src/test/crimson/test_alien_echo.cc @@ -7,7 +7,6 @@ #include "crimson/net/Dispatcher.h" #include "crimson/net/Messenger.h" #include "crimson/net/Config.h" -#include "crimson/thread/Condition.h" #include "crimson/thread/Throttle.h" #include @@ -95,7 +94,7 @@ struct Client { class SeastarContext { seastar::file_desc begin_fd; - crimson::thread::Condition on_end; + seastar::readable_eventfd on_end; public: SeastarContext() @@ -112,7 +111,7 @@ public: // alien: i've sent my request. have you replied it? // wait_for_seastar(); // alien: you are free to go! - on_end.notify(); + on_end.write_side().signal(1); }}; } @@ -122,7 +121,7 @@ public: return set_seastar_ready(); }).then([this] { // seastar: let me know once i am free to leave. - return on_end.wait(); + return on_end.wait().then([](size_t){}); }).handle_exception([](auto ep) { std::cerr << "Error: " << ep << std::endl; }).finally([] { -- 2.39.5