From a6bcc4a0a11b1fb7663e58a18c454882a53a75fd Mon Sep 17 00:00:00 2001
From: msmit <msmit@remedy.nl>
Date: Fri, 16 Dec 2011 12:41:06 +0000
Subject: Fri Dec 16 12:39:56 UTC 2011  Marcel Smit  <msmit@remedy.nl>

        * bin/ciao_tests.lst:
          Added performance-tests/Keyed to the test framework.

        * ciao/Deployment/Handlers/Connection_Handler.cpp:
          Optimized logging.

        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp:
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp:
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp:
        * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp:
        * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp:
        * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp:
          Fixed runtime issues. Also cleaned up unused code.
---
 CIAO/ChangeLog                                     | 16 +++++
 CIAO/bin/ciao_tests.lst                            |  1 +
 .../Deployment/Handlers/Connection_Handler.cpp     |  2 +-
 .../performance-tests/Keyed/descriptors/Plan.cdp   |  1 +
 .../Keyed/descriptors/Plan_pub.cdp                 |  1 +
 .../Keyed/descriptors/Plan_pub3.cdp                |  1 +
 .../Latency/descriptors/Plan_SharedMem.cdp         | 72 +---------------------
 .../Latency/descriptors/Plan_UDPv4.cdp             | 72 +---------------------
 .../Throughput/descriptors/Plan_pub.cdp            |  2 +
 9 files changed, 29 insertions(+), 139 deletions(-)

(limited to 'CIAO')

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 339b1796b61..47ec452f4b7 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,19 @@
+Fri Dec 16 12:39:56 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/ciao_tests.lst:
+          Added performance-tests/Keyed to the test framework.
+
+        * ciao/Deployment/Handlers/Connection_Handler.cpp:
+          Optimized logging.
+
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp:
+        * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp:
+        * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp:
+        * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp:
+          Fixed runtime issues. Also cleaned up unused code.
+
 Fri Dec 16 07:37:37 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst
index 25491d9e44d..9fd1babb2c2 100644
--- a/CIAO/bin/ciao_tests.lst
+++ b/CIAO/bin/ciao_tests.lst
@@ -143,6 +143,7 @@ TAO/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/run_test.pl: !ST
 TAO/CIAO/connectors/dds4ccm/tests/TypeSupport/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/scripts/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
+TAO/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_dds.pl: !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/descriptors/run_test_ndds.pl: !ACE_FOR_TAO !ST NDDS
diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp
index 421ba9e9128..fc74c133df2 100644
--- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp
@@ -953,7 +953,7 @@ namespace CIAO
                         conn.internalEndpoint.length ()));
 
         throw ::Deployment::InvalidConnection (conn.name.in (),
-                                                "Local connections require exactly 2 internalEndpoints");
+                                                " Local connections require exactly 2 internalEndpoints");
       }
 
     const ::Deployment::PlanSubcomponentPortEndpoint &facet_endpoint =
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp
index acd00625a4b..ed7e9bd4f1a 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp
@@ -535,6 +535,7 @@
     <constraint>SameProcess</constraint>
     <constrainedInstance xmi:idref="CompSvrInst" />
     <constrainedInstance xmi:idref="SenderComponentInstance" />
+    <constrainedInstance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
   </localityConstraint>
 
 </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp
index aa00f978bd8..a507c5cbebc 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp
@@ -387,6 +387,7 @@
     <constraint>SameProcess</constraint>
     <constrainedInstance xmi:idref="CompSvrInst" />
     <constrainedInstance xmi:idref="SenderComponentInstance" />
+    <constrainedInstance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
   </localityConstraint>
 
  </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp
index 025e436c62a..8ffedf70dc4 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp
@@ -387,6 +387,7 @@
     <constraint>SameProcess</constraint>
     <constrainedInstance xmi:idref="CompSvrInst" />
     <constrainedInstance xmi:idref="SenderComponentInstance" />
+    <constrainedInstance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
   </localityConstraint>
 
  </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp
index b263d1ebb45..46723661993 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp
@@ -128,57 +128,6 @@
     </execParameter>
   </implementation>
 
-  <!--implementation xmi:id="LatencyTT_TestSec_ConnectorComponentImplementation">
-    <name>LatencyTT_TestSec_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="LatencyTT_TestSec_Connector_ExecArtifact" />
-    <artifact xmi:idref="LatencyTT_TestSec_Connector_SvntArtifact" />
-    <execParameter>
-        <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_LatencyTT_TestSec_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_LatencyTT_TestSec_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LatencyTT_TestSec_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LatencyTT_TestSec_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation-->
-
   <implementation xmi:id="SenderComponentImplementation">
     <name>SenderComponentImplementation</name>
     <source/>
@@ -316,6 +265,7 @@
       </value>
     </configProperty>
   </instance>
+
   <instance xmi:id="SenderComponentInstance">
     <name>SenderComponent</name>
     <node>SenderNode</node>
@@ -617,29 +567,13 @@
     <node/>
     <location>DDS_LatencyTT_Test_Connector_stub</location>
   </artifact>
-  <!-->artifact xmi:id="LatencyTT_TestSec_Connector_ExecArtifact">
-    <name>LatencyTT_TestSec_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_TestSec_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="LatencyTT_TestSec_Connector_SvntArtifact">
-    <name>LatencyTT_TestSec_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_TestSec_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="LatencyTT_TestSec_Connector_StubArtifact">
-    <name>LatencyTT_TestSec_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_TestSec_Connector_stub</location>
-  </artifact-->
 
   <localityConstraint>
     <constraint>SameProcess</constraint>
     <constrainedInstance xmi:idref="CompSvrInst" />
     <constrainedInstance xmi:idref="SenderComponentInstance" />
+    <constrainedInstance xmi:idref="LatencyTT_Test_ConnectorComponentInstance" />
+    <constrainedInstance xmi:idref="LatencyTT_Test_ConnectorComponentInstanceb" />
   </localityConstraint>
 
 </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp
index 773d8a350b3..6883051dd09 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp
@@ -128,57 +128,6 @@
     </execParameter>
   </implementation>
 
-  <!--implementation xmi:id="LatencyTT_TestSec_ConnectorComponentImplementation">
-    <name>LatencyTT_TestSec_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="LatencyTT_TestSec_Connector_ExecArtifact" />
-    <artifact xmi:idref="LatencyTT_TestSec_Connector_SvntArtifact" />
-    <execParameter>
-        <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_LatencyTT_TestSec_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_LatencyTT_Test_LatencyTT_TestSec_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LatencyTT_TestSec_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>LatencyTT_TestSec_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation-->
-
   <implementation xmi:id="SenderComponentImplementation">
     <name>SenderComponentImplementation</name>
     <source/>
@@ -316,6 +265,7 @@
       </value>
     </configProperty>
   </instance>
+
   <instance xmi:id="SenderComponentInstance">
     <name>SenderComponent</name>
     <node>SenderNode</node>
@@ -617,29 +567,13 @@
     <node/>
     <location>DDS_LatencyTT_Test_Connector_stub</location>
   </artifact>
-  <!-->artifact xmi:id="LatencyTT_TestSec_Connector_ExecArtifact">
-    <name>LatencyTT_TestSec_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_TestSec_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="LatencyTT_TestSec_Connector_SvntArtifact">
-    <name>LatencyTT_TestSec_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_TestSec_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="LatencyTT_TestSec_Connector_StubArtifact">
-    <name>LatencyTT_TestSec_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_LatencyTT_TestSec_Connector_stub</location>
-  </artifact-->
 
   <localityConstraint>
     <constraint>SameProcess</constraint>
     <constrainedInstance xmi:idref="CompSvrInst" />
     <constrainedInstance xmi:idref="SenderComponentInstance" />
+    <constrainedInstance xmi:idref="LatencyTT_Test_ConnectorComponentInstanceb" />
+    <constrainedInstance xmi:idref="LatencyTT_Test_ConnectorComponentInstance" />
   </localityConstraint>
 
 </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
index a9b5247fd6d..d8fcd6d800d 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
@@ -456,6 +456,8 @@
     <constraint>SameProcess</constraint>
     <constrainedInstance xmi:idref="CompSvrInst" />
     <constrainedInstance xmi:idref="SenderComponentInstance" />
+    <constrainedInstance xmi:idref="Throughput_ConnectorComponentInstance" />
+    <constrainedInstance xmi:idref="Throughput_Sec_ConnectorComponentInstance" />
   </localityConstraint>
 
  </Deployment:DeploymentPlan>
-- 
cgit v1.2.1