2 files changed, 46 insertions, 2 deletions
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp
index 4744b63373c..fd7f29acd57 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp
@@ -279,8 +279,6 @@ namespace CIAO_Throughput_Sender_Impl
   Sender_exec_i::start (void)
   {
     ACE_UINT64 const sec = this->duration_run_ + 5;
-    (void) ACE_High_Res_Timer::global_scale_factor ();
-    this->reactor ()->timer_queue()->gettimeofday (&ACE_High_Res_Timer::gettimeofday_hr);
     if (this->reactor ()->schedule_timer (
                     this->ticker_,
                     0,
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 937563720a2..92f5f3a2062 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
@@ -7,6 +7,22 @@
   <label>Throughput_Depl_2</label>
   <UUID>Throughput_Depl_2</UUID>
 
+  <implementation xmi:id="CompSvrImpl">
+    <name>CompSvr</name>
+    <source />
+    <artifact xmi:idref="CompSvrArt" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
 
   <implementation xmi:id="Throughput_ConnectorComponentImplementation">
     <name>Throughput_ConnectorComponentImplementation</name>
@@ -224,6 +240,23 @@
     </configProperty>
   </instance>
 
+  <instance xmi:id="CompSvrInst">
+    <name>ComponentServerInstance</name>
+    <node>SenderNode</node>
+    <source />
+    <implementation xmi:idref="CompSvrImpl" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>-ORBSvcConfDirective "static Time_Policy_Manager '-ORBTimePolicyStrategy HR'"</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
   <instance xmi:id="SenderComponentInstance">
     <name>SenderComponent</name>
     <node>SenderNode</node>
@@ -358,6 +391,12 @@
     </internalEndpoint>
   </connection>
 
+  <artifact xmi:id="CompSvrArt">
+    <name>CompoSvrArtifactName</name>
+    <source />
+    <node />
+    <location>dance_locality_manager</location>
+  </artifact>
   <artifact xmi:id="Sender_ExecArtifact">
     <name>Sender_exec</name>
     <source/>
@@ -412,4 +451,11 @@
     <node/>
     <location>DDS_Throughput_Sec_Connector_stub</location>
   </artifact>
+  
+  <localityConstraint>
+    <constraint>SameProcess</constraint>
+    <constrainedInstance xmi:idref="CompSvrInst" />
+    <constrainedInstance xmi:idref="SenderComponentInstance" />
+  </localityConstraint>
+
  </Deployment:DeploymentPlan>