# HG changeset patch # User yutaka@localhost.localdomain # Date 1274782301 -32400 # Node ID dc3621ee7816debad95bf846e4260b4fa3726c95 # Parent bbb0021ff5ce11abff10133488d1623d7120c3c2 fix diff -r bbb0021ff5ce -r dc3621ee7816 TaskManager/Cell/CellTaskManagerImpl.cc --- a/TaskManager/Cell/CellTaskManagerImpl.cc Tue May 25 18:23:27 2010 +0900 +++ b/TaskManager/Cell/CellTaskManagerImpl.cc Tue May 25 19:11:41 2010 +0900 @@ -41,7 +41,7 @@ } // PPE 側の管理をする Manager - ppeManager = new FifoTaskManagerImpl(machineNum, this); + ppeManager = new FifoTaskManagerImpl(machineNum); // 大半のTaskQueueInfoは、共有される MainScheduler *mscheduler = new MainScheduler; ppeManager->init(mscheduler, this); @@ -253,6 +253,6 @@ TaskManagerImpl* create_impl(int num) { - return new CellTaskManagerImpl(num,0); + return new CellTaskManagerImpl(num); } #endif // __CERIUM_CELL diff -r bbb0021ff5ce -r dc3621ee7816 TaskManager/Cell/spe/SpeTaskManagerImpl.h --- a/TaskManager/Cell/spe/SpeTaskManagerImpl.h Tue May 25 18:23:27 2010 +0900 +++ b/TaskManager/Cell/spe/SpeTaskManagerImpl.h Tue May 25 19:11:41 2010 +0900 @@ -25,7 +25,7 @@ void set_task_depend(HTaskPtr master, HTaskPtr slave); void spawn_task(HTaskPtr); void set_task_cpu(HTaskPtr, CPU_TYPE); - + void polling() {} }; diff -r bbb0021ff5ce -r dc3621ee7816 TaskManager/Fifo/FifoTaskManagerImpl.cc --- a/TaskManager/Fifo/FifoTaskManagerImpl.cc Tue May 25 18:23:27 2010 +0900 +++ b/TaskManager/Fifo/FifoTaskManagerImpl.cc Tue May 25 19:11:41 2010 +0900 @@ -40,6 +40,7 @@ ppeTaskList = new TaskListInfo; schedTaskManager = new SchedTask(); + others = 0; schedTaskManager->init(0,0,0,mainScheduler); } @@ -66,6 +67,7 @@ ppeTaskList = new TaskListInfo; schedTaskManager = new SchedTask(); + others = tm; schedTaskManager->init(0,0,0,mainScheduler); } diff -r bbb0021ff5ce -r dc3621ee7816 TaskManager/kernel/ppe/TaskManagerImpl.cc --- a/TaskManager/kernel/ppe/TaskManagerImpl.cc Tue May 25 18:23:27 2010 +0900 +++ b/TaskManager/kernel/ppe/TaskManagerImpl.cc Tue May 25 19:11:41 2010 +0900 @@ -17,8 +17,8 @@ { } -TaskManagerImpl::TaskManagerImpl(int num, TaskManagerImpl* o) - : machineNum(num), others(o) { +TaskManagerImpl::TaskManagerImpl(int num) + : machineNum(num){ activeTaskQueue = new HTaskInfo(); waitTaskQueue = new HTaskInfo(); htaskImpl = waitTaskQueue ; // any HTaskInfo diff -r bbb0021ff5ce -r dc3621ee7816 TaskManager/kernel/ppe/TaskManagerImpl.h --- a/TaskManager/kernel/ppe/TaskManagerImpl.h Tue May 25 18:23:27 2010 +0900 +++ b/TaskManager/kernel/ppe/TaskManagerImpl.h Tue May 25 19:11:41 2010 +0900 @@ -26,7 +26,7 @@ TaskManagerImpl *others; /* constructor */ - TaskManagerImpl(int num = 1, TaskManagerImpl *others = 0) ; + TaskManagerImpl(int num = 1) ; virtual ~TaskManagerImpl() { }