ChangeLogTag:Tue Dec 31 14:03:53 2002 Nanbor Wang <nanbor@cs.wustl.edu>

5 files changed, 48 insertions, 22 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c19da2b2ad0..81075938a35 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Tue Dec 31 14:03:53 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r:
+	* tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r:
+	* tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r:
+	* tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl:
+	  Changed to run the tests with reduced numbered priority lanes on
+	  Solaris to avoid exhausting the limited SysV semaphores and
+	  causing unnecessary warnings.  Thanks to Irfan for the new set
+	  of configuration files.
+
 Mon Dec 30 12:10:49 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
  	* examples/AMH/Sink_Server/st_server.dsp:
@@ -15,12 +26,12 @@ Mon Dec 30 08:49:31 2002  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 Mon Dec 30 06:12:53 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
-	* examples/AMH/Sink_Server/st_server.dsp (USERDEP__TEST_): 
+	* examples/AMH/Sink_Server/st_server.dsp (USERDEP__TEST_):
 	* examples/AMH/Sink_Server/client.dsp:
 	* examples/AMH/Sink_Server/mt_server.dsp: Changed the path to the
 	  tao_idl in the external_dependencies section. This should fix
 	  the warnings in the daily builds.
-	
+
 Sun Dec 29 11:29:20 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* examples/AMH/Sink_Server/AMH_Sink_Server.dsw:
@@ -60,20 +71,20 @@ Sun Dec 29 08:44:06 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderb
 	* TAO_IDL/be/be_visitor_union_branch.cpp:
 	* TAO_IDL/be/be_visitor_valuetype_fwd.cpp: #include'd
 	  ace/Log_Msg.h  to all the above files. This helps compilation to
-	  go smooth on AIX. 
-	
-	* TAO_IDL/include/ast_module.h: #include'd ace/Unbounded_Set.h. 
+	  go smooth on AIX.
+
+	* TAO_IDL/include/ast_module.h: #include'd ace/Unbounded_Set.h.
 
 	* tao/Condition.h: #include'd tao/orbconf.h and forward declared
           ACE_Time_Value
 
 	* tao/FILE_Parser.cpp:
-	* tao/Typecode.cpp: #include'd ace/Malloc_Base.h. 
+	* tao/Typecode.cpp: #include'd ace/Malloc_Base.h.
 
 	  All the above changes help compilation on AIX. Thanks to Jon
-	  Wackley <jonw@mountaincable.net> for providing these patches. 
-	
-	* tao/Muxed_TMS.cpp: 
+	  Wackley <jonw@mountaincable.net> for providing these patches.
+
+	* tao/Muxed_TMS.cpp:
 	* tao/Muxed_TMS.h: Use recursive mutex instead of a simple
 	  mutex. This prevents deadlock that might occur, when a thread
 	  tries to send a request during reply dispatching.
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r
new file mode 100644
index 00000000000..2be55e3fa32
--- /dev/null
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r
@@ -0,0 +1 @@
+0 10000 20000 30000
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r
new file mode 100644
index 00000000000..795a75037bc
--- /dev/null
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r
@@ -0,0 +1 @@
+5000 25000
\ No newline at end of file
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r
new file mode 100644
index 00000000000..8274a68e2ae
--- /dev/null
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r
@@ -0,0 +1 @@
+0 5000 25000
\ No newline at end of file
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
index 0a156b188f8..3a2ab1bfec4 100755
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
@@ -7,6 +7,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../bin';
 use PerlACE::Run_Test;
+use English;
 
 $status = 0;
 $iorfile = "ior_2";
@@ -20,6 +21,17 @@ $shmiop = 1;
 $extra_client_args = "-k file://$iorfile -ORBdebuglevel $client_debuglevel -d $client_debug -x";
 $extra_server_args = "-ORBdebuglevel $server_debuglevel -d $server_debug";
 
+if ($OSNAME eq "solaris") {
+    $lanes = "lanes_r";
+    $bands = "bands_r";
+    $inv_prio = "invocation_priorities_r";
+}
+else {
+    $lanes = "lanes";
+    $bands = "bands";
+    $inv_prio = "invocation_priorities";
+}
+
 sub setup_configurations_2
 {
     my $server_args = shift;
@@ -31,9 +43,9 @@ sub setup_configurations_2
     if ($iiop)   { $server_args .= "-ORBendpoint iiop:// "; };
     if ($shmiop) { $server_args .= "-ORBendpoint shmiop:// "; };
 
-                           $configurations[$server_config]->{server} = "$server_args";         
-                   $j = 0; $configurations[$server_config]->{clients}[$j] = "$client_args " ."-p iiop_shmiop";                                 
-                   $j++;   $configurations[$server_config]->{clients}[$j] = "$client_args " ."-p shmiop_iiop";    
+                           $configurations[$server_config]->{server} = "$server_args";
+                   $j = 0; $configurations[$server_config]->{clients}[$j] = "$client_args " ."-p iiop_shmiop";
+                   $j++;   $configurations[$server_config]->{clients}[$j] = "$client_args " ."-p shmiop_iiop";
     if ($iiop)   { $j++;   $configurations[$server_config]->{clients}[$j] = "$client_args " ."-p iiop"; }
     if ($shmiop) { $j++;   $configurations[$server_config]->{clients}[$j] = "$client_args " ."-p shmiop"; }
 }
@@ -44,11 +56,11 @@ sub setup_configurations_1
     my $shmiop = shift;
 
     $server_config++;    setup_configurations_2 ("", "", $iiop, $shmiop, $server_config);
-    $server_config++;    setup_configurations_2 ("", "-t invocation_priorities ", $iiop, $shmiop, $server_config);
-    $server_config++;    setup_configurations_2 ("", "-b bands -t invocation_priorities ", $iiop, $shmiop, $server_config);
-    $server_config++;    setup_configurations_2 ("-b bands ", "-t invocation_priorities ", $iiop, $shmiop, $server_config);
-    $server_config++;    setup_configurations_2 ("-l lanes ", "-b bands -t invocation_priorities ", $iiop, $shmiop, $server_config);
-    $server_config++;    setup_configurations_2 ("-b bands -l lanes ", "-t invocation_priorities ", $iiop, $shmiop, $server_config);
+    $server_config++;    setup_configurations_2 ("", "-t $inv_prio ", $iiop, $shmiop, $server_config);
+    $server_config++;    setup_configurations_2 ("", "-b $bands -t $inv_prio ", $iiop, $shmiop, $server_config);
+    $server_config++;    setup_configurations_2 ("-b $bands ", "-t $inv_prio ", $iiop, $shmiop, $server_config);
+    $server_config++;    setup_configurations_2 ("-l $lanes ", "-b $bands -t $inv_prio ", $iiop, $shmiop, $server_config);
+    $server_config++;    setup_configurations_2 ("-b $bands -l $lanes ", "-t $inv_prio ", $iiop, $shmiop, $server_config);
 }
 
 $server_config = -1;
@@ -66,10 +78,10 @@ sub run_client
     $CL = new PerlACE::Process ("client", "$client_args");
 
     $CL->Spawn ();
-    
+
     $client = $CL->WaitKill (120);
 
-    if ($client != 0) 
+    if ($client != 0)
     {
         print STDERR "ERROR: client returned $client\n";
         $status = 1;
@@ -77,7 +89,7 @@ sub run_client
     }
 }
 
-sub run_server 
+sub run_server
 {
     my $server_args = "@_" . " $extra_server_args";
 
@@ -98,8 +110,8 @@ sub run_server
 sub zap_server
 {
     $server = $SV->WaitKill (5);
-    
-    if ($server != 0) 
+
+    if ($server != 0)
     {
         print STDERR "ERROR: server returned $server\n";
         $status = 1;