*** empty log message ***

4 files changed, 364 insertions, 6 deletions

diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_rt.rtd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_rt.rtd
index 8e2847839db..657cc5c3654 100644
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_rt.rtd
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_rt.rtd
@@ -50,14 +50,14 @@
                 max_buffer="0"
                 buffer_size="0">
       <lane priority="1"
-            static_threads="10"
-            dynamic_threads="30"/>
+            static_threads="2"
+            dynamic_threads="0"/>
       <lane priority="2"
-            static_threads="3"
-            dynamic_threads="3"/>
+            static_threads="2"
+            dynamic_threads="0"/>
       <lane priority="3"
-            static_threads="1"
-            dynamic_threads="2"/>
+            static_threads="2"
+            dynamic_threads="0"/>
     </threadpoolwithlanes>
 
     <connectionbands id="common_conn">
@@ -85,6 +85,21 @@
     <threadpool_policy idref="high_prio_pool"/>
   </rtpolicyset>
 
+  <rtpolicyset id="LOW_POLICY_LANED_POOL">
+    <priority_model_policy type="server_declared" priority="1"/>
+    <threadpool_policy idref="laned_pool"/>
+  </rtpolicyset>
+
+  <rtpolicyset id="MID_POLICY_LANED_POOL">
+    <priority_model_policy type="server_declared" priority="2"/>
+    <threadpool_policy idref="laned_pool"/>
+  </rtpolicyset>
+
+  <rtpolicyset id="HIGH_POLICY_LANED_POOL">
+    <priority_model_policy type="server_declared" priority="3"/>
+    <threadpool_policy idref="laned_pool"/>
+  </rtpolicyset>
+
   <rtpolicyset id="HIGH_CONN_POLICY">
     <priority_model_policy type="client_propagated" priority="2"/>
     <threadpool_policy idref="high_prio_pool"/>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-dec.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-dec.cad
