Browse Source
Merge pull request #4850 from ReinUsesLisp/fiber-ptr-ref
common/fiber: Take shared_ptr<Fiber> by copy in YieldTo
pull/15/merge
LC
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/common/fiber.cpp
-
src/common/fiber.h
|
|
|
@ -91,7 +91,7 @@ void Fiber::Rewind() { |
|
|
|
SwitchToFiber(impl->rewind_handle); |
|
|
|
} |
|
|
|
|
|
|
|
void Fiber::YieldTo(std::shared_ptr<Fiber>& from, std::shared_ptr<Fiber>& to) { |
|
|
|
void Fiber::YieldTo(std::shared_ptr<Fiber> from, std::shared_ptr<Fiber> to) { |
|
|
|
ASSERT_MSG(from != nullptr, "Yielding fiber is null!"); |
|
|
|
ASSERT_MSG(to != nullptr, "Next fiber is null!"); |
|
|
|
to->guard.lock(); |
|
|
|
@ -199,7 +199,7 @@ 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(std::shared_ptr<Fiber> from, std::shared_ptr<Fiber> to) { |
|
|
|
ASSERT_MSG(from != nullptr, "Yielding fiber is null!"); |
|
|
|
ASSERT_MSG(to != nullptr, "Next fiber is null!"); |
|
|
|
to->guard.lock(); |
|
|
|
|
|
|
|
@ -46,7 +46,7 @@ public: |
|
|
|
|
|
|
|
/// Yields control from Fiber 'from' to Fiber 'to' |
|
|
|
/// Fiber 'from' must be the currently running fiber. |
|
|
|
static void YieldTo(std::shared_ptr<Fiber>& from, std::shared_ptr<Fiber>& to); |
|
|
|
static void YieldTo(std::shared_ptr<Fiber> from, std::shared_ptr<Fiber> to); |
|
|
|
[[nodiscard]] static std::shared_ptr<Fiber> ThreadToFiber(); |
|
|
|
|
|
|
|
void SetRewindPoint(std::function<void(void*)>&& rewind_func, void* start_parameter); |
|
|
|
|