Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
aa8d882
Add debug and static-member-fn support to sequence-sender
kirkshoop Sep 30, 2025
4e37d4d
switch `__seqexpr` to use static-member-fn to customize `subscribe` a…
kirkshoop Sep 30, 2025
fef35d8
add `__well_formed_sequence_sender` constraints to `ignore_all_values…
kirkshoop Sep 30, 2025
f7da526
improve debugging for `transform_each`
kirkshoop Sep 30, 2025
082a9e4
move sequence ERROR structs into exec namespace
kirkshoop Sep 30, 2025
4cca273
add `merge` algorithm for sequence-senders
kirkshoop Sep 30, 2025
ef85ae8
fix bugs in merge and transform_each
kirkshoop Oct 12, 2025
86c2afb
apply PR feedback
kirkshoop Oct 12, 2025
b3ca212
remove requires clause that was preventing diagnosis of failed type c…
kirkshoop Oct 12, 2025
bb09c37
diagnostics improvements for sequence sender
kirkshoop Oct 12, 2025
3f1ba21
add merge_each sequence sender adaptor
kirkshoop Oct 12, 2025
5117f8b
provide aliases for exec::materialize_t and exec::dematerialize_t
kirkshoop Oct 18, 2025
d63efcf
fix compiler error construction in merge
kirkshoop Oct 18, 2025
41a2f09
fix some ordering and error handling issues in merge_each
kirkshoop Oct 18, 2025
28d9367
improve compile errors for sequence senders
kirkshoop Oct 18, 2025
be05244
prevent trailing return types from causing subscribe, get_completion_…
kirkshoop Oct 18, 2025
b1b1614
add the option to specify a scheduler to iterate.
kirkshoop Oct 18, 2025
84b041f
add test_scheduler and marble and notification
kirkshoop Oct 18, 2025
b70a136
Merge branch 'main' into addmerge
ericniebler Oct 19, 2025
da25787
remove windows-only compilation error debug aid that is breaking wind…
kirkshoop Oct 21, 2025
54e46e2
replace static_thread_pool with single_thread_context. static_thread_…
kirkshoop Oct 29, 2025
3229813
Merge branch 'main' into addmerge
ericniebler Oct 29, 2025
8364f1a
clang-format changes
kirkshoop Oct 29, 2025
f58736e
remove _t from concept name
kirkshoop Oct 29, 2025
431c67c
simplify meta expression at the behest of Visual Studio
kirkshoop Oct 29, 2025
825110f
compile time debug changes
kirkshoop Oct 29, 2025
73d3cb0
Merge branch 'addmerge' into add-merge_each
kirkshoop Oct 29, 2025
9c71ef2
fix crash in delays_each_on
kirkshoop Oct 31, 2025
71da7d9
Merge remote-tracking branch 'origin/addmerge' into add-merge_each
kirkshoop Oct 31, 2025
36b00e2
clang-format changes
kirkshoop Oct 31, 2025
3cbf83b
fix bad copy/paste
kirkshoop Oct 31, 2025
ec14797
clang-format changes
kirkshoop Oct 31, 2025
dbd27ac
Merge branch 'add-merge_each' into marbletesting
kirkshoop Oct 31, 2025
09c57f3
update transform_iterate to work with specified scheduler support in …
kirkshoop Nov 1, 2025
6bed02b
silence visual studio unreachable warnings
kirkshoop Nov 1, 2025
9fd303d
fix visual studio errors
kirkshoop Nov 1, 2025
a309693
fixes visual studio compile errors and runtime crashes
kirkshoop Nov 1, 2025
3d93782
fix delays_each_on
kirkshoop Nov 1, 2025
175e734
fix clang19 build
kirkshoop Nov 1, 2025
ff06ec6
Merge remote-tracking branch 'upstream/main' into add-merge_each
kirkshoop Nov 1, 2025
f8841c5
fix bad merge
kirkshoop Nov 1, 2025
0fc8423
Merge branch 'add-merge_each' into marbletesting
kirkshoop Nov 1, 2025
2b48dfe
how did this ever compile?
kirkshoop Nov 1, 2025
ce05c8f
remove checks in multithreaded tests that cause test failures on slow…
kirkshoop Nov 1, 2025
23ab4b8
Merge branch 'add-merge_each' into marbletesting
kirkshoop Nov 1, 2025
850a25c
fixes warnings and errors in clang16
kirkshoop Nov 2, 2025
50d6ce7
get nvhpc compiling
kirkshoop Nov 6, 2025
307ead3
Merge branch 'add-merge_each' into marbletesting
kirkshoop Nov 7, 2025
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
Prev Previous commit
Next Next commit
fixes warnings and errors in clang16
  • Loading branch information
kirkshoop committed Nov 2, 2025
commit 850a25cabe015a167cd8c2d35588f3fa3f37c2f3
24 changes: 14 additions & 10 deletions include/exec/sequence/marbles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -431,14 +431,15 @@ namespace exec {
using __frame_t = typename _Clock::time_point;
using __duration_t = typename _Clock::duration;

constexpr auto __make_span = []<std::size_t _LenB>(__mstring<_LenB>&& __string) noexcept {
return std::span<char>{__string.__what_, _LenB - 1};
};
constexpr auto __make_span =
[]<std::size_t _LenB>(const __mstring<_LenB>& __string) noexcept {
return std::span<const char>{__string.__what_, _LenB - 1};
};

std::vector<marble_t<_Clock>> __marbles;
__frame_t __group_start_frame{-1ms};
__frame_t __frame = __clock.now();
auto __whole = __make_span(std::move(__diagram));
auto __whole = __make_span(__diagram);
auto __remaining = __whole;
auto __consume_first = [&__remaining](std::size_t __skip) noexcept {
__remaining = __remaining.subspan(__skip);
Expand Down Expand Up @@ -531,15 +532,18 @@ namespace exec {
&& __all_digits) {
auto __to_consume = __suffix_begin - __remaining.begin();
long __duration = std::atol(__remaining.data());
if (std::ranges::equal(
__remaining.subspan(__to_consume, 3), __make_span("ms "_mstr))) {
const auto __ms_str = "ms "_mstr;
const auto __ms = __make_span(__ms_str);
const auto __s_str = "s "_mstr;
const auto __s = __make_span(__s_str);
const auto __m_str = "m "_mstr;
const auto __m = __make_span(__m_str);
if (std::ranges::equal(__remaining.subspan(__to_consume, 3), __ms)) {
__to_consume += 2;
} else if (std::ranges::equal(
__remaining.subspan(__to_consume, 2), __make_span("s "_mstr))) {
} else if (std::ranges::equal(__remaining.subspan(__to_consume, 2), __s)) {
__duration *= 1000;
__to_consume += 1;
} else if (std::ranges::equal(
__remaining.subspan(__to_consume, 2), __make_span("m "_mstr))) {
} else if (std::ranges::equal(__remaining.subspan(__to_consume, 2), __m)) {
__duration = __duration * 1000 * 60;
__to_consume += 1;
} else {
Expand Down
14 changes: 7 additions & 7 deletions include/exec/sequence/test_scheduler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ namespace exec {
exec::schedule_at(__self.__context_->get_scheduler(), __marble.frame()),
static_cast<_Completion&&>(__completion)),
stdexec::prop{stdexec::get_stop_token, __self.__stop_source_.get_token()})
| stdexec::upon_error([](auto&&) noexcept {}) | stdexec::upon_stopped([]() noexcept {})
| stdexec::upon_error([](auto&&) noexcept { }) | stdexec::upon_stopped([]() noexcept { })
| stdexec::then([&__self, &__marble]() noexcept {
// after each completion, update the __test_sequence_operation_part state
STDEXEC_ASSERT(__self.__active_ops_ > 0);
Expand Down Expand Up @@ -869,10 +869,10 @@ namespace exec {
decltype(__schedule_at(__self, __marble, stdexec::__declval<__next_t>()));
using __end_sender_t = decltype(__schedule_at(__self, __marble, stdexec::just()));
struct __next_sender_id {
using __t = __next_sender_t;
using __t [[maybe_unused]] = __next_sender_t;
};
struct __end_sender_id {
using __t = __end_sender_t;
using __t [[maybe_unused]] = __end_sender_t;
};

// WORKAROUND clang 19 would fail to compile the construction of the variant_sender.
Expand Down Expand Up @@ -919,14 +919,14 @@ namespace exec {
using __id = __test_sequence;
using sender_concept = exec::sequence_sender_t;

using marble_t = marble_t<test_clock>;
using marble_sender_t = marble_t::__marble_sender_t;
using __marble_t = marble_t<test_clock>;
using __marble_sender_t = __marble_t::__marble_sender_t;

test_context* __context_;
std::vector<marble_t> __marbles_;
std::vector<__marble_t> __marbles_;

template <stdexec::__decays_to<__test_sequence> _Self, class... _Env>
static auto get_item_types(_Self&&, _Env&&...) noexcept -> item_types<marble_sender_t> {
static auto get_item_types(_Self&&, _Env&&...) noexcept -> item_types<__marble_sender_t> {
return {};
}

Expand Down
Loading