diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors')
8 files changed, 42 insertions, 112 deletions
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp index dd5d8430507..33145eef113 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp @@ -232,13 +232,24 @@ <source/> <implementation xmi:idref="SenderComponentImplementation" /> <configProperty> + <name>keys</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>1</ushort> + </value> + </value> + </configProperty> + <configProperty> <name>iterations</name> <value> <type> <kind>tk_ulong</kind> </type> <value> - <ulong>1000</ulong> + <ulong>10000</ulong> </value> </value> </configProperty> @@ -249,7 +260,7 @@ <kind>tk_ushort</kind> </type> <value> - <ushort>100</ushort> + <ushort>2</ushort> </value> </value> </configProperty> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp index eb702b501a4..2bd8d98972b 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp @@ -133,7 +133,7 @@ <kind>tk_string</kind> </type> <value> - <string>HelloTest_Library#LatencyPubQoS</string> + <string>HelloTest_Library#LatencyQoS</string> </value> </value> </configProperty> @@ -145,6 +145,17 @@ <source/> <implementation xmi:idref="SenderComponentImplementation" /> <configProperty> + <name>keys</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>1</ushort> + </value> + </value> + </configProperty> + <configProperty> <name>iterations</name> <value> <type> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp index ec60487f40e..5d8e36c520a 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp @@ -140,7 +140,7 @@ <kind>tk_string</kind> </type> <value> - <string>HelloTest_Library#LatencySubQoS</string> + <string>HelloTest_Library#LatencyQoS</string> </value> </value> </configProperty> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README deleted file mode 100644 index acc1aab79df..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README +++ /dev/null @@ -1,17 +0,0 @@ - -This performace test shows the latency. The test can run with different options. - -- separate publisher and subscriber: - run_pub.pl and run_sub.pl with resp. Plan_pub.cdp and Plan_sub.cdp . - -- to check if test still compiles and runs , use this test - one publisher and one subscriber in 1 process : - run_test.pl with resp. Plan.cdp - - - - -To test changes in the next attributes, changes this values in the publisher cdp-files: -iterations : the number of messages from one instance to send. Has to be greater as 0. -datalen: the datalen of a message (minimal 32). -sleep: time in ms to sleep before writing the next message diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml index a69acd07537..9b472b3f879 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml @@ -39,9 +39,7 @@ RTI Data Distribution Service user manual. <kind>KEEP_ALL_HISTORY_QOS</kind> </history> <durability> - <!--kind>TRANSIENT_DURABILITY_QOS</kind--> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> + <kind>TRANSIENT_DURABILITY_QOS</kind> </durability> <resource_limits> <max_instances>1</max_instances> @@ -72,86 +70,22 @@ RTI Data Distribution Service user manual. <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance> </resource_limits> <durability> - <!--kind>TRANSIENT_DURABILITY_QOS</kind--> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> + <kind>TRANSIENT_DURABILITY_QOS</kind> </durability> </datareader_qos> + </qos_profile> - - <qos_profile name="LatencyPubQoS" is_default_qos="true"> - <!-- QoS used to configure the data writer created in the example code --> - <datawriter_qos> - <reliability> - <kind>RELIABLE_RELIABILITY_QOS</kind> - <max_blocking_time> - <sec>DURATION_INFINITE_SEC</sec> - <nanosec>DURATION_INFINITE_NSEC</nanosec> - </max_blocking_time> - </reliability> - <history> - <kind>KEEP_ALL_HISTORY_QOS</kind> - </history> - <durability> - <!--kind>TRANSIENT_DURABILITY_QOS</kind--> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> - </durability> - <resource_limits> - <max_instances>1</max_instances> - <initial_instances>1</initial_instances> - <max_samples>LENGTH_UNLIMITED</max_samples> - <initial_samples>100</initial_samples> - <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance> - </resource_limits> - <protocol> - <rtps_reliable_writer> - <max_heartbeat_retries>10</max_heartbeat_retries> - </rtps_reliable_writer> - </protocol> - </datawriter_qos> - <!-- QoS used to configure the data reader created in the example code --> - <datareader_qos> - <reliability> - <kind>RELIABLE_RELIABILITY_QOS</kind> - </reliability> - <history> - <kind>KEEP_ALL_HISTORY_QOS</kind> - </history> - <resource_limits> - <initial_samples>100</initial_samples> - <initial_instances>1</initial_instances> - <max_samples>LENGTH_UNLIMITED</max_samples> - <max_instances>1</max_instances> - <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance> - </resource_limits> - <durability> - <!--kind>TRANSIENT_DURABILITY_QOS</kind--> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> - </durability> - <ownership> - <kind>EXCLUSIVE_OWNERSHIP_QOS</kind> - </ownership> - </datareader_qos> - </qos_profile> - - <qos_profile name="LatencySubQoS" is_default_qos="true"> + <qos_profile name="BestEffortQoS" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> - <kind>RELIABLE_RELIABILITY_QOS</kind> - <max_blocking_time> - <sec>DURATION_INFINITE_SEC</sec> - <nanosec>DURATION_INFINITE_NSEC</nanosec> - </max_blocking_time> - </reliability> + <kind>BEST_EFFORT_RELIABILITY_QOS</kind> + </reliability> <history> <kind>KEEP_ALL_HISTORY_QOS</kind> </history> <durability> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> + <kind>TRANSIENT_DURABILITY_QOS</kind> </durability> <resource_limits> <max_instances>1</max_instances> @@ -160,12 +94,6 @@ RTI Data Distribution Service user manual. <initial_samples>100</initial_samples> <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance> </resource_limits> - <ownership> - <kind>EXCLUSIVE_OWNERSHIP_QOS</kind> - </ownership> - <ownership_strength> - <value>2</value> - </ownership_strength> <protocol> <rtps_reliable_writer> <max_heartbeat_retries>10</max_heartbeat_retries> @@ -175,7 +103,7 @@ RTI Data Distribution Service user manual. <!-- QoS used to configure the data reader created in the example code --> <datareader_qos> <reliability> - <kind>RELIABLE_RELIABILITY_QOS</kind> + <kind>BEST_EFFORT_RELIABILITY_QOS</kind> </reliability> <history> <kind>KEEP_ALL_HISTORY_QOS</kind> @@ -188,12 +116,9 @@ RTI Data Distribution Service user manual. <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance> </resource_limits> <durability> - <!--kind>TRANSIENT_DURABILITY_QOS</kind--> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> + <kind>TRANSIENT_DURABILITY_QOS</kind> </durability> </datareader_qos> - </qos_profile> </qos_library> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl index 0bddce23b81..72c16054137 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl @@ -206,15 +206,15 @@ for ($i = 0; $i < $nr_daemon; ++$i) { } } -print "Sleeping 300 seconds to allow task to complete\n"; -sleep (300); +print "Sleeping 180 seconds to allow task to complete\n"; +sleep (180); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl index 11699c42b49..dae8581f1d5 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl @@ -206,15 +206,15 @@ for ($i = 0; $i < $nr_daemon; ++$i) { } } -print "Sleeping 300 seconds to allow task to complete\n"; -sleep (300); +print "Sleeping 180 seconds to allow task to complete\n"; +sleep (180); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl index c0ea51d4d5c..5ed32dfb116 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl @@ -216,7 +216,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; |