diff options
author | bunnei <bunneidev@gmail.com> | 2021-03-05 08:59:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-05 08:59:06 +0100 |
commit | 34a3ee16319ddcfe855249c2fe48b6e7b6441526 (patch) | |
tree | 24ff38e19a77b60201ee028b6abb476d82fc16d0 /src/common/fiber.cpp | |
parent | Merge pull request #5989 from ReinUsesLisp/cmdpool (diff) | |
parent | core: Switch to unique_ptr for usage of Common::Fiber. (diff) | |
download | yuzu-34a3ee16319ddcfe855249c2fe48b6e7b6441526.tar yuzu-34a3ee16319ddcfe855249c2fe48b6e7b6441526.tar.gz yuzu-34a3ee16319ddcfe855249c2fe48b6e7b6441526.tar.bz2 yuzu-34a3ee16319ddcfe855249c2fe48b6e7b6441526.tar.lz yuzu-34a3ee16319ddcfe855249c2fe48b6e7b6441526.tar.xz yuzu-34a3ee16319ddcfe855249c2fe48b6e7b6441526.tar.zst yuzu-34a3ee16319ddcfe855249c2fe48b6e7b6441526.zip |
Diffstat (limited to 'src/common/fiber.cpp')
-rw-r--r-- | src/common/fiber.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/common/fiber.cpp b/src/common/fiber.cpp index 3c1eefcb7..b8e98b12a 100644 --- a/src/common/fiber.cpp +++ b/src/common/fiber.cpp @@ -24,7 +24,7 @@ struct Fiber::FiberImpl { std::function<void(void*)> rewind_point; void* rewind_parameter{}; void* start_parameter{}; - std::shared_ptr<Fiber> previous_fiber; + Fiber* previous_fiber; bool is_thread_fiber{}; bool released{}; @@ -47,7 +47,7 @@ void Fiber::Start(boost::context::detail::transfer_t& transfer) { ASSERT(impl->previous_fiber != nullptr); impl->previous_fiber->impl->context = transfer.fctx; impl->previous_fiber->impl->guard.unlock(); - impl->previous_fiber.reset(); + impl->previous_fiber = nullptr; impl->entry_point(impl->start_parameter); UNREACHABLE(); } @@ -116,20 +116,20 @@ void Fiber::Rewind() { boost::context::detail::jump_fcontext(impl->rewind_context, this); } -void Fiber::YieldTo(std::shared_ptr<Fiber> from, std::shared_ptr<Fiber> to) { +void Fiber::YieldTo(Fiber* from, Fiber* to) { ASSERT_MSG(from != nullptr, "Yielding fiber is null!"); ASSERT_MSG(to != nullptr, "Next fiber is null!"); to->impl->guard.lock(); to->impl->previous_fiber = from; - auto transfer = boost::context::detail::jump_fcontext(to->impl->context, to.get()); + auto transfer = boost::context::detail::jump_fcontext(to->impl->context, to); ASSERT(from->impl->previous_fiber != nullptr); from->impl->previous_fiber->impl->context = transfer.fctx; from->impl->previous_fiber->impl->guard.unlock(); - from->impl->previous_fiber.reset(); + from->impl->previous_fiber = nullptr; } -std::shared_ptr<Fiber> Fiber::ThreadToFiber() { - std::shared_ptr<Fiber> fiber = std::shared_ptr<Fiber>{new Fiber()}; +std::unique_ptr<Fiber> Fiber::ThreadToFiber() { + std::unique_ptr<Fiber> fiber = std::unique_ptr<Fiber>{new Fiber()}; fiber->impl->guard.lock(); fiber->impl->is_thread_fiber = true; return fiber; |