Mercurial > hg > Members > kono > Cerium
changeset 334:20f2459041cb
[in test_render] push L key , call show_dma_wait, but incomplete.
| author | e065746@localhost.localdomain |
|---|---|
| date | Sat, 13 Jun 2009 19:11:58 +0900 |
| parents | 8df3f42c7bdd |
| children | 7a42d46cc54e |
| files | TaskManager/Cell/CellTaskManagerImpl.cc TaskManager/Test/test_render/.gdbinit TaskManager/Test/test_render/show_time.cpp TaskManager/Test/test_render/spe/ShowTime.cpp TaskManager/kernel/schedule/SchedTask.cc include/TaskManager/SchedTask.h include/TaskManager/Scheduler.h |
| diffstat | 7 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Cell/CellTaskManagerImpl.cc Fri Jun 12 17:14:44 2009 +0900 +++ b/TaskManager/Cell/CellTaskManagerImpl.cc Sat Jun 13 19:11:58 2009 +0900 @@ -198,10 +198,10 @@ */ // 名前あとでちゃんと決めよう => MY_SPE_... とかじゃなくて if (data == MY_SPE_STATUS_READY) { - __debug_ppe("[SPE %d] finish\n", id); + //__debug_ppe("[SPE %d] finish\n", id); flag_sendTaskList[id] = 1; } else if (data == MY_SPE_COMMAND_MALLOC) { - __debug_ppe("[PPE] MALLOC COMMAND from [SPE %d]\n", id); + //__debug_ppe("[PPE] MALLOC COMMAND from [SPE %d]\n", id); /** * info[0] = alloc_id; (CellScheduler::mainMem_alloc 参照) @@ -222,12 +222,12 @@ * ここでは TaskList を allocate(new) して登録してやろうか */ - __debug_ppe("[PPE] MALLOCED 0x%x from [SPE %d]\n", alloc_info[1],id); + //__debug_ppe("[PPE] MALLOCED 0x%x from [SPE %d]\n", alloc_info[1],id); speThreads->add_output_tasklist(command, alloc_info[1], alloc_size); speThreads->send_mail(id, 2, alloc_info); } else if (data > MY_SPE_NOP) { - __debug_ppe("[PPE] recv from [SPE %d] : 0x%x\n", id, data); + //__debug_ppe("[PPE] recv from [SPE %d] : 0x%x\n", id, data); check_task_finish((HTaskPtr)data); } }
--- a/TaskManager/Test/test_render/.gdbinit Fri Jun 12 17:14:44 2009 +0900 +++ b/TaskManager/Test/test_render/.gdbinit Sat Jun 13 19:11:58 2009 +0900 @@ -7,4 +7,4 @@ x/1i $pc end break main -run -video fb -width 1920 -height 1080 \ No newline at end of file +#run -video fb -width 1920 -height 1080 \ No newline at end of file
--- a/TaskManager/Test/test_render/show_time.cpp Fri Jun 12 17:14:44 2009 +0900 +++ b/TaskManager/Test/test_render/show_time.cpp Sat Jun 13 19:11:58 2009 +0900 @@ -8,7 +8,7 @@ HTaskPtr show; show = manager->create_task(SHOW_TIME); - show->set_cpu(SPE_ANY); + show->set_cpu(SPE_0); show->spawn(); printf("testですよ\n");
--- a/TaskManager/Test/test_render/spe/ShowTime.cpp Fri Jun 12 17:14:44 2009 +0900 +++ b/TaskManager/Test/test_render/spe/ShowTime.cpp Sat Jun 13 19:11:58 2009 +0900 @@ -9,6 +9,9 @@ /* * ここで show_dma_wait() を呼びたい */ + smanager->show_dma_wait(); printf("Show Time !\n"); + + return 0; }
--- a/TaskManager/kernel/schedule/SchedTask.cc Fri Jun 12 17:14:44 2009 +0900 +++ b/TaskManager/kernel/schedule/SchedTask.cc Sat Jun 13 19:11:58 2009 +0900 @@ -558,4 +558,9 @@ __scheduler->dma_wait(mask); } +void +SchedTask::show_dma_wait() { + __scheduler->show_dma_wait(); +} + /* end */
--- a/include/TaskManager/SchedTask.h Fri Jun 12 17:14:44 2009 +0900 +++ b/include/TaskManager/SchedTask.h Sat Jun 13 19:11:58 2009 +0900 @@ -135,7 +135,7 @@ void dma_load(void *buf, uint32 addr, uint32 size, uint32 mask); void dma_store(void *buf,uint32 addr, uint32 size, uint32 mask); void dma_wait(uint32 mask); - + void show_dma_wait(); /*! SPU用の get_input, get_output
--- a/include/TaskManager/Scheduler.h Fri Jun 12 17:14:44 2009 +0900 +++ b/include/TaskManager/Scheduler.h Sat Jun 13 19:11:58 2009 +0900 @@ -139,6 +139,7 @@ void dma_store(void *buf,uint32 addr, uint32 size, uint32 mask); void dma_wait(uint32 mask); void show_dma_wait() { connector->show_dma_wait(id); }; + void show_dma_wait(int id) { connector->show_dma_wait(id); }; void mail_write(uint32 data); uint32 mail_read(void); void dma_loadList(ListDataPtr list, void *, uint32 mask);