CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Common/Fiber: Correct f_context based Fibers.

master
Fernando Sahmkow 2020-02-26 14:39:27 +07:00
parent 8f6ffcd5c4
commit 7d2b1a6ec4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/fiber.cpp
Unescape Escape View File

@ -81,10 +81,10 @@ std::shared_ptr<Fiber> Fiber::ThreadToFiber() {
} }
#else #else
constexpr std::size_t default_stack_size = 1024 * 1024 * 4; // 4MB constexpr std::size_t default_stack_size = 1024 * 1024; // 4MB
struct alignas(64) Fiber::FiberImpl { struct Fiber::FiberImpl {
std::array<u8, default_stack_size> stack; alignas(64) std::array<u8, default_stack_size> stack;
boost::context::detail::fcontext_t context; boost::context::detail::fcontext_t context;
}; };
@ -106,8 +106,10 @@ Fiber::Fiber(std::function<void(void*)>&& entry_point_func, void* start_paramete
: guard{}, entry_point{std::move(entry_point_func)}, start_parameter{start_parameter}, : guard{}, entry_point{std::move(entry_point_func)}, start_parameter{start_parameter},
previous_fiber{} { previous_fiber{} {
impl = std::make_unique<FiberImpl>(); impl = std::make_unique<FiberImpl>();
impl->context = boost::context::detail::make_fcontext(impl->stack.data(), impl->stack.size(), void* stack_start =
FiberStartFunc); static_cast<void*>(static_cast<std::uintptr_t>(impl->stack.data()) + default_stack_size);
impl->context =
boost::context::detail::make_fcontext(stack_start, impl->stack.size(), FiberStartFunc);
} }
Fiber::Fiber() { Fiber::Fiber() {
@ -136,7 +138,7 @@ void Fiber::YieldTo(std::shared_ptr<Fiber> from, std::shared_ptr<Fiber> to) {
ASSERT_MSG(to != nullptr, "Next fiber is null!"); ASSERT_MSG(to != nullptr, "Next fiber is null!");
to->guard.lock(); to->guard.lock();
to->previous_fiber = from; to->previous_fiber = from;
auto transfer = boost::context::detail::jump_fcontext(to->impl->context, nullptr); auto transfer = boost::context::detail::jump_fcontext(to->impl->context, to.get());
auto previous_fiber = from->previous_fiber; auto previous_fiber = from->previous_fiber;
ASSERT(previous_fiber != nullptr); ASSERT(previous_fiber != nullptr);
previous_fiber->impl->context = transfer.fctx; previous_fiber->impl->context = transfer.fctx;