Skip to content

Make start_now's request_stop reach its senders #2417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nas01010101 wants to merge 1 commit into
base: main
Choose a base branch
from
+49 −2
Open

Make start_now's request_stop reach its senders #2417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions include/exec/start_now.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "../stdexec/__detail/__meta.hpp"
#include "../stdexec/__detail/__receivers.hpp"
#include "../stdexec/__detail/__senders.hpp"
#include "../stdexec/__detail/__stop_token.hpp"
#include "../stdexec/__detail/__stop_when.hpp"

#include "async_scope.hpp"
#include "env.hpp"
Expand Down Expand Up @@ -180,16 +182,23 @@ namespace experimental::execution
using __receiver_t = __receiver<_Env>;
using __sender_t = __sender<_Env>;
template <class _Sender>
using __nested_t = nest_result_t<_AsyncScope, _Sender>;
using __stoppable_t =
STDEXEC::__call_result_t<STDEXEC::__stop_when_t, _Sender, STDEXEC::inplace_stop_token>;
template <class _Sender>
using __nested_t = nest_result_t<_AsyncScope, __stoppable_t<_Sender>>;

STDEXEC::__tuple<STDEXEC::connect_result_t<__nested_t<_Senders>, __receiver_t>...>
__opstates_;

public:
constexpr __storage(_Env&& __env, _AsyncScope& __scope, _Senders&&... __sndr)
: __storage_base<_Env>(static_cast<_Env&&>(__env), sizeof...(__sndr))
// nest() gives the sender the scope's stop token in place of the receiver's,
// so the storage's token has to be fused in underneath it.
, __opstates_{
STDEXEC::connect(__scope.nest(static_cast<_Senders&&>(__sndr)), __receiver_t{this})...}
STDEXEC::connect(__scope.nest(STDEXEC::__stop_when(static_cast<_Senders&&>(__sndr),
this->__source_.get_token())),
__receiver_t{this})...}
{
// Start all of the child operations
STDEXEC::__apply(STDEXEC::__for_each{STDEXEC::start}, __opstates_);
Expand Down
38 changes: 38 additions & 0 deletions test/exec/async_scope/test_start_now.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,42 @@ namespace
REQUIRE(executedB);
}

TEST_CASE("start_now request_stop stops the senders", "[async_scope][start_now]")
{
bool executed{false};
bool stopped{false};
async_scope scope;
ex::run_loop loop;

auto stg = start_now(scope,
ex::schedule(loop.get_scheduler())
| ex::then([&]() noexcept { executed = true; })
| ex::upon_stopped([&]() noexcept { stopped = true; }));
REQUIRE(stg.request_stop());
loop.finish();
loop.run();
REQUIRE(stopped);
REQUIRE_FALSE(executed);
REQUIRE(sync_wait(stg.async_wait()).has_value());
}

TEST_CASE("start_now senders still stop with the scope", "[async_scope][start_now]")
{
bool executed{false};
bool stopped{false};
async_scope scope;
ex::run_loop loop;

auto stg = start_now(scope,
ex::schedule(loop.get_scheduler())
| ex::then([&]() noexcept { executed = true; })
| ex::upon_stopped([&]() noexcept { stopped = true; }));
REQUIRE(scope.request_stop());
loop.finish();
loop.run();
REQUIRE(stopped);
REQUIRE_FALSE(executed);
REQUIRE(sync_wait(stg.async_wait()).has_value());
}

} // namespace
Loading