new file mode 100644
index 00000000000..86056c30586
--- /dev/null
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-dec.cad
@@ -0,0 +1,124 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- 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 componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
+
+<!-- 3 rate test with increasing prio = decreasing rate -->
+
+<componentassembly id="A test assembly for 3 worker running on 3 rates.">
+  <componentfiles>
+    <componentfile id="com-Controller25">
+      <fileinarchive name="Controller25.csd"/>
+    </componentfile>
+    <componentfile id="com-Controller50">
+      <fileinarchive name="Controller50.csd"/>
+    </componentfile>
+    <componentfile id="com-Controller75">
+      <fileinarchive name="Controller75.csd"/>
+    </componentfile>
+    <componentfile id="com-Worker">
+      <fileinarchive name="CB_Worker.csd"/>
+    </componentfile>
+  </componentfiles>
+
+  <partitioning>
+  <!-- Install component on 2 processes without any RT extension -->
+     <processcollocation>
+      <homeplacement id="a25_WorkerHome">
+        <componentfileref idref="com-Worker"/>
+        <componentinstantiation id="a_W25"/>
+        <extension class="RT-POLICY-SET"
+                   origin="CIAO">HIGH_POLICY_LANED_POOL</extension>
+      </homeplacement>
+
+      <homeplacement id="a50_WorkerHome">
+        <componentfileref idref="com-Worker"/>
+        <componentinstantiation id="a_W50"/>
+        <extension class="RT-POLICY-SET"
+                   origin="CIAO">MID_POLICY_LANED_POOL</extension>
+      </homeplacement>
+
+      <homeplacement id="a75_WorkerHome">
+        <componentfileref idref="com-Worker"/>
+        <componentinstantiation id="a_W75"/>
+        <extension class="RT-POLICY-SET"
+                   origin="CIAO">LOW_POLICY_LANED_POOL</extension>
+      </homeplacement>
+      <extension class="RT-CAD-EXT" origin="CIAO">basic_rt.rtd</extension>
+     </processcollocation>
+
+     <!-- We will run on server's priority -->
+     <processcollocation>
+      <homeplacement id="a_C25Home">
+        <componentfileref idref="com-Controller25"/>
+        <componentinstantiation id="a_C25">
+          <registercomponent>
+            <!-- writeiortofile is a non-standard CIAO extension.  -->
+            <writeiortofile name="c25.ior"/>
+          </registercomponent>
+        </componentinstantiation>
+      </homeplacement>
+
+      <homeplacement id="a_C50Home">
+        <componentfileref idref="com-Controller50"/>
+        <componentinstantiation id="a_C50">
+          <registercomponent>
+            <!-- writeiortofile is a non-standard CIAO extension.  -->
+            <writeiortofile name="c50.ior"/>
+          </registercomponent>
+        </componentinstantiation>
+      </homeplacement>
+
+      <homeplacement id="a_C75Home">
+        <componentfileref idref="com-Controller75"/>
+        <componentinstantiation id="a_C75">
+          <registercomponent>
+            <!-- writeiortofile is a non-standard CIAO extension.  -->
+            <writeiortofile name="c75.ior"/>
+          </registercomponent>
+        </componentinstantiation>
+      </homeplacement>
+     <destination>Remote</destination>
+     </processcollocation>
+
+  </partitioning>
+
+  <connections>
+
+    <connectinterface>
+      <usesport>
+        <usesidentifier>worker</usesidentifier>
+        <componentinstantiationref idref="a_C25"/>
+      </usesport>
+      <providesport>
+        <providesidentifier>some_device</providesidentifier>
+        <componentinstantiationref idref="a_W25"/>
+      </providesport>
+    </connectinterface>
+
+    <connectinterface>
+      <usesport>
+        <usesidentifier>worker</usesidentifier>
+        <componentinstantiationref idref="a_C50"/>
+      </usesport>
+      <providesport>
+        <providesidentifier>some_device</providesidentifier>
+        <componentinstantiationref idref="a_W50"/>
+      </providesport>
+    </connectinterface>
+
+    <connectinterface>
+      <usesport>
+        <usesidentifier>worker</usesidentifier>
+        <componentinstantiationref idref="a_C75"/>
+      </usesport>
+      <providesport>
+        <providesidentifier>some_device</providesidentifier>
+        <componentinstantiationref idref="a_W75"/>
+      </providesport>
+    </connectinterface>
+
+  </connections>
+
+</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-inc.cad b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-inc.cad
new file mode 100644
index 00000000000..da9d30938e9
--- /dev/null
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/rt-3rates-laned-inc.cad
@@ -0,0 +1,124 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- 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 componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
+
+<!-- 3 rate test with increasing prio = decreasing rate -->
+
+<componentassembly id="A test assembly for 3 worker running on 3 rates.">
+  <componentfiles>
+    <componentfile id="com-Controller25">
+      <fileinarchive name="Controller25.csd"/>
+    </componentfile>
+    <componentfile id="com-Controller50">
+      <fileinarchive name="Controller50.csd"/>
+    </componentfile>
+    <componentfile id="com-Controller75">
+      <fileinarchive name="Controller75.csd"/>
+    </componentfile>
+    <componentfile id="com-Worker">
+      <fileinarchive name="CB_Worker.csd"/>
+    </componentfile>
+  </componentfiles>
+
+  <partitioning>
+  <!-- Install component on 2 processes without any RT extension -->
+     <processcollocation>
+      <homeplacement id="a25_WorkerHome">
+        <componentfileref idref="com-Worker"/>
+        <componentinstantiation id="a_W25"/>
+        <extension class="RT-POLICY-SET"
+                   origin="CIAO">LOW_POLICY_LANED_POOL</extension>
+      </homeplacement>
+
+      <homeplacement id="a50_WorkerHome">
+        <componentfileref idref="com-Worker"/>
+        <componentinstantiation id="a_W50"/>
+        <extension class="RT-POLICY-SET"
+                   origin="CIAO">MID_POLICY_LANED_POOL</extension>
+      </homeplacement>
+
+      <homeplacement id="a75_WorkerHome">
+        <componentfileref idref="com-Worker"/>
+        <componentinstantiation id="a_W75"/>
+        <extension class="RT-POLICY-SET"
+                   origin="CIAO">HIGH_POLICY_LANED_POOL</extension>
+      </homeplacement>
+      <extension class="RT-CAD-EXT" origin="CIAO">basic_rt.rtd</extension>
+     </processcollocation>
+
+     <!-- We will run on server's priority -->
+     <processcollocation>
+      <homeplacement id="a_C25Home">
+        <componentfileref idref="com-Controller25"/>
+        <componentinstantiation id="a_C25">
+          <registercomponent>
+            <!-- writeiortofile is a non-standard CIAO extension.  -->
+            <writeiortofile name="c25.ior"/>
+          </registercomponent>
+        </componentinstantiation>
+      </homeplacement>
+
+      <homeplacement id="a_C50Home">
+        <componentfileref idref="com-Controller50"/>
+        <componentinstantiation id="a_C50">
+          <registercomponent>
+            <!-- writeiortofile is a non-standard CIAO extension.  -->
+            <writeiortofile name="c50.ior"/>
+          </registercomponent>
+        </componentinstantiation>
+      </homeplacement>
+
+      <homeplacement id="a_C75Home">
+        <componentfileref idref="com-Controller75"/>
+        <componentinstantiation id="a_C75">
+          <registercomponent>
+            <!-- writeiortofile is a non-standard CIAO extension.  -->
+            <writeiortofile name="c75.ior"/>
+          </registercomponent>
+        </componentinstantiation>
+      </homeplacement>
+     <destination>Remote</destination>
+     </processcollocation>
+
+  </partitioning>
+
+  <connections>
+
+    <connectinterface>
+      <usesport>
+        <usesidentifier>worker</usesidentifier>
+        <componentinstantiationref idref="a_C25"/>
+      </usesport>
+      <providesport>
+        <providesidentifier>some_device</providesidentifier>
+        <componentinstantiationref idref="a_W25"/>
+      </providesport>
+    </connectinterface>
+
+    <connectinterface>
+      <usesport>
+        <usesidentifier>worker</usesidentifier>
+        <componentinstantiationref idref="a_C50"/>
+      </usesport>
+      <providesport>
+        <providesidentifier>some_device</providesidentifier>
+        <componentinstantiationref idref="a_W50"/>
+      </providesport>
+    </connectinterface>
+
+    <connectinterface>
+      <usesport>
+        <usesidentifier>worker</usesidentifier>
+        <componentinstantiationref idref="a_C75"/>
+      </usesport>
+      <providesport>
+        <providesidentifier>some_device</providesidentifier>
+        <componentinstantiationref idref="a_W75"/>
+      </providesport>
+    </connectinterface>
+
+  </connections>
+
+</componentassembly>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/shared_rt.rtd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/shared_rt.rtd
new file mode 100644
index 00000000000..066792e791e
--- /dev/null
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/shared_rt.rtd
@@ -0,0 +1,95 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- 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 rtcad_ext SYSTEM "../../../../docs/XML/ciao_rt_cad_ext.dtd">
+
+<!-- Here is a sample real-time cad file extension descriptor. -->
+<!-- Take a look at the RTCAD-example.cad to see how to associate -->
+<!-- a componentassembly descriptor file with this file and how to -->
+<!-- use the policy sets defined in this file. -->
+
+<rtcad_ext>
+
+  <!-- First, we need to define how we are going to allocate -->
+  <!-- real-time related resources. -->
+  <rtresources>
+
+    <threadpool id="common_pool"
+                stacksize="0"
+                static_threads="3"
+                dynamic_threads="0"
+                priority="1"
+                buffering="no"
+                max_buffer="0"
+                buffer_size="0"/>
+
+    <threadpool id="middle_pool"
+                stacksize="0"
+                static_threads="3"
+                dynamic_threads="0"
+                priority="2"
+                buffering="no"
+                max_buffer="0"
+                buffer_size="0"/>
+
+    <threadpool id="high_prio_pool"
+                stacksize="0"
+                static_threads="3"
+                dynamic_threads="0"
+                priority="3"
+                buffering="no"
+                max_buffer="0"
+                buffer_size="0"/>
+
+  </rtresources>
+
+  <!-- Then, we define sets of policies that can be associated with -->
+  <!-- containers (or <homeplacement> rather) -->
+
+  <rtpolicyset id="LOW_PRIO_LOW_POOL">
+    <priority_model_policy type="server_declared" priority="1"/>
+    <threadpool_policy idref="common_pool"/>
+  </rtpolicyset>
+
+  <rtpolicyset id="MID_PRIO_LOW_POOL">
+    <priority_model_policy type="server_declared" priority="2"/>
+    <threadpool_policy idref="common_pool"/>
+  </rtpolicyset>
+
+  <rtpolicyset id="HIGH_PRIO_LOW_POOL">
+    <priority_model_policy type="server_declared" priority="3"/>
+    <threadpool_policy idref="common_pool"/>
+  </rtpolicyset>
+
+  <rtpolicyset id="LOW_PRIO_MID_POOL">
+    <priority_model_policy type="server_declared" priority="1"/>
+    <threadpool_policy idref="common_pool"/>
+  </rtpolicyset>
+
+  <rtpolicyset id="MID_PRIO_MID_POOL">
+    <priority_model_policy type="server_declared" priority="2"/>
+    <threadpool_policy idref="common_pool"/>
+  </rtpolicyset>
+
+  <rtpolicyset id="HIGH_PRIO_MID_POOL">
+    <priority_model_policy type="server_declared" priority="3"/>
+    <threadpool_policy idref="common_pool"/>
+  </rtpolicyset>
+
+  <rtpolicyset id="LOW_PRIO_HIGH_POOL">
+    <priority_model_policy type="server_declared" priority="1"/>
+    <threadpool_policy idref="common_pool"/>
+  </rtpolicyset>
+
+  <rtpolicyset id="MID_PRIO_HIGH_POOL">
+    <priority_model_policy type="server_declared" priority="2"/>
+    <threadpool_policy idref="common_pool"/>
+  </rtpolicyset>
+
+  <rtpolicyset id="HIGH_PRIO_HIGH_POOL">
+    <priority_model_policy type="server_declared" priority="3"/>
+    <threadpool_policy idref="common_pool"/>
+  </rtpolicyset>
+
+</rtcad_ext>
\ No newline at end of file