删除 awaitable_detached<> 类。减少代码重复 #40
Merged
Conversation
This file contains 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
|
少了这么多代码 |
|
是的 |
EvinceMoi
reviewed
Oct 18, 2024
include/ucoro/awaitable.hpp
Outdated
| @@ -371,19 +281,28 @@ namespace ucoro | |||
| { | |||
| using promise_type = awaitable_promise<T>; | |||
|
|
|||
| explicit awaitable(std::coroutine_handle<promise_type> h) : current_coro_handle_(h) | |||
| explicit awaitable(std::coroutine_handle<promise_type> h) | |||
| : current_coro_handle_(h) | |||
EvinceMoi
reviewed
Oct 18, 2024
microcai
force-pushed
the
drop_awaitable_detached
branch
from
a3c3853 to
44b73eb
Compare
microcai
force-pushed
the
drop_awaitable_detached
branch
3 times, most recently
from
713bad9 to
c836bc2
Compare
awaitable_detached 自从支持自身被 co_await 后，代码变得越来越像 awaitable<T> 相似度极高。 既然如此，不如合并代码。 detach 的时候，创建一个新的 awaitable<>。 有没有 detach 其实根本原因在于有没有被 co_await. 因此，在 析构函数里，判断是不是 done() 即可知道有没有被 co_await 过了。 如果没有被 co_await 过，则是 detach 模式。在析构里把协程给 resume 起来。 由于析构的时候没有进行 destroy 操作，因此需要在 final_awaiter 里进行清理。 现在 final_awaiter<T> 的部分清理逻辑本身就是从 awaitable_detached::promise_type::final_awaiter 里合并进来的。 同时detach 模式使用 awaitable<T> 后，也修正了 detach 模式下吞异常的问题。
microcai
force-pushed
the
drop_awaitable_detached
branch
from
c836bc2 to
0898929
Compare
EvinceMoi
approved these changes
Oct 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
awaitable_detached 自从支持自身被 co_await 后，代码变得越来越像 awaitable
相似度极高。
既然如此，不如合并代码。 detach 的时候，创建一个新的 awaitable<>。
有没有 detach 其实根本原因在于有没有被 co_await.
因此，在 析构函数里，判断是不是 done() 即可知道有没有被 co_await 过了。
如果没有被 co_await 过，则是 detach 模式。在析构里把协程给 resume 起来。
由于析构的时候没有进行 destroy 操作，因此需要在 final_awaiter 里进行清理。
现在 final_awaiter 的部分清理逻辑本身就是从
awaitable_detached::promise_type::final_awaiter 里合并进来的。
同时detach 模式使用 awaitable 后，也修正了 detach 模式下吞异常的问题。