Mercurial > hg > Game > Cerium
changeset 1001:ca59327dccab draft
error fix.
| author | root@henri.cr.ie.u-ryukyu.ac.jp |
|---|---|
| date | Thu, 21 Oct 2010 21:39:47 +0900 |
| parents | aa92719ddfc8 |
| children | 4ca9cbf53ad6 |
| files | TaskManager/Cell/spe/CellDmaManager.cc TaskManager/Cell/spe/CellDmaManager.h TaskManager/Cell/spe/CellScheduler.cc |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Cell/spe/CellDmaManager.cc Fri Oct 22 20:12:33 2010 +0900 +++ b/TaskManager/Cell/spe/CellDmaManager.cc Thu Oct 21 21:39:47 2010 +0900 @@ -4,6 +4,8 @@ #include "Scheduler.h" +unsigned long long alloc_flag = 0; + /** * DMA Load * @@ -110,7 +112,6 @@ { stop_profile(); } - void CellDmaManager::start_profile() {
--- a/TaskManager/Cell/spe/CellDmaManager.h Fri Oct 22 20:12:33 2010 +0900 +++ b/TaskManager/Cell/spe/CellDmaManager.h Thu Oct 21 21:39:47 2010 +0900 @@ -26,7 +26,7 @@ /* variables */ unsigned int wait_time, busy_time, alloc_busy_time; unsigned long long global_busy_time, global_wait_time, global_mail_time, mainMemalloc_time; - unsigned long long task_array_load_time, alloc_flag; + unsigned long long task_array_load_time; /* functions */ void dma_load(void *buf, memaddr addr, uint32 size, uint32 mask); @@ -39,7 +39,7 @@ void stop_profile(); - void show_wait(Scheduler *s, int cpu); + void show_dma_wait(Scheduler *s, int cpu); void mail_write(memaddr data); memaddr mail_read();
--- a/TaskManager/Cell/spe/CellScheduler.cc Fri Oct 22 20:12:33 2010 +0900 +++ b/TaskManager/Cell/spe/CellScheduler.cc Thu Oct 21 21:39:47 2010 +0900 @@ -6,6 +6,7 @@ // ユーザプログラムで定義 // なんだけど、それは微妙じゃね？ extern void task_init(Scheduler *scheduler); +extern unsigned long long alloc_flag; void CellScheduler::init_impl()