Skip to content

add the get_start_scheduler query, miscellaneous tidying #37

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
ericniebler merged 1 commit into from
May 15, 2026
Merged

add the get_start_scheduler query, miscellaneous tidying #37

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
1 change: 1 addition & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ PenaltyIndentedWhitespace: 2
PointerAlignment: Left
ReflowComments: true
RemoveSemicolon: false
SkipMacroDefinitionBody: true
SortIncludes: CaseInsensitive
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
Expand Down
2 changes: 1 addition & 1 deletion examples/scratch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ int main()
});
sync_wait(s3);

auto [sch2] = sync_wait(read_env(get_scheduler)).value();
auto [sch2] = sync_wait(read_env(get_start_scheduler)).value();

auto [i1, i2] = sync_wait(when_all(just(42), just(43))).value();
std::cout << i1 << ' ' << i2 << '\n';
Expand Down
41 changes: 22 additions & 19 deletions include/ustdex/detail/completion_signatures.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
* limitations under the License.
*/

#ifndef USTDEX_ASYNC_DETAIL_COMPLETION_SIGNATURES
#define USTDEX_ASYNC_DETAIL_COMPLETION_SIGNATURES
#ifndef USTDEX_DETAIL_COMPLETION_SIGNATURES
#define USTDEX_DETAIL_COMPLETION_SIGNATURES

