ChangeLogTag:Tue Dec 7 13:30:20 1999 Marina Spivak <marina@cs.wustl.edu>

12 files changed, 39 insertions, 25 deletions

diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile
index 3295ad96ddc..5f50836d3e1 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile
@@ -56,4 +56,6 @@ realclean: clean
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
+
+
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/README b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/README
index a971ac7340c..1bb6c85b0ee 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/README
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/README
@@ -25,9 +25,6 @@ server
 
 -o <ior_output_file>      Name of the file where to store IOR of the server.
 
--n <number of threads>    Number of threads, which will be servicing
-                          endpoint and connections for each priority.
-
 client
 
 -i <ior>                  IOR of the object to use for invocations.
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/client.cpp
index 13877373425..4a56106a05a 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/client.cpp
@@ -106,7 +106,7 @@ int
 main (int argc, char *argv[])
 {
   int policy = ACE_SCHED_FIFO;
-  int flags  = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE;
+  int flags  = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE|THR_BOUND;
   int priority =
     ACE_Sched_Params::priority_max (policy);
 
@@ -282,9 +282,13 @@ Client::svc (void)
       // connection. (Not an issue if all threads have different priorities.)
       for (int j = 0; j < 100; ++j)
         {
-          CORBA::PolicyList_var pols;
+          /* CORBA::PolicyList_var pols;
           server_->_validate_connection (pols.out (),
                                          ACE_TRY_ENV);
+          */
+
+          server_->test_method (this->id_,
+                                ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl
index 2d9c60637ab..500f9f14bb8 100755
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl
@@ -10,7 +10,6 @@ require ACEutils;
 
 $client_conf="client.conf";
 $server_conf="server.conf";
-$threads='2';
 $iorfile = "test.ior";
 
 print STDERR "================ Endpoint Per Priority Test\n";
@@ -25,7 +24,7 @@ $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
                        . " -ORBEndPoint iiop://localhost:0/priority=4 "
                        . " -ORBEndPoint iiop://localhost:0/priority=5 "
                        . " -ORBEndPoint iiop://localhost:0/priority=30 "
-                       . " -o $iorfile -n $threads");
+                       . " -o $iorfile");
 
 if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
   print STDERR "ERROR: cannot find file <$iorfile>\n";
@@ -36,7 +35,7 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
 $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
                        " -ORBSvcConf client.conf "
                        . " -i file://$iorfile "
-                       . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30 -n 1000");
+                       . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30 -n 100000");
 
 $client = $CL->TimedWait (60);
 if ($client == -1) {
@@ -44,7 +43,7 @@ if ($client == -1) {
   $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->TimedWait (10);
+$server = $SV->TimedWait (30);
 if ($server == -1) {
   print STDERR "ERROR: server timedout\n";
   $SV->Kill (); $SV->TimedWait (1);
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Makefile b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Makefile
index 15964e66ac1..d009680ec70 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Makefile
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Makefile
@@ -48,3 +48,9 @@ idl_stubs: $(addsuffix .h, $(IDL_FILES))
 
 realclean:
 	-$(RM) $(foreach file, $(IDL_SRCS), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile
index 3295ad96ddc..5f50836d3e1 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile
@@ -56,4 +56,6 @@ realclean: clean
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
+
+
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index 7530bbaf58c..df55b0ff729 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -106,9 +106,9 @@ int
 main (int argc, char *argv[])
 {
   int policy = ACE_SCHED_FIFO;
-  int flags  = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE;
+  int flags  = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE|THR_BOUND;
   int priority =
-    ACE_Sched_Params::priority_min (policy);
+    ACE_Sched_Params::priority_max (policy);
 
   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
   if (ACE_OS::sched_params (ACE_Sched_Params (policy,
@@ -159,8 +159,6 @@ main (int argc, char *argv[])
 
       ACE_Thread_Manager::instance ()->wait ();
 
-      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
-
       ACE_Throughput_Stats throughput;
 
       for (int j = 0; j != nthreads; ++j)
@@ -242,9 +240,13 @@ Client::svc (void)
       // Try to make sure every thread gets its own connection.
       for (int j = 0; j < 100; ++j)
         {
-          CORBA::PolicyList_var pols;
+          /* CORBA::PolicyList_var pols;
           server->_validate_connection (pols.out (),
                                         ACE_TRY_ENV);
+          */
+
+          server->test_method (this->id_,
+                               ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl
index 560ee536ca2..683a432d445 100755
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl
@@ -35,7 +35,7 @@ if (ACE::waitforfile_timed ($iorfile."_1", 5) == -1) {
 $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
                        " -ORBSvcConf client.conf "
                        . " -i file://$iorfile "
-                       . " -t 30 -t 5 -t 4 -t 3 -t 2 -t 1 -n 10");
+                       . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30 -n 100000");
 
 $client = $CL->TimedWait (60);
 if ($client == -1) {
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index d6ea5678488..6f7bf0856e7 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -83,7 +83,7 @@ int
 main (int argc, char *argv[])
 {
   int policy = ACE_SCHED_FIFO;
-  int flags = THR_NEW_LWP|THR_JOINABLE|THR_SCHED_FIFO;
+  int flags = THR_NEW_LWP|THR_JOINABLE|THR_SCHED_FIFO|THR_BOUND;
   int priority =
     ACE_Sched_Params::priority_max (policy);
 
@@ -149,7 +149,6 @@ main (int argc, char *argv[])
     }
 
   ACE_Thread_Manager::instance ()->wait ();
-  ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
 
   return 0;
 }
@@ -249,7 +248,6 @@ Server::svc (void)
       orb->run (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG, "Event loop finished\n"));
     }
   ACE_CATCHANY
     {
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile
index 3295ad96ddc..5f50836d3e1 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile
@@ -56,4 +56,6 @@ realclean: clean
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
+
+
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index 56cbb825c04..2df94e72f40 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -106,9 +106,9 @@ int
 main (int argc, char *argv[])
 {
   int policy = ACE_SCHED_FIFO;
-  int flags  = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE;
+  int flags  = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE|THR_BOUND;
   int priority =
-    ACE_Sched_Params::priority_min (policy);
+    ACE_Sched_Params::priority_max (policy);
 
   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
   if (ACE_OS::sched_params (ACE_Sched_Params (policy,
@@ -242,14 +242,16 @@ Client::svc (void)
       // Try to make sure every thread gets its own connection.
       for (int j = 0; j < 100; ++j)
         {
-          CORBA::PolicyList_var pols;
+          /*    CORBA::PolicyList_var pols;
           server_->_validate_connection (pols.out (),
                                          ACE_TRY_ENV);
+          */
+
+          server_->test_method (this->id_,
+                                ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
 
-      ACE_DEBUG ((LM_DEBUG, "Validated connection\n"));
-
       ACE_hrtime_t throughput_base = ACE_OS::gethrtime ();
 
       for (int i = 0; i < this->niterations_; ++i)
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl
index 9570a5234c7..70924defbf8 100755
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl
@@ -31,7 +31,7 @@ if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
 $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
                        " -ORBSvcConf client.conf "
                        . " -i file://$iorfile "
-                       . " -n 1000 "
+                       . " -n 100000 "
                        . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30");
 
 $client = $CL->TimedWait (60);
@@ -40,7 +40,7 @@ if ($client == -1) {
   $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->TimedWait (10);
+$server = $SV->TimedWait (60);
 if ($server == -1) {
   print STDERR "ERROR: server timedout\n";
   $SV->Kill (); $SV->TimedWait (1);