ChangeLogTag: Sat Dec 13 02:33:20 UTC 2008 Friedhelm Wolf <fwolf@dre.vanderbilt.edu>

7 files changed, 35 insertions, 30 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index cb3674be090..e8bdc4857e6 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Sat Dec 13 02:33:20 UTC 2008  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
+
+       * DAnCE/tests/CIAO/FTClientComponent/Worker.idl
+       * DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h
+       * DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp
+       * DAnCE/tests/CIAO/FTClientComponent/FTClient.mpc
+       * DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp:
+        
+         Adjusted client component to communicate with the new server
+         component.
+
 Sat Dec 13 02:08:18 UTC 2008  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
 
         * DAnCE/tests/CIAO/FTTask
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.mpc b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.mpc
index 85ac6a7a72a..dfc3324ed23 100644
--- a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.mpc
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient.mpc
@@ -12,7 +12,7 @@ project(FTClient_idl_gen) : taoidldefaults, anytypecode {
 
   IDL_Files {
     FTClient.idl
-    Test.idl
+    Worker.idl
   }
 }
 
@@ -51,7 +51,7 @@ project(FTClient_stub) : ccm_stub {
 
   Source_Files {
     FTClientC.cpp
-    TestC.cpp
+    WorkerC.cpp
   }
 
   Header_Files {
@@ -113,7 +113,7 @@ project(FTClient_svnt) : ciao_servant {
   Source_Files {
     FTClientS.cpp
     FTClient_svnt.cpp
-    TestS.cpp
+    WorkerS.cpp
   }
   
   Header_Files {
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp
index d4f76cb3317..8d6253eb40f 100644
--- a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_Timer_Handler.cpp
@@ -4,7 +4,7 @@
 #include <tao/RTCORBA/RTCORBA.h>
 #include <ciao/CIAO_common.h>
 #include "FTClient_Timer_Handler.h"
-#include "TestC.h"
+#include "WorkerC.h"
 #include "FTClient_exec.h"
 
 namespace CIDL_FTClient_Impl
@@ -26,7 +26,7 @@ namespace CIDL_FTClient_Impl
   FTClient_Timer_Handler::handle_timeout (const ACE_Time_Value &,
                                           const void *)
   {
-    test_var server = client_executor_->server ();
+    DeCoRAM::Worker_var server = client_executor_->server ();
 
     CORBA::Object_var obj = orb_->resolve_initial_references ("RTCurrent");
     RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (obj);
@@ -35,19 +35,17 @@ namespace CIDL_FTClient_Impl
 
     try
       {
-        ACE_hrtime_t start = ACE_OS::gethrtime ();
+        ACE_hrtime_t start, end;
+        start = ACE_OS::gethrtime ();
 
         // we have to do some profiling first to see how we can achieve
         // the correct execution time.
-        server->method (0, 0, 
-                        static_cast<CORBA::ULong> (client_executor_->execution_time ()), 
-                        201827, 0);
+        server->run_task (client_executor_->execution_time ());
         
-        ACE_hrtime_t end = ACE_OS::gethrtime ();
+        end = ACE_OS::gethrtime ();
         
         CIAO_DEBUG ((LM_DEBUG,
-                     ACE_TEXT ("FTClient_Timer_Handler::handle_timeout () -"
-                               "response time for %f was %d.\n"),
+                     ACE_TEXT ("response time for %f was %d.\n"),
                      client_executor_->execution_time (),
                      end - start));
       }
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp
index edf02aff595..f7a6084bce1 100644
--- a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.cpp
@@ -36,7 +36,7 @@ namespace CIDL_FTClient_Impl
     : period_ (0.0),
       execution_time_ (0.0),
       priority_ (0),
-      server_ (test::_nil ()),
+      server_ (DeCoRAM::Worker::_nil ()),
       orb_ (CORBA::ORB::_nil ()),
       timeout_handler_ (this)
   {
@@ -107,7 +107,7 @@ namespace CIDL_FTClient_Impl
 
     try
       {
-        server_ = test::_narrow (obj.in ());
+        server_ = DeCoRAM::Worker::_narrow (obj.in ());
       }
     catch (CORBA::SystemException & ex)
       {
@@ -117,10 +117,10 @@ namespace CIDL_FTClient_Impl
       }
   }
 
-  test_ptr 
+  DeCoRAM::Worker_ptr 
   FTClient_exec_i::server (void)
   {
-    return test::_duplicate (server_.in ());
+    return DeCoRAM::Worker::_duplicate (server_.in ());
   }
 
   // Port operations.
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h
index 5d437390cdf..ec305fbcbee 100644
--- a/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/FTClient_exec.h
@@ -24,7 +24,6 @@
 #include /**/ "ace/pre.h"
 
 #include "FTClientEC.h"
-#include "TestC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,6 +32,7 @@
 #include "FTClient_exec_export.h"
 #include "tao/LocalObject.h"
 #include "FTClient_Timer_Handler.h"
+#include "WorkerC.h"
 
 namespace CIDL_FTClient_Impl
 {
@@ -73,7 +73,7 @@ namespace CIDL_FTClient_Impl
     server_ior (const char * server_ior);
 
     // returns the reference to the server
-    test_ptr server (void);
+    DeCoRAM::Worker_ptr server (void);
     
     // Port operations.
 
@@ -101,7 +101,7 @@ namespace CIDL_FTClient_Impl
 
     CORBA::ULong priority_;
 
-    test_var server_;
+    DeCoRAM::Worker_var server_;
 
     CORBA::ORB_var orb_;
 
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/Test.idl b/CIAO/DAnCE/tests/CIAO/FTClientComponent/Test.idl
deleted file mode 100644
index a1696e22ce9..00000000000
--- a/CIAO/DAnCE/tests/CIAO/FTClientComponent/Test.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-interface test
-{
-    void method (in unsigned long test_start,
-                 in unsigned long test_end,
-                 in unsigned long work,
-                 in unsigned long prime_number, 
-                 in unsigned long end);
-    
-   void shutdown ();
-   void dump ();
-};
diff --git a/CIAO/DAnCE/tests/CIAO/FTClientComponent/Worker.idl b/CIAO/DAnCE/tests/CIAO/FTClientComponent/Worker.idl
new file mode 100644
index 00000000000..0d3af16e3b7
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FTClientComponent/Worker.idl
@@ -0,0 +1,7 @@
+module DeCoRAM
+{
+  interface Worker
+  {
+    void run_task (in double execution_time);
+  };
+};