#include "config.hpp"
#include "cpos.hpp"
Expand Down Expand Up @@ -85,14 +85,18 @@ using _completion_if = _m_if<_callable<Fn, Sig*>, completion_signatures<Sig>, co
template <class... Sigs>
struct USTDEX_TYPE_VISIBILITY_DEFAULT completion_signatures
{
// In a nested struct to delay instantiation until it's needed.
struct _deferred
{
using _partitioned USTDEX_ATTR_NODEBUG_ALIAS = _partition_completion_signatures_t<Sigs...>;
};

template <class Fn, class Continuation = _m_quote<ustdex::completion_signatures>>
using _transform USTDEX_ATTR_NODEBUG_ALIAS = _m_call<Continuation, _m_apply<Fn, Sigs>...>;

template <template <class...> class Fn, template <class...> class Continuation = ustdex::completion_signatures>
using _transform_q USTDEX_ATTR_NODEBUG_ALIAS = Continuation<_m_apply_q<Fn, Sigs>...>;

using _partitioned USTDEX_ATTR_NODEBUG_ALIAS = _partition_completion_signatures_t<Sigs...>;

template <class Fn, class... More>
using call USTDEX_ATTR_NODEBUG_ALIAS = _m_call<Fn, Sigs..., More...>;

Expand Down Expand Up @@ -126,15 +130,15 @@ USTDEX_API constexpr std::size_t completion_signatures<Sigs...>::count(Tag) cons
{
if constexpr (Tag() == set_value)
{
return _partitioned::_count_values::value;
return _deferred::_partitioned::_count_values::value;
}
else if constexpr (Tag() == set_error)
{
return _partitioned::_count_errors::value;
return _deferred::_partitioned::_count_errors::value;
}
else
{
return _partitioned::_count_stopped::value;
return _deferred::_partitioned::_count_stopped::value;
}
}

Expand Down Expand Up @@ -169,15 +173,15 @@ USTDEX_API constexpr auto completion_signatures<Sigs...>::select(Tag) const noex
{
if constexpr (Tag() == set_value)
{
return _partitioned::template _value_types<_m_quote_f<set_value_t>::call, completion_signatures>();
return _deferred::_partitioned::template _value_types<_m_quote_f<set_value_t>::call, completion_signatures>();
}
else if constexpr (Tag() == set_error)
{
return _partitioned::template _error_types<completion_signatures, _m_quote_f<set_error_t>::call>();
return _deferred::_partitioned::template _error_types<completion_signatures, _m_quote_f<set_error_t>::call>();
}
else
{
return _partitioned::template _stopped_types<completion_signatures>();
return _deferred::_partitioned::template _stopped_types<completion_signatures>();
}
}

Expand Down Expand Up @@ -411,7 +415,7 @@ constexpr auto get_child_completion_signatures()
USTDEX_PRAGMA_POP()

template <class Completions>
using _partitioned_completions_of = typename Completions::_partitioned;
using _partitioned_completions_of = typename Completions::_deferred::_partitioned;

constexpr int _invalid_disposition = -1;

Expand Down Expand Up @@ -456,10 +460,9 @@ struct _gather_sigs_fn<set_stopped_t>
template <class Sigs, class WantedTag, template <class...> class TaggedTuple, template <class...> class Variant>
using _gather_completion_signatures = typename _gather_sigs_fn<WantedTag>::template call<Sigs, TaggedTuple, Variant>;

// _partitioned_completions is a cache of completion signatures for fast
// access. The completion_signatures<Sigs...>::_partitioned nested struct
// inherits from _partitioned_completions. If the cache is never accessed,
// it is never instantiated.
// _partitioned_completions is a cache of completion signatures for fast access. The
// completion_signatures<Sigs...>::_deferred::_partitioned nested struct inherits from
// _partitioned_completions. If the cache is never accessed, it is never instantiated.
template <class... ValueTuples, class... Errors, bool HasStopped>
struct _partitioned_completions<_m_list<ValueTuples...>, _m_list<Errors...>, HasStopped>
{
Expand Down Expand Up @@ -626,22 +629,22 @@ completion_signatures<Sigs...>::operator+(const completion_signatures<OtherSigs.
}

template <class Sigs, template <class...> class Tuple, template <class...> class Variant>
using _value_types = typename Sigs::_partitioned::template _value_types<Tuple, Variant>;
using _value_types = typename Sigs::_deferred::_partitioned::template _value_types<Tuple, Variant>;

template <class Sndr, class Env, template <class...> class Tuple, template <class...> class Variant>
using value_types_of_t = _value_types<completion_signatures_of_t<Sndr, Env>, Tuple, _m_try_q<Variant>::template call>;

template <class Sigs, template <class...> class Variant>
using _error_types = typename Sigs::_partitioned::template _error_types<Variant, _identity_t>;
using _error_types = typename Sigs::_deferred::_partitioned::template _error_types<Variant, _identity_t>;

template <class Sndr, class Env, template <class...> class Variant>
using error_types_of_t = _error_types<completion_signatures_of_t<Sndr, Env>, Variant>;

template <class Sigs, template <class...> class Variant, class Type>
using _stopped_types = typename Sigs::_partitioned::template _stopped_types<Variant, Type>;
using _stopped_types = typename Sigs::_deferred::_partitioned::template _stopped_types<Variant, Type>;

template <class Sigs>
inline constexpr bool _sends_stopped = Sigs::_partitioned::_count_stopped::value != 0;
inline constexpr bool _sends_stopped = Sigs::_deferred::_partitioned::_count_stopped::value != 0;

template <class Sndr, class... Env>
inline constexpr bool sends_stopped = _sends_stopped<completion_signatures_of_t<Sndr, Env...>>;
Expand Down
6 changes: 3 additions & 3 deletions include/ustdex/detail/concepts.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
* limitations under the License.
*/

#ifndef USTDEX_ASYNC_DETAIL_CONCEPTS
#define USTDEX_ASYNC_DETAIL_CONCEPTS
#ifndef USTDEX_DETAIL_CONCEPTS
#define USTDEX_DETAIL_CONCEPTS

#include "completion_signatures.hpp"
#include "config.hpp"
Expand Down Expand Up @@ -138,4 +138,4 @@ USTDEX_CONCEPT dependent_sender = //

#include "epilogue.hpp"

#endif // USTDEX_ASYNC_DETAIL_CONCEPTS
#endif // USTDEX_DETAIL_CONCEPTS
39 changes: 19 additions & 20 deletions include/ustdex/detail/conditional.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
* limitations under the License.
*/

#ifndef USTDEX_ASYNC_DETAIL_CONDITIONAL
#define USTDEX_ASYNC_DETAIL_CONDITIONAL
#ifndef USTDEX_DETAIL_CONDITIONAL
#define USTDEX_DETAIL_CONDITIONAL

#include "completion_signatures.hpp"
#include "concepts.hpp"
Expand Down Expand Up @@ -127,24 +127,23 @@ struct _cond_t
USTDEX_API void set_value(As&&... _as) noexcept
{
auto _just = just_from(_cond_t::_mk_complete_fn(static_cast<As&&>(_as)...));
USTDEX_TRY( //
({ //
if (static_cast<Pred&&>(_data_._pred_)(_as...))
{
auto& _op = _ops_._emplace_from(connect, static_cast<Then&&>(_data_._then_)(_just), _rcvr_ref{_rcvr_});
ustdex::start(_op);
}
else
{
auto& _op = _ops_._emplace_from(connect, static_cast<Else&&>(_data_._else_)(_just), _rcvr_ref{_rcvr_});
ustdex::start(_op);
}
}),
USTDEX_CATCH(...) //
({ //
ustdex::set_error(static_cast<Rcvr&&>(_rcvr_), ::std::current_exception());
}) //
)
USTDEX_TRY
{
if (static_cast<Pred&&>(_data_._pred_)(_as...))
{
auto& _op = _ops_._emplace_from(connect, static_cast<Then&&>(_data_._then_)(_just), _rcvr_ref{_rcvr_});
ustdex::start(_op);
}
else
{
auto& _op = _ops_._emplace_from(connect, static_cast<Else&&>(_data_._else_)(_just), _rcvr_ref{_rcvr_});
ustdex::start(_op);
}
}
USTDEX_CATCH_ALL
{
ustdex::set_error(static_cast<Rcvr&&>(_rcvr_), ::std::current_exception());
}
}

template <class Error>
Expand Down
Loading
Loading