# HG changeset patch # User gongo # Date 1202611161 -32400 # Node ID 0c9341da4522abfff345b9087b187b7e01735e57 # Parent b59d134a81a792b706a6d97d253ae51a1973dde7 *** empty log message *** diff -r b59d134a81a7 -r 0c9341da4522 TaskManager/Fifo/FifoTaskManagerImpl.cc --- a/TaskManager/Fifo/FifoTaskManagerImpl.cc Sat Feb 09 16:50:02 2008 +0900 +++ b/TaskManager/Fifo/FifoTaskManagerImpl.cc Sun Feb 10 11:39:21 2008 +0900 @@ -53,9 +53,9 @@ } void -FifoTaskManagerImpl::run_task(HTaskPtr task) +FifoTaskManagerImpl::spawn_task(HTaskPtr task) { - TaskManagerImpl::run_task(task); + TaskManagerImpl::spawn_task(task); //run(); } diff -r b59d134a81a7 -r 0c9341da4522 TaskManager/Test/Sum/main.cpp --- a/TaskManager/Test/Sum/main.cpp Sat Feb 09 16:50:02 2008 +0900 +++ b/TaskManager/Test/Sum/main.cpp Sun Feb 10 11:39:21 2008 +0900 @@ -74,28 +74,14 @@ (unsigned int)buff, (unsigned int)&out[0], NULL); -#if 0 - for (i = 0; i < div-1; i++) { - manager->set_task_depend(task[i], task[i+1]); - } - manager->set_task_depend(task[div-1], last); - - for (i = 0; i < div; i++) { - manager->run_task(task[i]); - } - manager->run_task(last); -#else for (i = 0; i < div; i++) { manager->set_task_depend(task[i], last); } for (i = 0; i < div; i++) { - manager->run_task(task[i]); + manager->spawn_task(task[i]); } - manager->run_task(last); -#endif + manager->spawn_task(last); - - manager->run(); return 0; } @@ -119,18 +105,19 @@ int init(void *w, void *r) { - HTaskPtr init_task, finish_task; + HTaskPtr init_task; + HTaskPtr finish_task; int fd; fd = manager->open("Init2"); init_task = manager->create_task(fd, 0, 0, 0, NULL); - manager->run_task(init_task); - + manager->spawn_task(init_task); + fd = manager->open("Result"); finish_task = manager->create_task(fd, 0, 0, 0, NULL); manager->set_task_depend(init_task, finish_task); - manager->run_task(finish_task); + manager->spawn_task(finish_task); return 0; } diff -r b59d134a81a7 -r 0c9341da4522 TaskManager/kernel/ppe/TaskManager.cc --- a/TaskManager/kernel/ppe/TaskManager.cc Sat Feb 09 16:50:02 2008 +0900 +++ b/TaskManager/kernel/ppe/TaskManager.cc Sun Feb 10 11:39:21 2008 +0900 @@ -58,9 +58,9 @@ } void -TaskManager::run_task(HTaskPtr task) +TaskManager::spawn_task(HTaskPtr task) { - m_impl->run_task(task); + m_impl->spawn_task(task); } void @@ -82,7 +82,7 @@ init_fd = open(sym); init = m_impl->create_task(init_fd, 0, 0, 0, 0); - run_task(init); + spawn_task(init); } diff -r b59d134a81a7 -r 0c9341da4522 TaskManager/kernel/ppe/TaskManagerImpl.cc --- a/TaskManager/kernel/ppe/TaskManagerImpl.cc Sat Feb 09 16:50:02 2008 +0900 +++ b/TaskManager/kernel/ppe/TaskManagerImpl.cc Sun Feb 10 11:39:21 2008 +0900 @@ -47,7 +47,7 @@ } void -TaskManagerImpl::run_task(HTaskPtr task) +TaskManagerImpl::spawn_task(HTaskPtr task) { if (task->wait_i == NULL) { taskInfo->append_activeTask(task); diff -r b59d134a81a7 -r 0c9341da4522 include/TaskManager/FifoTaskManagerImpl.h --- a/include/TaskManager/FifoTaskManagerImpl.h Sat Feb 09 16:50:02 2008 +0900 +++ b/include/TaskManager/FifoTaskManagerImpl.h Sun Feb 10 11:39:21 2008 +0900 @@ -19,7 +19,7 @@ void init(void); void run(void); - void run_task(HTaskPtr); + void spawn_task(HTaskPtr); TaskListPtr set_task(void); private: diff -r b59d134a81a7 -r 0c9341da4522 include/TaskManager/TaskManager.h --- a/include/TaskManager/TaskManager.h Sat Feb 09 16:50:02 2008 +0900 +++ b/include/TaskManager/TaskManager.h Sun Feb 10 11:39:21 2008 +0900 @@ -23,7 +23,7 @@ HTaskPtr create_task(int cmd, int siz, unsigned long long in_addr, unsigned long long out_addr, void (*func)(void)); void set_task_depend(HTaskPtr master, HTaskPtr slave); - void run_task(HTaskPtr); + void spawn_task(HTaskPtr); void run(void); void set_init_task(const char *sym); diff -r b59d134a81a7 -r 0c9341da4522 include/TaskManager/TaskManagerImpl.h --- a/include/TaskManager/TaskManagerImpl.h Sat Feb 09 16:50:02 2008 +0900 +++ b/include/TaskManager/TaskManagerImpl.h Sun Feb 10 11:39:21 2008 +0900 @@ -24,6 +24,6 @@ unsigned long long out_addr, void (*func)(void)); void set_task_depend(HTaskPtr master, HTaskPtr slave); - virtual void run_task(HTaskPtr); + virtual void spawn_task(HTaskPtr); }; #endif