diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/performance-tests/Latency')
3 files changed, 94 insertions, 2 deletions
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp index 20e8ff48be9..729f807942d 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp @@ -416,8 +416,6 @@ namespace CIAO_LatencyTT_Test_Sender_Impl ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::start - " "Start test with interval <%u.%u>\n", sec, usec)); - (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/Latency/descriptors/Plan_SharedMem.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp index 14cb9e1f05d..f2fbc2eeb88 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_SharedMem.cdp @@ -7,6 +7,23 @@ <label>LatencyTT_Test_Depl</label> <UUID>LatencyTT_Test_Depl</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="ReceiverComponentImplementation"> <name>ReceiverComponentImplementation</name> <source/> @@ -282,6 +299,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> @@ -523,6 +557,12 @@ </internalEndpoint> </connection> + <artifact xmi:id="CompSvrArt"> + <name>CompoSvrArtifactName</name> + <source /> + <node /> + <location>dance_locality_manager</location> + </artifact> <artifact xmi:id="Receiver_ExecArtifact"> <name>Receiver_exec</name> <source/> @@ -595,4 +635,11 @@ <node/> <location>DDS_LatencyTT_TestSec_Connector_stub</location> </artifact--> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="CompSvrInst" /> + <constrainedInstance xmi:idref="SenderComponentInstance" /> + </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 60b98b622aa..154f3b33733 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_UDPv4.cdp @@ -7,6 +7,23 @@ <label>LatencyTT_Test_Depl</label> <UUID>LatencyTT_Test_Depl</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="ReceiverComponentImplementation"> <name>ReceiverComponentImplementation</name> <source/> @@ -282,6 +299,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> @@ -523,6 +557,12 @@ </internalEndpoint> </connection> + <artifact xmi:id="CompSvrArt"> + <name>CompoSvrArtifactName</name> + <source /> + <node /> + <location>dance_locality_manager</location> + </artifact> <artifact xmi:id="Receiver_ExecArtifact"> <name>Receiver_exec</name> <source/> @@ -595,4 +635,11 @@ <node/> <location>DDS_LatencyTT_TestSec_Connector_stub</location> </artifact--> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="CompSvrInst" /> + <constrainedInstance xmi:idref="SenderComponentInstance" /> + </localityConstraint> + </Deployment:DeploymentPlan> |