ChangeLogTag: 2003-08-04 Diego Sevilla <dsevilla@ditec.um.es>

7 files changed, 29 insertions, 16 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index e3313d793ff..e4d6bc79671 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+2003-08-04  Diego Sevilla  <dsevilla@ditec.um.es>
+
+	* performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp:
+	* performance-tests/Benchmark/RoundTripClient/client.cpp:
+	* performance-tests/Benchmark/RoundTripClient/run_test.pl:
+	* performance-tests/Benchmark/descriptors/RoundTripClient.cad:
+	* performance-tests/Benchmark/descriptors/RoundTripClient.csd:
+	* performance-tests/Benchmark/descriptors/RoundTripClient.ssd:
+	Made the test to run.  Fixed some problems with UUID.  Made the
+	client to correctly expect a component instance instead of a
+	home.
+
 Mon Jul  7 23:35:14 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tools/RTComponentServer/ComponentServer_Task.inl:
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
index 5c97bdeae95..9413193ec67 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
@@ -6,7 +6,6 @@
 
 #include "RoundTripClient_exec.h"
 
-
 const int niterations = 100000; //Default no of iterations
 //=================================================================
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
index 3369d082760..85bf2e1d370 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
@@ -30,7 +30,7 @@ main (int argc, char *argv[])
       CORBA::Object_var obj
         = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+/*
       Benchmark::RoundTripClientHome_var home
         = Benchmark::RoundTripClientHome::_narrow (obj.in ()
                                         ACE_ENV_ARG_PARAMETER);
@@ -42,7 +42,9 @@ main (int argc, char *argv[])
       Benchmark::RoundTripClient_var test
         = home->create (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+*/
+      Benchmark::RoundTripClient_var test = 
+	      Benchmark::RoundTripClient::_narrow(obj.in());
       //Get the RoundTrip reference
       Benchmark::Controller_var trigger = test->provide_controller ();
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/run_test.pl b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/run_test.pl
index 147d3ebed6b..496705147af 100755
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/run_test.pl
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/run_test.pl
@@ -22,13 +22,14 @@ $CIAO_ROOT=$ENV{'CIAO_ROOT'};
 unlink $daemon_ior;
 unlink $am_ior;
 
+#$DEBUG="-ORBdebuglevel 4";
 
 # CIAO Daemon command line arguments
-$daemon_args = "-ORBEndpoint iiop://localhost:10000 -o $daemon_ior -i CIAO_Installation_Data.ini -n $CIAO_ROOT/tools/ComponentServer/ComponentServer";
+$daemon_args = "$DEBUG -ORBEndpoint iiop://localhost:10000 -o $daemon_ior -i CIAO_Installation_Data.ini -n $CIAO_ROOT/tools/ComponentServer/ComponentServer";
 
-$assembly_manager_args = "-o $am_ior -c test.dat";
+$assembly_manager_args = "$DEBUG -o $am_ior -c test.dat";
 
-$ad_args = "-k file://$am_ior -a RoundTripClient.cad";
+$ad_args = "$DEBUG -k file://$am_ior -a RoundTripClient.cad";
 
 # CIAO daemon process definition
 $DS = new PerlACE::Process ("$CIAO_ROOT/tools/Daemon/CIAO_Daemon",
@@ -56,7 +57,7 @@ $AD = new PerlACE::Process("$CIAO_ROOT/tools/Assembly_Deployer/Assembly_Deployer
 $AD->Spawn ();
 
 #Start the client to send the trigger message
-$CL = new PerlACE::Process ("../RoundTripClient/client", "");
+$CL = new PerlACE::Process ("../RoundTripClient/client", "-k file://test.ior");
 $CL->Spawn();
 
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.cad b/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.cad
index 1679352c8a1..d53416195a2 100644
--- a/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.cad
+++ b/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.cad
@@ -15,6 +15,11 @@
 
   <partitioning>
 
+<homeplacement id="a_RoundTripHome">
+        <componentfileref idref="com-RoundTrip"/>
+        <componentinstantiation id="a_RoundTrip"/>
+      </homeplacement>
+
 <homeplacement id="a_RoundTripClientHome">
         <componentfileref idref="com-RoundTripClient"/>
         <componentinstantiation id="a_RoundTripClient">
@@ -25,10 +30,6 @@
 	</componentinstantiation>
      </homeplacement>
   <!-- A plain vanilla partition. We don't even need the processcollocation tag here. -->
-      <homeplacement id="a_RoundTripHome">
-        <componentfileref idref="com-RoundTrip"/>
-        <componentinstantiation id="a_RoundTrip"/>
-      </homeplacement>
 
      </partitioning>
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.csd b/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.csd
index 61745954d48..c52288e3207 100644
--- a/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.csd
+++ b/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.csd
@@ -30,7 +30,7 @@
     <softpkgref>
     <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
     <fileinarchive name="RoundTripClient.ssd"/>
-    <implref idref="DEC:cf88cb97-b5a8-4522-9fa3-e626c75c5470"/>
+    <implref idref="DCE:cf88cb97-b5a8-4522-9fa3-e626c75c5470"/>
     </softpkgref>
   </dependency>
 
diff --git a/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.ssd b/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.ssd
index 2d151ba3122..86397731ed2 100644
--- a/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.ssd
+++ b/TAO/CIAO/performance-tests/Benchmark/descriptors/RoundTripClient.ssd
@@ -2,9 +2,7 @@
 
 <!-- If this file is moved to a different directory, make sure to change the
      path to the DTD below. Otherwise the examples won't work. -->
-<!--
-<!DOCTYPE softpkg SYSTEM "../../../../../docs/XML/softpkg.dtd">
--->
+<!DOCTYPE softpkg SYSTEM "http://www.dre.vanderbilt.edu/CIAO/DTD/softpkg.dtd">
 <!-- RoundTripClient's Servant Software Descriptor  -->
 <!-- This file describes various RoundTripClient servant -->
 <!-- implementations. -->
@@ -26,7 +24,7 @@
     <fileinarchive name="RoundTripClient.ccd"/>
   </descriptor>
 
-  <implementation id="DCE:568a3872-f7bb-4b3f-baba-44c6824d966d">
+  <implementation id="DCE:cf88cb97-b5a8-4522-9fa3-e626c75c5470">
 
     <dependency type="ORB">
       <name>TAO</name>