forked from OctaForge/libostd
make dispatcher a coroutine (that way main can do its thing)
This commit is contained in:
parent
cef3c96bdb
commit
5e2891c806
|
@ -128,20 +128,23 @@ public:
|
||||||
basic_simple_coroutine_scheduler(
|
basic_simple_coroutine_scheduler(
|
||||||
size_t ss = TR::default_size(),
|
size_t ss = TR::default_size(),
|
||||||
size_t cs = basic_stack_pool<TR, Protected>::DEFAULT_CHUNK_SIZE
|
size_t cs = basic_stack_pool<TR, Protected>::DEFAULT_CHUNK_SIZE
|
||||||
): p_coros(), p_stacks(ss, cs) {}
|
):
|
||||||
|
p_stacks(ss, cs),
|
||||||
|
p_dispatcher([this](auto yield_main) {
|
||||||
|
this->dispatch(yield_main);
|
||||||
|
}, p_stacks.get_allocator()),
|
||||||
|
p_coros()
|
||||||
|
{}
|
||||||
|
|
||||||
template<typename F, typename ...A>
|
template<typename F, typename ...A>
|
||||||
auto start(F &&func, A &&...args) -> std::result_of_t<F(A...)> {
|
auto start(F &&func, A &&...args) -> std::result_of_t<F(A...)> {
|
||||||
using R = std::result_of_t<F(A...)>;
|
using R = std::result_of_t<F(A...)>;
|
||||||
if constexpr(std::is_same_v<R, void>) {
|
if constexpr(std::is_same_v<R, void>) {
|
||||||
spawn(std::forward<F>(func), std::forward<F>(args)...);
|
func(std::forward<A>(args)...);
|
||||||
dispatch();
|
finish();
|
||||||
} else {
|
} else {
|
||||||
R ret;
|
auto ret = func(std::forward<A>(args)...);
|
||||||
spawn([lfunc = std::forward<F>(func), &ret](A &&...args) {
|
finish();
|
||||||
ret = std::move(lfunc(std::forward<A>(args)...));
|
|
||||||
}, std::forward<A>(args)...);
|
|
||||||
dispatch();
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -163,12 +166,18 @@ public:
|
||||||
|
|
||||||
void yield() {
|
void yield() {
|
||||||
auto ctx = coroutine_context::current();
|
auto ctx = coroutine_context::current();
|
||||||
|
if (!ctx) {
|
||||||
|
/* yield from main means go to dispatcher and call first task */
|
||||||
|
p_idx = p_coros.begin();
|
||||||
|
p_dispatcher();
|
||||||
|
return;
|
||||||
|
}
|
||||||
coro *c = dynamic_cast<coro *>(ctx);
|
coro *c = dynamic_cast<coro *>(ctx);
|
||||||
if (c) {
|
if (c) {
|
||||||
typename coro::yield_type{*c}();
|
typename coro::yield_type{*c}();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
throw std::runtime_error{"no task to yield"};
|
throw std::runtime_error{"attempt to yield outside coroutine"};
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
|
@ -182,10 +191,15 @@ private:
|
||||||
using coroutine<void()>::coroutine;
|
using coroutine<void()>::coroutine;
|
||||||
};
|
};
|
||||||
|
|
||||||
void dispatch() {
|
void dispatch(typename coro::yield_type &yield_main) {
|
||||||
while (!p_coros.empty()) {
|
while (!p_coros.empty()) {
|
||||||
if (p_idx == p_coros.end()) {
|
if (p_idx == p_coros.end()) {
|
||||||
p_idx = p_coros.begin();
|
/* we're at the end; it's time to return to main and
|
||||||
|
* continue there (potential yield from main results
|
||||||
|
* in continuing from this point with the first task)
|
||||||
|
*/
|
||||||
|
yield_main();
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
(*p_idx)();
|
(*p_idx)();
|
||||||
if (!*p_idx) {
|
if (!*p_idx) {
|
||||||
|
@ -196,8 +210,19 @@ private:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::list<coro> p_coros;
|
void finish() {
|
||||||
|
/* main has finished, but there might be either suspended or never
|
||||||
|
* started tasks in the queue; dispatch until there are none left
|
||||||
|
*/
|
||||||
|
while (!p_coros.empty()) {
|
||||||
|
p_idx = p_coros.begin();
|
||||||
|
p_dispatcher();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
basic_stack_pool<TR, Protected> p_stacks;
|
basic_stack_pool<TR, Protected> p_stacks;
|
||||||
|
coro p_dispatcher;
|
||||||
|
std::list<coro> p_coros;
|
||||||
typename std::list<coro>::iterator p_idx = p_coros.end();
|
typename std::list<coro>::iterator p_idx = p_coros.end();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue