ChangeLogTag:Sat Oct 11 23:19:31 2003 Nanbor Wang <nanbor@cs.wustl.edu>

8 files changed, 234 insertions, 0 deletions

diff --git a/TAO/CIAO/tests/RTCCM/ChangeLog b/TAO/CIAO/tests/RTCCM/ChangeLog
index 04ad9bbc414..596cced7135 100644
--- a/TAO/CIAO/tests/RTCCM/ChangeLog
+++ b/TAO/CIAO/tests/RTCCM/ChangeLog
@@ -1,3 +1,17 @@
+Sat Oct 11 23:19:31 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tests/RTCCM/Priority_Test/descriptors/CB_Worker.csd:
+	* tests/RTCCM/Priority_Test/descriptors/IOB_Worker.csd:
+	* tests/RTCCM/Priority_Test/descriptors/Wroker.ssd:
+	* tests/RTCCM/Priority_Test/descriptors/CIAO_Installation_Data.ini:
+	* tests/RTCCM/Priority_Test/descriptors/Controller.csd:
+	* tests/RTCCM/Priority_Test/descriptors/Controller.ssd:
+	* tests/RTCCM/Priority_Test/descriptors/RTsvc.conf:
+	* tests/RTCCM/Priority_Test/descriptors/svcmap.dat:
+	* tests/RTCCM/Priority_Test/descriptors/test.dat:
+	* tests/RTCCM/Priority_Test/descriptors/test.rtd: New files for
+	  running the test.
+
 Sat Oct 11 00:11:18 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tests/RTCCM/Priority_Test/Priority_Test.mpc:
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/CIAO_Installation_Data.ini b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/CIAO_Installation_Data.ini
new file mode 100644
index 00000000000..a2aca1cab21
--- /dev/null
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/CIAO_Installation_Data.ini
@@ -0,0 +1,6 @@
+[ComponentInstallation]
+DCE:53E7624B-96D9-4E2B-BD73-66A56082AA1A=Worker_svnt
+DCE:1EB5F4C6-7F5D-43F2-9A44-E89B6E96377F=CB_Worker_exec
+DCE:A99FBAC6-823B-42D3-87B1-404D2DFCD690=IOB_Worker_exec
+DCE:A4981A0E-DF91-46B1-A77C-58B6052CC799=Controller_svnt
+DCE:9663E039-96F8-41BE-BDA9-3BF4654DE996=Controller_exec
\ No newline at end of file
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.csd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.csd
new file mode 100644
index 00000000000..f155a42903f
--- /dev/null
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.csd
@@ -0,0 +1,64 @@
+<?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 softpkg SYSTEM "../../../docs/XML/softpkg.dtd">
+
+<!-- Controller Software Package Descriptor  -->
+<!-- This file describes various Controller executors -->
+<!-- implementations. -->
+
+
+<softpkg name="CIAO-Controller" version="1.0">
+  <pkgtype>CORBA Component</pkgtype>
+  <title>Controller Component</title>
+  <author>
+    <company>Washington University in St. Louis</company>
+    <webpage href="http://www.cs.wustl.edu/~doc/"/>
+  </author>
+  <description>A controller executor implementation.</description>
+  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
+  <idl id="IDL:Priority_Test/Controller:1.0" homeid="IDL:Priority_Test/ControllerHome:1.0">
+    <fileinarchive name="Controller.idl"/>
+  </idl>
+
+  <!-- We don't need a property file for this example.  However,         -->
+  <!-- what to do with this element?  Cache it in ComponentInstallation? -->
+  <!-- A better question maybe, when do we actually read the file and    -->
+  <!-- build the attributes defined in the file?  By Assembly perhaps?   -->
+  <!-- Notice that this property file applies to the implementation itself. -->
+  <!-- Whatever that means. -->
+<!--   <propertyfile> -->
+<!--     <fileinarchive name="empty.cpf"/> -->
+<!--   </propertyfile> -->
+
+  <descriptor type="CORBA Component">
+    <fileinarchive name="Controller.ccd"/>
+  </descriptor>
+
+  <implementation id="DCE:9663E039-96F8-41BE-BDA9-3BF4654DE996">
+
+    <!-- CIAO extension -->
+    <dependency type="CIAODLL">
+      <softpkgref>
+        <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
+        <fileinarchive name="Controller.ssd"/>
+        <implref idref="DCE:A4981A0E-DF91-46B1-A77C-58B6052CC799"/>
+      </softpkgref>
+    </dependency>
+
+    <!-- What happens when one define descriptors for both softpkg and -->
+    <!-- implementations? -->
+
+    <code type="DLL">
+      <!-- No need to specify extension below since ACE takes care of that, -->
+      <fileinarchive name="Controller_exec"/>
+      <entrypoint>createControllerHome_Impl</entrypoint>
+    </code>
+
+  </implementation>
+
+  <!-- Let's add more implementation description later when we try to -->
+  <!-- compile this stuff on, say, Solaris and Linux.                 -->
+
+</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.ssd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.ssd
new file mode 100644
index 00000000000..856f95ed191
--- /dev/null
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/Controller.ssd
@@ -0,0 +1,48 @@
+<?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 softpkg SYSTEM "../../../docs/XML/softpkg.dtd">
+
+<!-- Controller's Servant Software Descriptor  -->
+<!-- This file describes various Controller servants -->
+<!-- implementations. -->
+
+
+<softpkg name="Priority-Test-Controller-Servant" version="1.0">
+  <pkgtype>CIAO Servant</pkgtype>
+  <title>Priority_Test::Controller Servants</title>
+  <author>
+    <company>Washington University in St. Louis</company>
+    <webpage href="http://www.cs.wustl.edu/~doc/"/>
+  </author>
+  <description>A Controller servant implementation.</description>
+  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
+  <idl id="IDL:Priority_Test/Controller:1.0" homeid="IDL:Priority_Test/ControllerHome:1.0">
+    <fileinarchive name="Controller.idl"/>
+  </idl>
+
+  <!-- Duplicate information.  We should use the copy in Controller.csd -->
+  <!-- So, do we really need this one? -->
+  <descriptor type="CORBA Component">
+    <fileinarchive name="Controller.ccd"/> <!-- Compoenent descriptors -->
+  </descriptor>
+
+  <implementation id="DCE:A4981A0E-DF91-46B1-A77C-58B6052CC799">
+
+    <dependency type="ORB">
+      <name>TAO</name>
+    </dependency>
+
+    <code>
+      <!-- No need to specify extension below since ACE takes care of that, -->
+      <fileinarchive name="Controller_svnt"/>
+      <entrypoint>createControllerHome_Servant</entrypoint>
+    </code>
+
+  </implementation>
+
+  <!-- Let's add more implementation description later when we try to -->
+  <!-- compile this stuff on, say, Solaris and Linux.                 -->
+
+</softpkg>
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/RTsvc.conf b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/RTsvc.conf
new file mode 100644
index 00000000000..fd9db67aca5
--- /dev/null
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/RTsvc.conf
@@ -0,0 +1,4 @@
+# No options required for regular testing
+
+# For real-time testing, uncomment the following line:
+static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM"
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/svcmap.dat b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/svcmap.dat
new file mode 100644
index 00000000000..bf226e7184d
--- /dev/null
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/svcmap.dat
@@ -0,0 +1,3 @@
+RT1,RTsvc.conf
+RT2,RTsvc2.conf
+RT3,RTsvc3.conf
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.dat b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.dat
new file mode 100644
index 00000000000..d26b3d4e070
--- /dev/null
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.dat
@@ -0,0 +1,2 @@
+Default corbaloc:iiop:localhost:10000/ServerActivator
+Remote  corbaloc:iiop:localhost:12000/ServerActivator
\ No newline at end of file
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.rtd b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.rtd
new file mode 100644
index 00000000000..f29890c21aa
--- /dev/null
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/test.rtd
@@ -0,0 +1,93 @@
+<?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>
+
+    <threadpoolwithlanes
+                id="shared_pool"
+                stacksize="0"
+                borrowing="no"
+                buffering="no"
+                max_buffer="0"
+                buffer_size="0">
+      <lane priority="1"
+            static_threads="100"
+            dynamic_threads="300"/>
+      <lane priority="2"
+            static_threads="2"
+            dynamic_threads="2"/>
+      <lane priority="3"
+            static_threads="1"
+            dynamic_threads="2"/>
+    </threadpoolwithlanes>
+
+    <threadpool id="common_pool"
+                stacksize="0"
+                static_threads="10"
+                dynamic_threads="20"
+                priority="1"
+                buffering="no"
+                max_buffer="0"
+                buffer_size="0"/>
+
+    <threadpool id="high_prio_pool"
+                stacksize="0"
+                static_threads="2"
+                dynamic_threads="2"
+                priority="3"
+                buffering="no"
+                max_buffer="0"
+                buffer_size="0"/>
+
+    <threadpoolwithlanes
+                id="laned_pool"
+                stacksize="0"
+                borrowing="no"
+                buffering="no"
+                max_buffer="0"
+                buffer_size="0">
+      <lane priority="1"
+            static_threads="10"
+            dynamic_threads="30"/>
+      <lane priority="2"
+            static_threads="3"
+            dynamic_threads="3"/>
+      <lane priority="3"
+            static_threads="1"
+            dynamic_threads="2"/>
+    </threadpoolwithlanes>
+
+    <connectionbands id="common_conn">
+      <band low="1" high="1"/>
+      <band low="2" high="2"/>
+      <band low="3" high="3000"/>
+    </connectionbands>
+  </rtresources>
+
+  <!-- Then, we define sets of policies that can be associated with -->
+  <!-- containers (or <homeplacement> rather) -->
+
+  <rtpolicyset id="POLICY_1">
+    <priority_model_policy type="server_declared" priority="2"/>
+    <threadpool_policy idref="shared_pool"/>
+    <banded_connection_policy idref="common_conn"/>
+  </rtpolicyset>
+
+  <rtpolicyset id="POLICY_2">
+    <threadpool_policy idref="common_pool"/>
+    <priority_model_policy type="client_propagated" priority="2"/>
+  </rtpolicyset>
+
+</rtcad_ext>
\ No newline at end of file