OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

subtask registration in make_task

master
Daniel Kolesa 2018-04-22 21:14:18 +02:00
parent d4037f9c1d
commit 568a51c489
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ostd/build/make.hh
View File

@ -228,7 +228,6 @@ struct make_task {
)); ));
} }
); );
p_coro->resume();
} }
bool done() const { bool done() const {
@ -239,6 +238,21 @@ struct make_task {
p_coro->resume(); p_coro->resume();
} }
void add_task(std::future<void> f) {
for (;;) {
auto fs = f.wait_for(std::chrono::seconds(0));
if (fs != std::future_status::ready) {
/* keep yielding until ready */
auto &cc = static_cast<coroutine<void()> &>(
*coroutine_context::current()
);
(coroutine<void()>::yield_type(cc))();
} else {
break;
}
}
}
private: private:
std::unique_ptr<coroutine<void()>> p_coro{}; std::unique_ptr<coroutine<void()>> p_coro{};
}; };
@ -255,26 +269,14 @@ struct make {
} }
void push_task(std::function<void()> func) { void push_task(std::function<void()> func) {
auto f = p_tpool.push([func = std::move(func), this]() { p_current->add_task(p_tpool.push([func = std::move(func), this]() {
func(); func();
{ {
std::lock_guard<std::mutex> l{p_mtx}; std::lock_guard<std::mutex> l{p_mtx};
p_avail = true; p_avail = true;
} }
p_cond.notify_one(); p_cond.notify_one();
}); }));
for (;;) {
auto fs = f.wait_for(std::chrono::seconds(0));
if (fs != std::future_status::ready) {
/* keep yielding until ready */
auto &cc = static_cast<coroutine<void()> &>(
*coroutine_context::current()
);
(coroutine<void()>::yield_type(cc))();
} else {
break;
}
}
} }
make_rule &rule(string_range tgt) { make_rule &rule(string_range tgt) {
@ -320,6 +322,7 @@ private:
try { try {
auto t = std::move(tasks.front()); auto t = std::move(tasks.front());
tasks.pop(); tasks.pop();
p_current = &t;
t.resume(); t.resume();
if (!t.done()) { if (!t.done()) {
/* still not dead, re-push */ /* still not dead, re-push */
@ -332,6 +335,7 @@ private:
auto t = std::move(tasks.front()); auto t = std::move(tasks.front());
tasks.pop(); tasks.pop();
while (!t.done()) { while (!t.done()) {
p_current = &t;
t.resume(); t.resume();
} }
} catch (make_error const &) { } catch (make_error const &) {
@ -393,6 +397,8 @@ private:
} }
if (rl && (rl->action() || detail::check_exec(tname, rdeps))) { if (rl && (rl->action() || detail::check_exec(tname, rdeps))) {
make_task t{tname, std::move(rdeps), *rl}; make_task t{tname, std::move(rdeps), *rl};
p_current = &t;
t.resume();
if (!t.done()) { if (!t.done()) {
p_waiting.top()->push(std::move(t)); p_waiting.top()->push(std::move(t));
} }
@ -473,6 +479,7 @@ private:
std::mutex p_mtx{}; std::mutex p_mtx{};
std::condition_variable p_cond{}; std::condition_variable p_cond{};
std::stack<std::queue<make_task> *> p_waiting{}; std::stack<std::queue<make_task> *> p_waiting{};
make_task *p_current = nullptr;
bool p_avail = false; bool p_avail = false;
}; };