diff options
author | Pixel <pixel@nobis-crew.org> | 2012-04-06 11:40:55 -0700 |
---|---|---|
committer | Pixel <pixel@nobis-crew.org> | 2012-04-06 11:40:55 -0700 |
commit | f2cfa1707c713c7bb01d16f4c2c4d96803ea6793 (patch) | |
tree | a722f3ad52ec471520097c5bfbbf2ab8cb4e2603 /includes/TaskMan.h | |
parent | 7fbb819bf6f590bf2337d2277f77487ef7a5ce86 (diff) |
Making it simplier to register a task and wait for it. Also renamed createTask to registerTask, which makes way more sense.
Diffstat (limited to 'includes/TaskMan.h')
-rw-r--r-- | includes/TaskMan.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/includes/TaskMan.h b/includes/TaskMan.h index 68aaaf6..35e60ed 100644 --- a/includes/TaskMan.h +++ b/includes/TaskMan.h @@ -20,6 +20,7 @@ class TaskScheduler; namespace Events { class Async; +class TaskEvent; }; @@ -54,10 +55,12 @@ class TaskMan { } bool stopped() { return m_stopped; } template<class T> - static T * createTask(T * t, Task * stick = NULL) { TaskMan::registerTask(t, stick); return t; } + static T * registerTask(T * t, Task * stick = NULL) { TaskMan::iRegisterTask(t, stick, NULL); return t; } + template<class T> + static T * registerTask(T * t, Events::TaskEvent * event) { TaskMan::iRegisterTask(t, NULL, event); return t; } private: - static void registerTask(Task * t, Task * stick); + static void iRegisterTask(Task * t, Task * stick, Events::TaskEvent * event); void * getStack(); void freeStack(void * stack); void addToPending(Task * t); @@ -68,8 +71,6 @@ class TaskMan { #endif friend class Task; friend class TaskScheduler; - template<class 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; |