Mercurial > hg > Game > Cerium
changeset 1887:94a824cde2e4 draft
remove some old code
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Fri, 03 Jan 2014 17:04:46 +0900 |
| parents | c3573a5ac6a1 |
| children | 5238ca826d6e |
| files | TaskManager/Makefile.def TaskManager/kernel/ppe/TaskManagerImpl.cc TaskManager/kernel/schedule/Scheduler.cc example/many_task/Makefile |
| diffstat | 4 files changed, 7 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Makefile.def Fri Jan 03 16:57:34 2014 +0900 +++ b/TaskManager/Makefile.def Fri Jan 03 17:04:46 2014 +0900 @@ -33,8 +33,8 @@ ABIBIT = 64 -OPT = -g -O0 -DMAIL_QUEUE -DNOT_CHECK -DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE -#OPT = -O9 -DMAIL_QUEUE -DNOT_CHECK #-DTASK_LIST_MAIL #-DEARLY_TOUCH -DUSE_CACHE +OPT = -g -O0 -DMAIL_QUEUE #-DEARLY_TOUCH +#OPT = -O9 -DMAIL_QUEUE #-DEARLY_TOUCH
--- a/TaskManager/kernel/ppe/TaskManagerImpl.cc Fri Jan 03 16:57:34 2014 +0900 +++ b/TaskManager/kernel/ppe/TaskManagerImpl.cc Fri Jan 03 17:04:46 2014 +0900 @@ -149,29 +149,9 @@ /* call get_task_name from ppu only */ const char * TaskManagerImpl::get_task_name(int cmd) { - if (0 <= cmd && cmd < MAX_TASK_OBJECT) { - -#ifndef NOT_CHECK - - int flag = 0; - - for (int i = 0; i < MAX_TASK_OBJECT; i++) { - if (entry_cmd[i] == cmd) { - flag = 1; - break; - } - } - - if (flag == 0) { - printf("cmd %d is not registered on task_list\n", cmd); - return NULL; - } - -#endif return task_list[cmd].name; - } - else { + } else { return NULL; } }
--- a/TaskManager/kernel/schedule/Scheduler.cc Fri Jan 03 16:57:34 2014 +0900 +++ b/TaskManager/kernel/schedule/Scheduler.cc Fri Jan 03 17:04:46 2014 +0900 @@ -16,10 +16,6 @@ TaskObject task_list[MAX_TASK_OBJECT]; -#ifndef NOT_CHECK -int entry_cmd[MAX_TASK_OBJECT]; -int task_count = 0; -#endif Scheduler::~Scheduler() { @@ -45,12 +41,7 @@ task_list[i].load = null_loader; task_list[i].wait = null_loader; task_list[i].gputask = new GpuTaskObject(); - -#ifndef NOT_CHECK - entry_cmd[i] = NULL; -#endif - - } + } } //useRefDmaは、0という初期値が設定されている。 @@ -59,10 +50,6 @@ { hash = 0; -#ifndef NOT_CHECK - task_count = 0; -#endif - set_manager(m); init_impl(useRefDma); @@ -251,11 +238,6 @@ task_list[cmd].load = null_loader; task_list[cmd].wait = null_waiter; task_list[cmd].name = str; - -#ifndef NOT_CHECK - entry_cmd[task_count++] = cmd; -#endif - } extern void @@ -273,10 +255,6 @@ task_list[cmd].wait = wait_load; task_list[cmd].name = str; -#ifndef NOT_CHECK - entry_cmd[task_count++] = cmd; -#endif - #if 0 this->printf("cmd = %d\n",cmd); this->printf("locatation = 0x%x\n",start); @@ -334,27 +312,8 @@ MemorySegment * Scheduler::get_segment(memaddr addr, MemList *m) { -#ifdef USE_CACHE - MemorySegment *s = m->getFirst(); return get_segment(addr, m, s->size); - -#else - - //addr が空だった場合はどうなるか - //こうすると単純にFIFOか - // そうじゃなくて、単にbufferを余計に取って毎回DMAしているだけだよね。 - - MemorySegment *s = m->getLast(); - m->moveToFirst(s); - s->tag = connector->get_tag(); - s->address = addr; - s->data = connector->dma_load1(s->data, addr, s->size, s->tag); - - return s; - -#endif - } /*!