diff options
| author | Pixel <pixel@nobis-crew.org> | 2011-11-16 18:11:21 -0800 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2011-11-16 18:11:21 -0800 |
| commit | 18beadfdfb761e6a54be6093e65b66a431bacc19 (patch) | |
| tree | cd8d8cd01e60b41741231bd760fb3892b77af9f3 | |
| parent | 1d796e6cf639354614f1152baab65d317271c357 (diff) | |
And with the new TaskScheduler system, let's add a way for a new task to stick on another one's thread, if needed. (and it is)
| -rw-r--r-- | includes/TaskMan.h | 6 | ||||
| -rw-r--r-- | src/TaskMan.cc | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/includes/TaskMan.h b/includes/TaskMan.h index afc2b8a..b9897e4 100644 --- a/includes/TaskMan.h +++ b/includes/TaskMan.h @@ -34,7 +34,7 @@ class TaskMan { static void stop(); void stopMe() { m_stopped = true; } private: - static void registerTask(Task * t); + static void registerTask(Task * t, Task * stick); void addToPending(Task * t); #ifndef _WIN32 coro_context m_returnContext; @@ -44,7 +44,7 @@ class TaskMan { friend class Task; friend class TaskScheduler; template<class T> - friend T * createTask(T * t); + friend T * createTask(T * t, Task * stick = NULL); struct taskHasher { size_t operator()(const Task * t) const { return reinterpret_cast<uintptr_t>(t); } }; typedef gnu::hash_set<Task *, taskHasher> taskHash_t; taskHash_t m_tasks, m_signaledTasks; @@ -56,6 +56,6 @@ class TaskMan { }; template<class T> -T * createTask(T * t) { TaskMan::registerTask(t); Assert(dynamic_cast<Task *>(t)); return t; } +T * createTask(T * t, Task * stick = NULL) { TaskMan::registerTask(t, stick); Assert(dynamic_cast<Task *>(t)); return t; } }; diff --git a/src/TaskMan.cc b/src/TaskMan.cc index 8c99e52..630d845 100644 --- a/src/TaskMan.cc +++ b/src/TaskMan.cc @@ -216,8 +216,14 @@ void Balau::TaskMan::mainLoop() { Printer::elog(E_TASK, "TaskManager stopping."); } -void Balau::TaskMan::registerTask(Balau::Task * t) { - s_scheduler.registerTask(t); +void Balau::TaskMan::registerTask(Balau::Task * t, Balau::Task * stick) { + if (stick) { + TaskMan * tm = stick->getMyTaskMan(); + tm->addToPending(t); + tm->m_evt.send(); + } else { + s_scheduler.registerTask(t); + } } void Balau::TaskMan::addToPending(Balau::Task * t) { |