Mercurial > hg > Members > kono > Cerium
diff TaskManager/Fifo/FifoTaskManagerImpl.cc @ 713:f725c6455d19
remove SIMPLE_TASK conditional
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Wed, 16 Dec 2009 15:27:46 +0900 |
| parents | 6d497c098455 |
| children | cafffff0f45a |
line wrap: on
line diff
--- a/TaskManager/Fifo/FifoTaskManagerImpl.cc Wed Dec 16 09:39:24 2009 +0900 +++ b/TaskManager/Fifo/FifoTaskManagerImpl.cc Wed Dec 16 15:27:46 2009 +0900 @@ -86,11 +86,7 @@ FifoTaskManagerImpl::get_runTaskList() { TaskListPtr list, list_top; -#ifdef SIMPLE_TASK SimpleTaskPtr task; // Task (SPE に送る Task) -#else - TaskPtr task; // Task (SPE に送る Task) -#endif if (activeTaskQueue->empty()) { return NULL; @@ -106,7 +102,7 @@ // printf("active task queue length = %d\n",activeTaskQueue->length()); while (HTaskPtr htask = activeTaskQueue->poll()) { task = &list->tasks[list->length++]; -#ifdef SIMPLE_TASK + if (htask->command==TaskArray1) { // compatibility int next = (htask->r_size+sizeof(SimpleTask))/sizeof(SimpleTask); @@ -126,9 +122,6 @@ } else { *task = *(SimpleTask*)htask; } -#else - memcpy(task, (Task*)htask, sizeof(Task)); -#endif if (list->length >= TASK_MAX_SIZE) { TaskListPtr newList = taskListImpl->create(); list_top = TaskListInfo::append(list_top, newList);