-
Notifications
You must be signed in to change notification settings - Fork 222
Implement P3149R11 and P3815R1 #1713
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.
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
Draft
ispeters
wants to merge
3
commits into
NVIDIA:main
Choose a base branch
from
ispeters:p3149_plus_p3815
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,216 @@ | ||
| /* | ||
| * Copyright (c) 2025 Ian Petersen | ||
| * Copyright (c) 2025 NVIDIA Corporation | ||
| * | ||
| * Licensed under the Apache License Version 2.0 with LLVM Exceptions | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * https://llvm.org/LICENSE.txt | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| #pragma once | ||
|
|
||
| #include "__execution_fwd.hpp" | ||
|
|
||
| #include "__basic_sender.hpp" | ||
| #include "__concepts.hpp" | ||
| #include "__diagnostics.hpp" | ||
| #include "__queries.hpp" | ||
| #include "__scope_concepts.hpp" | ||
| #include "__senders.hpp" | ||
| #include "__sender_adaptor_closure.hpp" | ||
|
|
||
| namespace stdexec { | ||
| ///////////////////////////////////////////////////////////////////////////// | ||
| // [exec.associate] | ||
| namespace __associate { | ||
| template <scope_token _Token, sender _Sender> | ||
| struct __associate_data { | ||
| using __wrap_result_t = decltype(__declval<_Token&>().wrap(__declval<_Sender>())); | ||
| using __wrap_sender_t = std::remove_cvref_t<__wrap_result_t>; | ||
|
|
||
| using __assoc_t = decltype(__declval<_Token&>().try_associate()); | ||
|
|
||
| using __sender_ref = | ||
| std::unique_ptr<__wrap_sender_t, decltype([](auto* p) noexcept { std::destroy_at(p); })>; | ||
|
|
||
| // BUGBUG: should the spec require __token to be declared as a const _Token, or should this be | ||
| // changed to declare __token as a mutable _Token? | ||
| explicit __associate_data(const _Token __token, _Sender&& __sndr) noexcept( | ||
| __nothrow_constructible_from<__wrap_sender_t, __wrap_result_t> | ||
| && noexcept(__token.wrap(static_cast<_Sender&&>(__sndr))) | ||
| && noexcept(__token.try_associate())) | ||
| : __sndr_(__token.wrap(static_cast<_Sender&&>(__sndr))) | ||
| , __assoc_([&] { | ||
| __sender_ref guard{std::addressof(__sndr_)}; | ||
|
|
||
| auto assoc = __token.try_associate(); | ||
|
|
||
| if (assoc) { | ||
| (void) guard.release(); | ||
| } | ||
|
|
||
| return assoc; | ||
| }()) { | ||
| } | ||
|
|
||
| __associate_data(const __associate_data& __other) noexcept( | ||
| __nothrow_copy_constructible<__wrap_sender_t> && noexcept(__other.__assoc_.try_associate())) | ||
| requires copy_constructible<__wrap_sender_t> | ||
| : __assoc_(__other.__assoc_.try_associate()) { | ||
| if (__assoc_) { | ||
| std::construct_at(&__sndr_, __other.__sndr_); | ||
| } | ||
| } | ||
|
|
||
| __associate_data(__associate_data&& __other) | ||
| noexcept(__nothrow_move_constructible<__wrap_sender_t>) | ||
| : __associate_data(std::move(__other).release()) { | ||
| } | ||
|
|
||
| ~__associate_data() { | ||
| if (__assoc_) { | ||
| std::destroy_at(&__sndr_); | ||
| } | ||
| } | ||
|
|
||
| std::pair<__assoc_t, __sender_ref> release() && noexcept { | ||
| __sender_ref u(__assoc_ ? std::addressof(__sndr_) : nullptr); | ||
| return {std::move(__assoc_), std::move(u)}; | ||
| } | ||
|
|
||
| private: | ||
| __associate_data(std::pair<__assoc_t, __sender_ref> __parts) | ||
| : __assoc_(std::move(__parts.first)) { | ||
| if (__assoc_) { | ||
| std::construct_at(&__sndr_, std::move(*__parts.second)); | ||
| } | ||
| } | ||
|
|
||
| union { | ||
| __wrap_sender_t __sndr_; | ||
| }; | ||
| __assoc_t __assoc_; | ||
| }; | ||
|
|
||
| template <scope_token _Token, sender _Sender> | ||
| __associate_data(_Token, _Sender&&) -> __associate_data<_Token, _Sender>; | ||
|
|
||
| //////////////////////////////////////////////////////////////////////////////////////////////// | ||
| struct associate_t { | ||
| template <sender _Sender, scope_token _Token> | ||
| auto operator()(_Sender&& __sndr, _Token&& __token) const | ||
| noexcept(__nothrow_constructible_from< | ||
| __associate_data<std::remove_cvref_t<_Token>, _Sender>, | ||
| _Token, | ||
| _Sender | ||
| >) -> __well_formed_sender auto { | ||
| return __make_sexpr<associate_t>( | ||
| __associate_data(static_cast<_Token&&>(__token), static_cast<_Sender&&>(__sndr))); | ||
| } | ||
|
|
||
| template <scope_token _Token> | ||
| STDEXEC_ATTRIBUTE(always_inline) | ||
| auto operator()(_Token&& __token) const noexcept { | ||
| return __closure(*this, static_cast<_Token&&>(__token)); | ||
| } | ||
| }; | ||
|
|
||
| struct __associate_impl : __sexpr_defaults { | ||
| static constexpr auto get_attrs = []<class _Child>(__ignore, const _Child& __child) noexcept { | ||
| return __sync_attrs{__child}; | ||
| }; | ||
|
|
||
| static constexpr auto get_completion_signatures = | ||
| []<class _Sender, class... _Env>(_Sender&&, _Env&&...) noexcept | ||
| -> transform_completion_signatures< | ||
| __completion_signatures_of_t<typename __data_of<_Sender>::__wrap_sender_t>, | ||
| completion_signatures<set_stopped_t()> | ||
| > { | ||
| static_assert(sender_expr_for<_Sender, associate_t>); | ||
| return {}; | ||
| }; | ||
|
|
||
| static constexpr auto get_state = | ||
| []<class _Self, class _Receiver>(_Self&& __self, _Receiver& __rcvr) noexcept( | ||
| (same_as<_Self, std::remove_cvref_t<_Self>> | ||
| || __nothrow_constructible_from<std::remove_cvref_t<_Self>, _Self>) && | ||
| __nothrow_callable< | ||
| connect_t, | ||
| typename std::remove_cvref_t<__data_of<_Self>>::__wrap_sender_t, | ||
| _Receiver | ||
| >) { | ||
| auto&& [_, data] = std::forward<_Self>(__self); | ||
|
|
||
| using associate_data_t = std::remove_cvref_t<decltype(data)>; | ||
| using assoc_t = associate_data_t::__assoc_t; | ||
| using sender_ref_t = associate_data_t::__sender_ref; | ||
|
|
||
| using op_t = connect_result_t<typename sender_ref_t::element_type, _Receiver>; | ||
|
|
||
| struct op_state { | ||
| assoc_t __assoc_; | ||
| union { | ||
| _Receiver* __rcvr_; | ||
| op_t __op_; | ||
| }; | ||
|
|
||
| explicit op_state(std::pair<assoc_t, sender_ref_t> parts, _Receiver r) | ||
| : __assoc_(std::move(parts.first)) { | ||
| if (__assoc_) { | ||
| ::new ((void*) std::addressof(__op_)) | ||
| op_t(connect(std::move(*parts.second), std::move(r))); | ||
| } else { | ||
| __rcvr_ = std::addressof(r); | ||
| } | ||
| } | ||
|
|
||
| explicit op_state(associate_data_t&& ad, _Receiver& r) | ||
| : op_state(std::move(ad).release(), r) { | ||
| } | ||
|
|
||
| explicit op_state(const associate_data_t& ad, _Receiver& r) | ||
| requires copy_constructible<associate_data_t> | ||
| : op_state(associate_data_t(ad).release(), r) { | ||
| } | ||
|
|
||
| ~op_state() { | ||
| if (__assoc_) { | ||
| std::destroy_at(&__op_); | ||
| } | ||
| } | ||
|
|
||
| void __run() noexcept { | ||
| if (__assoc_) { | ||
| stdexec::start(__op_); | ||
| } else { | ||
| stdexec::set_stopped(std::move(*__rcvr_)); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| return op_state{__forward_like<_Self>(data), __rcvr}; | ||
| }; | ||
|
|
||
| static constexpr auto start = [](auto& __state, auto&) noexcept -> void { | ||
| __state.__run(); | ||
| }; | ||
| }; | ||
| } // namespace __associate | ||
|
|
||
| using __associate::associate_t; | ||
|
|
||
| /// @brief The associate sender adaptor, which associates a sender with the | ||
| /// async scope referred to by the given token | ||
| /// @hideinitializer | ||
| inline constexpr associate_t associate{}; | ||
|
|
||
| template <> | ||
| struct __sexpr_impl<associate_t> : __associate::__associate_impl { }; | ||
| } // namespace stdexec |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Copyright (c) 2025 Ian Petersen | ||
| * Copyright (c) 2025 NVIDIA Corporation | ||
| * | ||
| * Licensed under the Apache License Version 2.0 with LLVM Exceptions | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * https://llvm.org/LICENSE.txt | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| #pragma once | ||
|
|
||
| #include "__execution_fwd.hpp" | ||
|
|
||
| #include "__concepts.hpp" | ||
|
|
||
| namespace stdexec { | ||
| ///////////////////////////////////////////////////////////////////////////// | ||
| // [exec.scope.concepts] | ||
| template <class _Assoc> | ||
| concept scope_association = movable<_Assoc> && __nothrow_move_constructible<_Assoc> | ||
| && __nothrow_move_assignable<_Assoc> && default_initializable<_Assoc> | ||
| && requires(const _Assoc assoc) { | ||
| { static_cast<bool>(assoc) } noexcept; | ||
| { assoc.try_associate() } -> same_as<_Assoc>; | ||
| }; | ||
|
|
||
| namespace __scope_concepts { | ||
| struct __test_sender { | ||
| using sender_concept = stdexec::sender_t; | ||
|
|
||
| using completion_signatures = stdexec::completion_signatures< | ||
| stdexec::set_value_t(int), | ||
| stdexec::set_error_t(std::exception_ptr), | ||
| stdexec::set_stopped_t() | ||
| >; | ||
|
|
||
| struct __op { | ||
| using operation_state_concept = stdexec::operation_state_t; | ||
|
|
||
| __op() = default; | ||
| __op(__op&&) = delete; | ||
|
|
||
| void start() & noexcept { | ||
| } | ||
| }; | ||
|
|
||
| template <class _Receiver> | ||
| __op connect(_Receiver) { | ||
| return {}; | ||
| } | ||
| }; | ||
| } // namespace __scope_concepts | ||
|
|
||
| template <class _Token> | ||
| concept scope_token = copyable<_Token> && requires(const _Token token) { | ||
| { token.try_associate() } -> scope_association; | ||
| { token.wrap(__declval<__scope_concepts::__test_sender>()) } -> sender_in<stdexec::env<>>; | ||
| }; | ||
| } // namespace stdexec | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.