Commit b8520e0d authored by Andrii Grynenko's avatar Andrii Grynenko Committed by facebook-github-bot-1

Fix Python FiberTask to properly init/reset Python thread state

Reviewed By: alikhtarov

Differential Revision: D2813735

fb-gh-sync-id: ab3c3e18618ed8bf15f478bcfca008786834e65c
parent 635af78d
......@@ -182,6 +182,9 @@ void Fiber::fiberFunc() {
}
intptr_t Fiber::preempt(State state) {
intptr_t ret;
auto preemptImpl = [&]() mutable {
DCHECK_EQ(fiberManager_.activeFiber_, this);
DCHECK_EQ(state_, RUNNING);
DCHECK_NE(state, RUNNING);
......@@ -191,11 +194,18 @@ intptr_t Fiber::preempt(State state) {
recordStackPosition();
auto ret = jumpContext(&fcontext_, &fiberManager_.mainContext_, 0);
ret = jumpContext(&fcontext_, &fiberManager_.mainContext_, 0);
DCHECK_EQ(fiberManager_.activeFiber_, this);
DCHECK_EQ(state_, READY_TO_RUN);
state_ = RUNNING;
};
if (fiberManager_.preemptRunner_) {
fiberManager_.preemptRunner_->run(std::ref(preemptImpl));
} else {
preemptImpl();
}
return ret;
}
......
......@@ -121,6 +121,10 @@ void FiberManager::setObserver(ExecutionObserver* observer) {
observer_ = observer;
}
void FiberManager::setPreemptRunner(InlineFunctionRunner* preemptRunner) {
preemptRunner_ = preemptRunner;
}
void FiberManager::doFibersPoolResizing() {
while (fibersAllocated_ > maxFibersActiveLastPeriod_ &&
fibersPoolSize_ > options_.maxFibersPoolSize) {
......
......@@ -48,6 +48,16 @@ template <typename T>
class LocalType {
};
class InlineFunctionRunner {
public:
virtual ~InlineFunctionRunner() {}
/**
* func must be executed inline and only once.
*/
virtual void run(std::function<void()> func) = 0;
};
/**
* @class FiberManager
* @brief Single-threaded task execution engine.
......@@ -260,6 +270,11 @@ class FiberManager : public ::folly::Executor {
*/
void setObserver(ExecutionObserver* observer);
/**
* Setup fibers preempt runner.
*/
void setPreemptRunner(InlineFunctionRunner* preemptRunner);
/**
* Returns an estimate of the number of fibers which are waiting to run (does
* not include fibers or tasks scheduled remotely).
......@@ -387,6 +402,11 @@ class FiberManager : public ::folly::Executor {
*/
std::function<void()> immediateFunc_;
/**
* Preempt runner.
*/
InlineFunctionRunner* preemptRunner_{nullptr};
/**
* Fiber's execution observer.
*/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment