--- a/TaskManager/Fifo/FifoDmaManager.cc	Tue Oct 15 17:29:37 2013 +0900
+++ b/TaskManager/Fifo/FifoDmaManager.cc	Tue Oct 22 18:07:27 2013 +0900
@@ -13,12 +13,12 @@
     if (size == 0) return buf;
 
     unsigned long long wait = 0;
-    (*this->start_dmawait_profile)();
+    (*this->start_dmawait_profile)(&start_time);
 
     buf = s->manager->allocate(size);
     memcpy(buf, (void*)addr, size);
 
-    (*this->end_dmawait_profile)(&wait);
+    (*this->end_dmawait_profile)(&wait,&start_time,&stop_time);
     global_load_time += wait;
     dma_load_time += wait;
 
@@ -31,11 +31,11 @@
     if (size == 0) return buf;
 
     unsigned long long wait = 0;
-    (*this->start_dmawait_profile)();
+    (*this->start_dmawait_profile)(&start_time);
 
     memcpy(buf, (void*)addr, size);
 
-    (*this->end_dmawait_profile)(&wait);
+    (*this->end_dmawait_profile)(&wait,&start_time,&stop_time);
     global_load_time += wait;
     dma_load_time += wait;
     return buf;
@@ -55,11 +55,11 @@
     if (size == 0) return buf;
 
     unsigned long long wait = 0;
-    (*this->start_dmawait_profile)();
+    (*this->start_dmawait_profile)(&start_time);
 
     memcpy((void*)addr, buf, size);
 
-    (*this->end_dmawait_profile)(&wait);
+    (*this->end_dmawait_profile)(&wait,&start_time,&stop_time);
     global_store_time += wait;
     dma_store_time += wait;
 
@@ -79,7 +79,7 @@
 FifoDmaManager::dma_loadList(Scheduler *s, ListDataPtr list, uint32 mask)
 {
     unsigned long long wait = 0;
-    (*this->start_dmawait_profile)();
+    (*this->start_dmawait_profile)(&start_time);
 
     int list_size = list->length;
     long bound;
@@ -93,7 +93,7 @@
         bound += elm->size;
     }
 
-    (*this->end_dmawait_profile)(&wait);
+    (*this->end_dmawait_profile)(&wait,&start_time,&stop_time);
     global_load_time += wait;
     dma_loadList_time += wait;
 
@@ -104,7 +104,7 @@
 FifoDmaManager::dma_storeList(ListDataPtr list, void *buff, uint32 mask)
 {
     unsigned long long wait = 0;
-    (*this->start_dmawait_profile)();
+    (*this->start_dmawait_profile)(&start_time);
 
     int list_size = list->length;
     memaddr bound;
@@ -117,7 +117,7 @@
         bound += elm->size;
     }
 
-    (*this->end_dmawait_profile)(&wait);
+    (*this->end_dmawait_profile)(&wait,&start_time,&stop_time);
     global_store_time += wait;
     dma_storeList_time += wait;
 }
@@ -126,11 +126,11 @@
 FifoDmaManager::mail_write(memaddr data)
 {
     unsigned long long wait = 0;
-    (*this->start_dmawait_profile)();
+    (*this->start_dmawait_profile)(&start_time);
 
     mail_queue1->send(data);
 
-    (*this->end_dmawait_profile)(&wait);
+    (*this->end_dmawait_profile)(&wait,&start_time,&stop_time);
     global_mail_time += wait;
     mail_write_time += wait;
 }
@@ -139,11 +139,11 @@
 FifoDmaManager::mail_write_finish_list(memaddr data)
 {
     unsigned long long wait = 0;
-    (*this->start_dmawait_profile)();
+    (*this->start_dmawait_profile)(&start_time);
 
     mail_queue1->send(data);
 
-    (*this->end_dmawait_profile)(&wait);
+    (*this->end_dmawait_profile)(&wait,&start_time,&stop_time);
     global_mail_time += wait;
     mail_write_time += wait;
 }
