diff options
author | Nao Pross <naopross@thearcway.org> | 2019-01-23 15:06:02 +0100 |
---|---|---|
committer | Nao Pross <naopross@thearcway.org> | 2019-01-23 15:06:02 +0100 |
commit | 3c9184a2e3eb3583dfd2d6ff1ed60903aac9ba78 (patch) | |
tree | 817bd4de9c9f38861609674e19a39885d3ea0340 /engine | |
parent | Use custom comparison for core::prioritize (instead of std::less) (diff) | |
download | flatland-3c9184a2e3eb3583dfd2d6ff1ed60903aac9ba78.tar.gz flatland-3c9184a2e3eb3583dfd2d6ff1ed60903aac9ba78.zip |
Make job hold RAII pointers that can expire, update test
Note: does not work, idk why
Diffstat (limited to 'engine')
-rw-r--r-- | engine/include/core/priority.hpp | 17 | ||||
-rw-r--r-- | engine/include/core/task.hpp | 19 | ||||
-rw-r--r-- | engine/task.cpp | 24 |
3 files changed, 45 insertions, 15 deletions
diff --git a/engine/include/core/priority.hpp b/engine/include/core/priority.hpp index 773b2f7..1219d26 100644 --- a/engine/include/core/priority.hpp +++ b/engine/include/core/priority.hpp @@ -1,5 +1,6 @@ #pragma once +#include <memory> #include <set> namespace flat { @@ -32,8 +33,20 @@ namespace flat { return lhs.priority() < rhs.priority(); } - bool operator()(const prioritized * const& lhs, const prioritized * const& rhs) { - return lhs->priority() < rhs->priority(); + bool operator()(const std::weak_ptr<prioritized> lhs, const std::weak_ptr<prioritized>& rhs) { + if (auto l = lhs.lock()) { + if (auto r = rhs.lock()) { + // if both valid, check their priority + // in case they are the same, left is prioritized + return l->priority() < r->priority(); + } else { + // if right is expired, left is prioritized + return true; + } + } else { + // if left is expired, the right is prioritized + return false; + } } }; diff --git a/engine/include/core/task.hpp b/engine/include/core/task.hpp index 90e3d97..d886fcd 100644 --- a/engine/include/core/task.hpp +++ b/engine/include/core/task.hpp @@ -3,26 +3,29 @@ #include "priority.hpp" #include <functional> -#include <set> +#include <memory> namespace flat { namespace core { + // forward decl + class job; + class task; + class task : public prioritized { public: + using callback = std::function<void(void)>; + task() = delete; - task(std::function<void()> callback, priority_t p = priority_t::none); + task(callback f, priority_t p = priority_t::none); inline void operator()() const { m_callback(); } private: - std::function<void()> m_callback; + callback m_callback; }; - struct job : public queue<task> { - inline auto add_task(task t) { - this->insert(t); - } - + struct job : private queue<std::weak_ptr<task>> { + std::shared_ptr<task> make_task(task::callback f, priority_t p = priority_t::none); void invoke_tasks(); }; } diff --git a/engine/task.cpp b/engine/task.cpp index 760b1b9..f2b6058 100644 --- a/engine/task.cpp +++ b/engine/task.cpp @@ -1,17 +1,31 @@ #include "core/task.hpp" #include <functional> +#include <memory> namespace flat { namespace core { - task::task(std::function<void()> callback, priority_t p) - : m_callback(callback) {} + task::task(task::callback f, priority_t p) + : m_callback(f) {} + + std::shared_ptr<task> job::make_task(task::callback f, priority_t p) { + auto shared = std::make_shared<task>(f, p); + insert(shared); + return shared; + } void job::invoke_tasks() { - for (const task& t : *this) { - t(); - } + std::for_each(begin(), end(), [&](auto tp) { + // check that the task has not expired + if (auto t = tp.lock()) { + // run task + std::invoke(*t); + } else { + // delete task + erase(tp); + } + }); } } } |