diff options
author | bunnei <[email protected]> | 2021-03-07 13:46:53 -0800 |
---|---|---|
committer | bunnei <[email protected]> | 2021-03-07 13:46:53 -0800 |
commit | 8f7eb194af199ef7a3b225399e8d6fede27234f2 (patch) | |
tree | 5b4bc3648e7dc9abf39312cb62e55e8feba92ae1 /src/common/fiber.cpp | |
parent | 68ffac250ae2d1c2d5d961304d2c61f6755ab033 (diff) | |
download | yuzu-android-8f7eb194af199ef7a3b225399e8d6fede27234f2.tar.gz yuzu-android-8f7eb194af199ef7a3b225399e8d6fede27234f2.zip |
common: Fiber: use a reference for YieldTo.
- Fixes another small leak.
Diffstat (limited to 'src/common/fiber.cpp')
-rw-r--r-- | src/common/fiber.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/common/fiber.cpp b/src/common/fiber.cpp index b06fdc258..39532ff58 100644 --- a/src/common/fiber.cpp +++ b/src/common/fiber.cpp @@ -116,16 +116,14 @@ void Fiber::Rewind() { boost::context::detail::jump_fcontext(impl->rewind_context, this); } -void Fiber::YieldTo(std::weak_ptr<Fiber> weak_from, std::shared_ptr<Fiber> to) { - ASSERT_MSG(to != nullptr, "Next fiber is null!"); +void Fiber::YieldTo(std::weak_ptr<Fiber> weak_from, Fiber& to) { + to.impl->guard.lock(); + to.impl->previous_fiber = weak_from.lock(); - to->impl->guard.lock(); - to->impl->previous_fiber = weak_from.lock(); - - auto transfer = boost::context::detail::jump_fcontext(to->impl->context, to.get()); + auto transfer = boost::context::detail::jump_fcontext(to.impl->context, &to); // "from" might no longer be valid if the thread was killed - if (auto from = weak_from.lock(); from != nullptr) { + if (auto from = weak_from.lock()) { ASSERT(from->impl->previous_fiber != nullptr); from->impl->previous_fiber->impl->context = transfer.fctx; from->impl->previous_fiber->impl->guard.unlock(); |