Working on taskman...

1 files changed, 3 insertions, 23 deletions

diff --git a/lib/Task.cc b/lib/Task.cc
index b54402f..4f36c7b 100644
--- a/lib/Task.cc
+++ b/lib/Task.cc
@@ -50,7 +50,7 @@ void Task::Suspend() throw (GeneralException) {
 }
 
 void Task::WaitFor(Handle * h, int flags) {
-    w4ha.push_back(w4ha_t(h, flags));
+    TaskMan::WaitFor(h, this, flags);
 }
 
 void Task::WaitFor(Task * t) {
@@ -58,31 +58,11 @@ void Task::WaitFor(Task * t) {
 }
 
 void Task::WaitFor(pid_t p) {
-    w4pr.push_back(w4pr_t(p));
+    TaskMan::WaitFor(p, this);
 }
 
 void Task::WaitFor(timeval t, int flags) {
-    w4to.push_back(w4to_t(t, flags));
-}
-
-bool Task::WaitingFor(Handle * ha) {
-    vector<w4ha_t>::iterator p;
-    
-    for (p = w4ha.begin(); p && (p != w4ha.end()); p++) {
-	if (p->ha == ha) return true;
-    }
-    
-    return false;
-}
-
-bool Task::WaitingFor(pid_t pr) {
-    vector<w4pr_t>::iterator p;
-    
-    for (p = w4pr.begin(); p && (p != w4pr.end()); p++) {
-	if (p->pr == pr) return true;
-    }
-    
-    return false;
+    TaskMan::WaitFor(t, this, flags);
 }
 
 void Task::SetBurst() {