Skip to content

Fix get start scheduler #102

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

Merged
dietmarkuehl merged 4 commits into from
Jul 19, 2026
Merged

Fix get start scheduler #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3f0c11
changed various places to use get_start_scheduler
dietmarkuehl Jul 19, 2026
efa8e1f
Merge branch 'main' into fix-get_start_scheduler
dietmarkuehl Jul 19, 2026
facaf6b
clang-format
dietmarkuehl Jul 19, 2026
0bb9de8
clang-format again
dietmarkuehl Jul 19, 2026
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
18 changes: 9 additions & 9 deletions include/beman/task/detail/awaiter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ struct awaiter_scheduler_receiver {

template <typename Awaiter,
typename ParentPromise,
bool =
requires(const ParentPromise& p) { ::beman::execution::get_scheduler(::beman::execution::get_env(p)); }>
bool = requires(
const ParentPromise& p) { ::beman::execution::get_start_scheduler(::beman::execution::get_env(p)); }>
struct awaiter_op_t {
Comment on lines 25 to 29
using state_type =
decltype(::beman::execution::connect(::beman::execution::schedule(::beman::execution::get_scheduler(
decltype(::beman::execution::connect(::beman::execution::schedule(::beman::execution::get_start_scheduler(
::beman::execution::get_env(::std::declval<const ParentPromise&>()))),
::std::declval<awaiter_scheduler_receiver<Awaiter>>()));

awaiter_op_t(const ParentPromise& p, Awaiter* aw)
: state(::beman::execution::connect(
::beman::execution::schedule(beman::execution::get_scheduler(::beman::execution::get_env(p))),
::beman::execution::schedule(beman::execution::get_start_scheduler(::beman::execution::get_env(p))),
awaiter_scheduler_receiver<Awaiter>{aw})) {}
state_type state;
auto start() noexcept -> void { ::beman::execution::start(this->state); }
Expand Down Expand Up @@ -73,11 +73,11 @@ class awaiter : public ::beman::task::detail::state_base<Value, Env> {
assert(this->parent);
assert(this->scheduler);
if constexpr (requires {
*this->scheduler !=
::beman::execution::get_scheduler(::beman::execution::get_env(this->parent.promise()));
*this->scheduler != ::beman::execution::get_start_scheduler(
::beman::execution::get_env(this->parent.promise()));
}) {
if (*this->scheduler !=
::beman::execution::get_scheduler(::beman::execution::get_env(this->parent.promise()))) {
::beman::execution::get_start_scheduler(::beman::execution::get_env(this->parent.promise()))) {
this->reschedule.emplace(this->parent.promise(), this);
Comment on lines 75 to 81
this->reschedule->start();
return ::std::noop_coroutine();
Expand All @@ -96,8 +96,8 @@ class awaiter : public ::beman::task::detail::state_base<Value, Env> {
else
return allocator_type{};
}
auto do_get_scheduler() -> scheduler_type override { return *this->scheduler; }
auto do_set_scheduler(scheduler_type other) -> scheduler_type override {
auto do_get_start_scheduler() -> scheduler_type override { return *this->scheduler; }
auto do_set_start_scheduler(scheduler_type other) -> scheduler_type override {
return ::std::exchange(*this->scheduler, other);
}
auto do_get_stop_token() -> stop_token_type override { return {}; }
Expand Down
4 changes: 2 additions & 2 deletions include/beman/task/detail/promise_env.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ struct promise_env {
const Promise* promise;

auto query(const ::beman::execution::get_scheduler_t&) const noexcept -> typename Promise::scheduler_type {
return this->promise->get_scheduler();
return this->promise->get_start_scheduler();
}
auto query(const ::beman::execution::get_start_scheduler_t&) const noexcept -> typename Promise::scheduler_type {
return this->promise->get_scheduler();
return this->promise->get_start_scheduler();
}
auto query(const ::beman::execution::get_allocator_t&) const noexcept -> typename Promise::allocator_type {
return this->promise->get_allocator();
Expand Down
4 changes: 2 additions & 2 deletions include/beman/task/detail/promise_type.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ class promise_type
}
auto notify_complete() -> ::std::coroutine_handle<> { return this->get_state()->complete(); }
scheduler_type change_scheduler(scheduler_type other) {
return this->get_state()->set_scheduler(::std::move(other));
return this->get_state()->set_start_scheduler(::std::move(other));
}

auto get_scheduler() const noexcept -> scheduler_type { return this->get_state()->get_scheduler(); }
auto get_start_scheduler() const noexcept -> scheduler_type { return this->get_state()->get_start_scheduler(); }
auto get_allocator() const noexcept -> allocator_type { return this->get_state()->get_allocator(); }
auto get_stop_token() const noexcept -> stop_token_type { return this->get_state()->get_stop_token(); }
auto get_environment() const noexcept -> const Environment& {
Expand Down
4 changes: 2 additions & 2 deletions include/beman/task/detail/state.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ struct state : ::beman::task::detail::state_base<T, C>, ::beman::task::detail::s
else
return allocator_type{};
}
auto do_get_scheduler() -> scheduler_type override { return this->scheduler; }
auto do_set_scheduler(scheduler_type other) -> scheduler_type override {
auto do_get_start_scheduler() -> scheduler_type override { return this->scheduler; }
auto do_set_start_scheduler(scheduler_type other) -> scheduler_type override {
return ::std::exchange(this->scheduler, other);
}
stop_token_type do_get_stop_token() override {
Expand Down
20 changes: 11 additions & 9 deletions include/beman/task/detail/state_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,28 @@ class state_base : public ::beman::task::detail::result_type<::beman::task::deta
assert(this);
return this->do_get_environment();
}
auto get_scheduler() -> scheduler_type { return this->do_get_scheduler(); }
auto set_scheduler(scheduler_type other) -> scheduler_type { return this->do_set_scheduler(other); }
auto get_start_scheduler() -> scheduler_type { return this->do_get_start_scheduler(); }
auto set_start_scheduler(scheduler_type other) -> scheduler_type { return this->do_set_start_scheduler(other); }

protected:
template <::beman::execution::scheduler Scheduler, typename Env>
static auto from_env(const Env& env) {
if constexpr (requires { Scheduler(::beman::execution::get_scheduler(env)); }) {
if constexpr (requires { Scheduler(::beman::execution::get_start_scheduler(env)); }) {
return Scheduler(::beman::execution::get_start_scheduler(env));
} else if constexpr (requires { Scheduler(::beman::execution::get_scheduler(env)); }) {
return Scheduler(::beman::execution::get_scheduler(env));
} else {
return Scheduler();
}
}

// NOLINTBEGIN(portability-template-virtual-member-function)
virtual auto do_complete() -> std::coroutine_handle<> = 0;
virtual auto do_get_allocator() -> allocator_type = 0;
virtual auto do_get_stop_token() -> stop_token_type = 0;
virtual auto do_get_environment() -> Environment& = 0;
virtual auto do_get_scheduler() -> scheduler_type = 0;
virtual auto do_set_scheduler(scheduler_type other) -> scheduler_type = 0;
virtual auto do_complete() -> std::coroutine_handle<> = 0;
virtual auto do_get_allocator() -> allocator_type = 0;
virtual auto do_get_stop_token() -> stop_token_type = 0;
virtual auto do_get_environment() -> Environment& = 0;
virtual auto do_get_start_scheduler() -> scheduler_type = 0;
virtual auto do_set_start_scheduler(scheduler_type other) -> scheduler_type = 0;
// NOLINTEND(portability-template-virtual-member-function)

virtual ~state_base() = default;
Expand Down
6 changes: 4 additions & 2 deletions tests/beman/task/promise_base.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ struct state : bt::state_base<T, env<E...>> {
this->got_environment = true;
return this->ev;
}
auto do_get_scheduler() -> scheduler_type override { return scheduler_type(ex::inline_scheduler()); }
auto do_set_scheduler(scheduler_type) -> scheduler_type override { return scheduler_type(ex::inline_scheduler()); }
auto do_get_start_scheduler() -> scheduler_type override { return scheduler_type(ex::inline_scheduler()); }
auto do_set_start_scheduler(scheduler_type) -> scheduler_type override {
return scheduler_type(ex::inline_scheduler());
}
};

template <typename T>
Expand Down
8 changes: 5 additions & 3 deletions tests/beman/task/promise_type.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,13 @@ struct test_task : beman::task::detail::state_base<int, environment> {
allocator_type do_get_allocator() override { return allocator_type{}; }
stop_token_type do_get_stop_token() override { return this->source.get_token(); }
environment& do_get_environment() override { return this->env; }
auto do_get_scheduler() -> scheduler_type override { return scheduler_type(ex::inline_scheduler()); }
auto do_set_scheduler(scheduler_type) -> scheduler_type override { return scheduler_type(ex::inline_scheduler()); }
auto do_get_start_scheduler() -> scheduler_type override { return scheduler_type(ex::inline_scheduler()); }
auto do_set_start_scheduler(scheduler_type) -> scheduler_type override {
return scheduler_type(ex::inline_scheduler());
}

beman::task::detail::task_scheduler scheduler{beman::execution::inline_scheduler{}};
beman::task::detail::task_scheduler query(beman::execution::get_scheduler_t) const noexcept {
beman::task::detail::task_scheduler query(beman::execution::get_start_scheduler_t) const noexcept {
return this->scheduler;
}
};
Expand Down
6 changes: 4 additions & 2 deletions tests/beman/task/state_base.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ struct state : beman::task::detail::state_base<int, environment> {
this->got_environment = true;
return this->env;
}
auto do_get_scheduler() -> scheduler_type override { return scheduler_type(ex::inline_scheduler()); }
auto do_set_scheduler(scheduler_type) -> scheduler_type override { return scheduler_type(ex::inline_scheduler()); }
auto do_get_start_scheduler() -> scheduler_type override { return scheduler_type(ex::inline_scheduler()); }
auto do_set_start_scheduler(scheduler_type) -> scheduler_type override {
return scheduler_type(ex::inline_scheduler());
}
};
} // namespace

Expand Down
2 changes: 1 addition & 1 deletion tests/beman/task/task.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ auto test_affinity() {
co_await []() -> ex::task<> {
ex::inline_scheduler sched{};
std::cout << "comparing schedulers=" << std::boolalpha
<< (sched == co_await ex::read_env(ex::get_scheduler)) << "\n";
<< (sched == co_await ex::read_env(ex::get_start_scheduler)) << "\n";
std::cout << "changing scheduler\n";
co_await ex::change_coroutine_scheduler(sched);
std::cout << "changed scheduler\n";
Expand Down
Loading