--- a/TaskManager/kernel/schedule/Scheduler.h	Sun Nov 15 02:05:33 2009 +0900
+++ b/TaskManager/kernel/schedule/Scheduler.h	Sun Nov 15 03:34:18 2009 +0900
@@ -1,7 +1,7 @@
 #ifndef INCLUDED_SCHEDULER
 #define INCLUDED_SCHEDULER
 
-#include "stdlib.h"
+#include <stdlib.h>
 #include "base.h"
 #include "TaskList.h"
 #include "ListData.h"
@@ -10,7 +10,6 @@
 #include "SchedTaskList.h"
 #include "MemList.h"
 #include "MemHash.h"
-#include "TaskManagerImpl.h"
 
 
 #define MAX_USER_TASK 32
@@ -22,10 +21,15 @@
 class SchedTaskBase;
 class SchedTask;
 class SchedTaskList;
-class TaskManager;
+class TaskManagerImpl;
+class HTask;
 
 typedef int (*TaskObjectRun)(SchedTask* smanager, void* r, void *w);
 
+extern "C" {
+    extern long random();
+}
+
 class Scheduler {
 public:
     virtual ~Scheduler();
@@ -122,18 +126,16 @@
 
     /* manager */
 
-    void set_manager(TaskManagerImpl *m) { manager = m; }
+    void set_manager(TaskManagerImpl *m) { manager = m; };
 
     // user
-    HTaskPtr create_task(int cmd) { return manager->create_task(cmd); }
-    void set_task_depend(HTaskPtr master, HTaskPtr slave) {
-	manager->set_task_depend(master, slave) ;
-    }
-    void spawn_task(HTaskPtr t) { manager->spawn_task(t); }
-    void set_task_cpu(HTaskPtr t, CPU_TYPE cpu) { manager->set_task_cpu(t,cpu); }
-    void* allocate(int size,int align) { return manager->allocate(size,align); }
-    int get_random() { return random(); }
-    Scheduler *get_scheduler() { return this; }
+    HTask * create_task(int cmd);
+    void set_task_depend(HTask * master, HTask * slave) ;
+    void spawn_task(HTask * t) ;
+    void set_task_cpu(HTask * t, CPU_TYPE cpu) ;
+    void* allocate(int size,int align) ;
+    long get_random() ;
+    Scheduler *get_scheduler() { return this; };
 
 
 };