# HG changeset patch
# User k098586@localhost.localdomain
# Date 1243579509 -32400
# Node ID f8182c7058b5213071c78c4ffb57ce77344376b0
# Parent  ae6aa53faf70c44872da6150c53ed226553cba01
fix

diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/Cell/spe/CellDmaManager.cc
--- a/TaskManager/Cell/spe/CellDmaManager.cc	Fri May 29 15:34:13 2009 +0900
+++ b/TaskManager/Cell/spe/CellDmaManager.cc	Fri May 29 15:45:09 2009 +0900
@@ -37,34 +37,13 @@
  *
  * @param[in] mask Tag for Wait DMA process
  */
-void
-CellDmaManager::start_dmawait_profile()
-{
-    wait_time = readch(SPU_RdDec); 
-    global_busy_time += busy_time - wait_time;
-    writech(SPU_WrDec, 0xffffffff);
-}
-
-void
-CellDmaManager::end_dmawait_profile()
-{
-    wait_time = readch(SPU_RdDec);
-    global_wait_time += 0xffffffff - wait_time;
-    busy_time = wait_time;
-}
 
 void
 CellDmaManager::dma_wait(uint32 mask)
 {
-#ifdef SPU_PROFILE
-    start_dmawait_profile();
-#endif
     mfc_write_tag_mask(1 << mask);
     mfc_write_tag_update_all();
     mfc_read_tag_status();
-#ifdef SPU_PROFILE
-    end_dmawait_profile();
-#endif
 }
 
 void
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/Fifo/FifoDmaManager.o
Binary file TaskManager/Fifo/FifoDmaManager.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/Fifo/FifoTaskManagerImpl.o
Binary file TaskManager/Fifo/FifoTaskManagerImpl.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/Fifo/MainScheduler.o
Binary file TaskManager/Fifo/MainScheduler.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/main.o
Binary file TaskManager/kernel/main.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/BufferManager.o
Binary file TaskManager/kernel/ppe/BufferManager.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/DmaBuffer.o
Binary file TaskManager/kernel/ppe/DmaBuffer.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/HTask.o
Binary file TaskManager/kernel/ppe/HTask.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/HTaskInfo.o
Binary file TaskManager/kernel/ppe/HTaskInfo.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/MailManager.o
Binary file TaskManager/kernel/ppe/MailManager.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/Random.o
Binary file TaskManager/kernel/ppe/Random.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/SymTable.o
Binary file TaskManager/kernel/ppe/SymTable.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/Task.o
Binary file TaskManager/kernel/ppe/Task.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/TaskList.o
Binary file TaskManager/kernel/ppe/TaskList.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/TaskListInfo.o
Binary file TaskManager/kernel/ppe/TaskListInfo.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/TaskManager.o
Binary file TaskManager/kernel/ppe/TaskManager.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/TaskManagerImpl.o
Binary file TaskManager/kernel/ppe/TaskManagerImpl.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/TaskQueue.o
Binary file TaskManager/kernel/ppe/TaskQueue.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/ppe/TaskQueueInfo.o
Binary file TaskManager/kernel/ppe/TaskQueueInfo.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/schedule/SchedExit.o
Binary file TaskManager/kernel/schedule/SchedExit.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/schedule/SchedMail.o
Binary file TaskManager/kernel/schedule/SchedMail.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/schedule/SchedNop.o
Binary file TaskManager/kernel/schedule/SchedNop.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/schedule/SchedNop2Ready.o
Binary file TaskManager/kernel/schedule/SchedNop2Ready.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/schedule/SchedTask.o
Binary file TaskManager/kernel/schedule/SchedTask.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/schedule/SchedTaskList.o
Binary file TaskManager/kernel/schedule/SchedTaskList.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/schedule/Scheduler.o
Binary file TaskManager/kernel/schedule/Scheduler.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/schedule/TaskGroup.o
Binary file TaskManager/kernel/schedule/TaskGroup.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/sys_task/Finish.o
Binary file TaskManager/kernel/sys_task/Finish.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/sys_task/Start.o
Binary file TaskManager/kernel/sys_task/Start.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 TaskManager/kernel/sys_task/systask_register.o
Binary file TaskManager/kernel/sys_task/systask_register.o has changed
diff -r ae6aa53faf70 -r f8182c7058b5 include/TaskManager/CellDmaManager.h
--- a/include/TaskManager/CellDmaManager.h	Fri May 29 15:34:13 2009 +0900
+++ b/include/TaskManager/CellDmaManager.h	Fri May 29 15:45:09 2009 +0900
@@ -11,8 +11,6 @@
 
 #include <spu_mfcio.h>
 
-#define SPU_PROFILE 1
-
 class CellDmaManager : public DmaManager {
 public:
     BASE_NEW_DELETE(CellDmaManager);
@@ -23,15 +21,11 @@
     } DmaList, *DmaListPtr;
 
     /* variables */
-    unsigned int wait_time, busy_time;
-    unsigned long long global_busy_time = 0, global_wait_time = 0;
 
     /* functions */
     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 start_dmawait_profile();
-    void end_dmawait_profile();
 
     void mail_write(uint32 data);
     uint32 mail_read(void);