@@ -152,12 +152,12 @@
 FifoDmaManager::mail_read()
 {
     unsigned long long wait = 0;
-    (*this->start_dmawait_profile)();
+    (*this->start_dmawait_profile)(&start_time);
 
     memaddr data;
     data = mail_queue2->recv();
 
-    (*this->end_dmawait_profile)(&wait);
+    (*this->end_dmawait_profile)(&wait,&start_time,&stop_time);
     global_mail_time += wait;
     mail_read_time += wait;
 
@@ -168,12 +168,12 @@
 FifoDmaManager::task_list_mail_read()
 {
     unsigned long long wait = 0;
-    (*this->start_dmawait_profile)();
+    (*this->start_dmawait_profile)(&start_time);
 
     memaddr data;
     data = mail_queue2->recv();
 
-    (*this->end_dmawait_profile)(&wait);
+    (*this->end_dmawait_profile)(&wait,&start_time,&stop_time);
     global_mail_time += wait;
     mail_read_time += wait;
 
@@ -184,11 +184,11 @@
 FifoDmaManager::mail_write_from_host(memaddr data)
 {
     unsigned long long wait = 0;
-    (*this->start_dmawait_profile)();
+    (*this->start_dmawait_profile)(&start_time);
 
     mail_queue2->send(data);
 
-    (*this->end_dmawait_profile)(&wait);
+    (*this->end_dmawait_profile)(&wait,&start_time,&stop_time);
     global_mail_time += wait;
     mail_write_from_host_time += wait;
 }
@@ -197,12 +197,12 @@
 FifoDmaManager::mail_read_from_host() 
 {
     unsigned long long wait = 0;
-    (*this->start_dmawait_profile)();
+    (*this->start_dmawait_profile)(&start_time);
 
     memaddr data;
     data = mail_queue1->recv();
 
-    (*this->end_dmawait_profile)(&wait);
+    (*this->end_dmawait_profile)(&wait,&start_time,&stop_time);
     global_mail_time += wait;
     mail_read_from_host_time += wait;
 
@@ -215,22 +215,21 @@
     return mail_queue1->count(); 
 }
 
-static unsigned long long start_time,stop_time;
 void
-do_start_dmawait_profile()
+do_start_dmawait_profile(unsigned long long *start)
 {
-    start_time = gettime();
+    *start = gettime();
 }
 
 void
-do_end_dmawait_profile(unsigned long long *counter)
+do_end_dmawait_profile(unsigned long long *counter,unsigned long long *start,unsigned long long *stop)
 {
-    stop_time = gettime();
-    *counter += stop_time - start_time;
+    *stop = gettime();
+    *counter += *stop - *start;
 }
 
-void null_start_dmawait_profile() {}
-void null_end_dmawait_profile(unsigned long long *counter) {}
+void null_start_dmawait_profile(unsigned long long *start) {}
+void null_end_dmawait_profile(unsigned long long *counter,unsigned long long *start,unsigned long long *stop) {}
 
 void
 FifoDmaManager::start_profile()
@@ -251,8 +250,7 @@
 
     start_dmawait_profile = &do_start_dmawait_profile;
     end_dmawait_profile = &do_end_dmawait_profile;
-    (*this->start_dmawait_profile)();
-    stop_time = gettime();
+    (*this->start_dmawait_profile)(&start_time);
 }
 
 void
@@ -266,7 +264,7 @@
 FifoDmaManager::show_dma_wait(Scheduler *s, int cpu)
 {
     unsigned long long all_time = gettime() - global_start_time;
-
+    
     double busy = ((double)global_busy_time)/((double)all_time)*100.0;
     double load = ((double)global_load_time)/((double)all_time)*100.0;
     double store = ((double)global_store_time)/((double)all_time)*100.0;
@@ -278,22 +276,24 @@
 
 
     s->printf("cpu%d:\n busy_time = %lld(%.3g%%)\n"
-        " load_time = %lld(%.3g%%), "
-        " store_time = %lld(%.3g%%), "
-        " mail_time = %lld(%.3g%%) \n"
-        " mail_read_time = %lld(%.3g%%), "
-        " mail_write_time = %lld(%.3g%%)\n"
-        " mail_read_from_host_time = %lld(%.3g%%), "
-        " mail_write_from_host_time = %lld(%.3g%%)\n"
-        ,cpu, global_busy_time, busy, 
-        global_load_time, load,
-        global_store_time, store,
-        global_mail_time, mail,
-        mail_read_time, read,
-        mail_write_time, write,
-        mail_read_from_host_time, read_from_host,
-        mail_write_from_host_time, write_from_host);
-
+              " load_time = %lld(%.3g%%), "
+              " store_time = %lld(%.3g%%), "
+              " mail_time = %lld(%.3g%%) \n"
+              " mail_read_time = %lld(%.3g%%), "
+              " mail_write_time = %lld(%.3g%%)\n"
+              " mail_read_from_host_time = %lld(%.3g%%), "
+              " mail_write_from_host_time = %lld(%.3g%%)\n"
+              " all_time = %lld\n"
+              ,cpu, global_busy_time, busy, 
+              global_load_time, load,
+              global_store_time, store,
+              global_mail_time, mail,
+              mail_read_time, read,
+              mail_write_time, write,
+              mail_read_from_host_time, read_from_host,
+              mail_write_from_host_time, write_from_host,
+              all_time);
+    
     global_busy_time = 0;
     global_load_time = 0;
     global_store_time = 0;