ChangeLogTag: Mon Mar 16 17:36:12 UTC 2009 Friedhelm Wolf <fwolf@dre.vanderbilt.edu>

5 files changed, 34 insertions, 4 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 39498cab9b8..1d545f2dba8 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+Mon Mar 16 17:36:12 UTC 2009  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
+
+        * DAnCE/tests/CIAO/FTComponents/FTTask_exec.cpp
+        * DAnCE/tests/CIAO/FTComponents/FTTask_exec.h:
+        
+          Added timing measurement.
+        
+        * DAnCE/tests/CIAO/FTComponents/FTClient_Timer_Handler.cpp:
+        
+          Cosmetic changes and adding timer calibration in ctor.
+        
+        * DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp:
+        
+          Changed debugging output.
+
 Fri Mar 13 19:28:40 UTC 2009  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
 
         * DAnCE/tests/CIAO/FTComponents/FTClient.idl
diff --git a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp
index ce22b76ac00..1d314b5523f 100644
--- a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp
+++ b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp
@@ -188,7 +188,9 @@ namespace DAnCE
   FaultCorrelationManager_Impl::app_failure_i (const char * host,
                                                const char * application)
   {
-    DANCE_DEBUG ((LM_TRACE, "FaultCorrelationManager_Impl::app_failure_i ()\n"));
+    DANCE_DEBUG ((LM_TRACE, "FaultCorrelationManager_Impl::app_failure_i (%s, %s)\n",
+                  host,
+                  application));
 
     TObjectIdMap node;
     if (nodes_.find (host,
diff --git a/CIAO/DAnCE/tests/CIAO/FTComponents/FTClient_Timer_Handler.cpp b/CIAO/DAnCE/tests/CIAO/FTComponents/FTClient_Timer_Handler.cpp
index 239669508a5..be7e72bc1bb 100644
--- a/CIAO/DAnCE/tests/CIAO/FTComponents/FTClient_Timer_Handler.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FTComponents/FTClient_Timer_Handler.cpp
@@ -16,6 +16,7 @@ namespace CIDL_FTClient_Impl
       logging_ (logging),
       count_ (0)
   {
+    timer_.calibrate ();
   }
 
   void
@@ -59,8 +60,6 @@ namespace CIDL_FTClient_Impl
 
         timer_.start ();
 
-        // we have to do some profiling first to see how we can achieve
-        // the correct execution time.
         server_->run_task (client_executor_->execution_time ());
 
         timer_.stop ();
diff --git a/CIAO/DAnCE/tests/CIAO/FTComponents/FTTask_exec.cpp b/CIAO/DAnCE/tests/CIAO/FTComponents/FTTask_exec.cpp
index 64453244965..5ece7de1e24 100644
--- a/CIAO/DAnCE/tests/CIAO/FTComponents/FTTask_exec.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FTComponents/FTTask_exec.cpp
@@ -47,6 +47,8 @@ namespace CIDL_FTTask_Impl
       task_ (state_)
   {
     CIAO_TRACE ("FTTask_exec_i::FTTask_exec_i (void)");
+
+    timer_.calibrate ();
   }
 
   FTTask_exec_i::~FTTask_exec_i (void)
@@ -60,14 +62,23 @@ namespace CIDL_FTTask_Impl
   FTTask_exec_i::run_task (
     ::CORBA::Double execution_time)
   {
-    CIAO_DEBUG ((LM_TRACE, "x(%d) ", state_));
+    CIAO_DEBUG ((LM_TRACE, "x(%d, %f)=", state_, execution_time));
+
+    timer_.start ();
 
     this->cpu_.run (static_cast <size_t> (execution_time));
 
+    timer_.stop ();
+
     ++state_;
     
     agent_->state_changed (object_id_.c_str ());
 
+    ACE_Time_Value rt;
+    timer_.elapsed_time (rt);
+
+    CIAO_DEBUG ((LM_TRACE, "%dms ", rt.msec ()));
+
     task_.signal ();
   }
 
diff --git a/CIAO/DAnCE/tests/CIAO/FTComponents/FTTask_exec.h b/CIAO/DAnCE/tests/CIAO/FTComponents/FTTask_exec.h
index 82dcdd5bea2..55fda96ba90 100644
--- a/CIAO/DAnCE/tests/CIAO/FTComponents/FTTask_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/FTComponents/FTTask_exec.h
@@ -33,6 +33,7 @@
 #include "tao/LocalObject.h"
 #include "CPU/CPU_Worker.h"
 #include "Failure_Task.h"
+#include "ace/High_Res_Timer.h"
 
 namespace CIDL_FTTask_Impl
 {
@@ -144,6 +145,8 @@ namespace CIDL_FTTask_Impl
     long suicidal_count_;
 
     Failure_Task task_;
+
+    ACE_High_Res_Timer timer_;
   };
 
   extern "C" FTTASK_EXEC_Export ::Components::EnterpriseComponent_ptr