Synchronized the README file with the actual options in the source files. Cleaned up the wording for the help in the README and source files.

3 files changed, 48 insertions, 65 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 2086be559f2..c9097753fac 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -21,7 +21,7 @@ Globals::Globals (void)
 int
 Globals::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "sh:p:t:f:rm");
+  ACE_Get_Opt opts (argc, argv, "h:p:t:f:rm");
   int c;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -58,13 +58,14 @@ Globals::parse_args (int argc, char *argv[])
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " \t[-p <port>]\n"
-                           " \t[-h <my_hostname>]\n"
-                           " \t[-t <num_objects>]\n"
-                           " \t[-f <ior_file>]\n"
-                           " \t[-r Use thread per rate]\n"
-                           "\n", argv [0]),
+                           "usage:  %s \t"
+                           "[-p <port_num>]                // starting port                      \n\t\t"
+                           "[-h <my_hostname>]             // IP address to use                  \n\t\t"
+                           "[-t <number_of_servants>]      // # of servant threads to create     \n\t\t"
+                           "[-f <ior_file> ]               // specify a file to output all ior's \n\t\t"
+                           "[-m ]                          // Use multiple priorities for threads\n\t\t"
+                           "[-r ]                          // Run the thread-per-rate test       \n"
+                           ,argv [0]),
                           -1);
       }
     }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
index 0e62ad95420..8274f3fd6b8 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
@@ -30,11 +30,8 @@ Options are case sensitive, e.g., "-U" has a different meaning than "-u".
 ./server [-p <port_num>]                // starting port
          [-h <my_hostname>]             // IP address to use
          [-t <number_of_servants>]      // # of servant threads to create
-         [-s ]                          // Do NOT use the naming service
          [-f <ior_file> ]               // specify a file to output all ior's
          [-m ]                          // Use multiple priorities for threads
-         [-U ]                          // Run the server utilization test
-                                        //   use the same option on the client
          [-r ]                          // Run the thread-per-rate test
 
 [-p <port_num>] is the port number at which the server will start the
@@ -53,10 +50,6 @@ Options are case sensitive, e.g., "-U" has a different meaning than "-u".
 
         Default Value: 2
 
-[-s ] Disables the use of the naming service to register the servants.
-
-        Default Value: Use naming service enabled.
-
 [-f <ior_file> ] Use to specify a file to write all the iors from the
   different servants out to disk.
 
@@ -68,14 +61,6 @@ Options are case sensitive, e.g., "-U" has a different meaning than "-u".
         Default Value: Disabled.  One priority will be used for the
                        low priority threads.
 
-[-U ] Run the server utilization test.  This option overrides the "-t"
-  option.  This option sets the number threads to one.  NOTE: to use
-  this option successfully, you should also use "-U" on the client
-  side.
-
-        Default Value: Disabled. To enable, specify "-U" on the
-                       command line.
-
 [-r] turn on the thread-per-rate tests.  (Priority inversion tests)
 
         Default Value: Disabled.
@@ -89,17 +74,15 @@ by the client.
          [-d <datatype>]        // what datatype to use for calls
          [-n <num_calls>]       // number of CORBA calls to make.
          [-t <num_of_clients>]  // number of client threads to create
-         [-f <ior_file>]        // specify a file to dump the iors
-         [-r]                   // use thread-per-rate test.
-         [-o]                   // makes client use oneway calls instead
+         [-f <ior_file>]        // specify the file from which we read the object references (iors), if any.
+         [-r]                   // run thread-per-rate test.
+         [-o]                   // makes client use oneway calls.  By default, twoway calls are used.
          [-x]                   // makes a call to servant to shutdown
-         [-u <seconds> ]        // run the client utilization test for <seconds> seconds
-         [-U <seconds> ]        // run the servant utilization test for <seconds> seconds
-         [-1]                   // use one to n test.
-         [-g <granularity>]     // choose the granularity of timing calls
-         [-c]                   // obtain number of context switches.
-         [-s]                   // makes client *NOT* use the name service
-         [-m]                   // use multiple priorities for the low priority client.
+         [-u <seconds> ]        // run the client utilization test for a number of <seconds>.
+         [-1]                   // run the one-to-n test.
+         [-g <granularity>]     // choose the granularity of the timing of CORBA calls
+         [-c]                   // run the number of context switches test.
+         [-m]                   // use multiple priorities for the low priority clients.
 
 [-d <datatype>]  <datatype> is one of the following:
 
@@ -120,12 +103,12 @@ by the client.
 
         Default Value: 2
 
-[-f <ior_file> ] Use to specify a file to write all the iors from the
-  different servants out to disk.
+[-f <ior_file> ] Use to specify a file to read the object references (iors) of the
+  different servants from disk.
 
-        Default Value: nil, which means not to write the iors to disk.
+        Default Value: nil, which means not to read the iors from disk.
 
-[-r] turn on the thread-per-rate tests.  (Priority inversion tests)
+[-r] run the thread-per-rate test.  (Priority inversion tests)
 
         Default Value: Disabled.
 
@@ -134,22 +117,17 @@ by the client.
 
         Default Value: Disabled
 
-[-x] makes the client call the shutdown() method on the servant which
-   invokes the shutdown() method on the ORB and causes it to exit.
-
-        Default Value: Disabled
-
-[-u] runs the client utilization test.  This option overrides the "-t"
-     option to specify one client.
+[-x] makes the client call the shutdown() method on the servant which in turn
+   invokes the shutdown() method on the ORB and causes it to exit gracefully.
 
         Default Value: Disabled
 
-[-U] runs the *servant* utilization test.  This option should be used
-     in conjunction with the server's "-U" option.
+[-u <seconds>] runs the client/server utilization test for a number of <seconds>.
+     (Note: This option overrides any specified "-t" option)
 
         Default Value: Disabled
 
-[-1] runs one to n test.  One servant services all low priority clients.
+[-1] runs one-to-n test.  One servant services all low priority clients.
 
         Default Value: Disabled
 
@@ -178,10 +156,6 @@ by the client.
 
         Default Value: Disabled
 
-[-s] Makes client *NOT* use the name service
-
-        Default Value: Disabled.  Will try to use the naming service.
-
 [-m] Use multiple priorities for the low priority client
 
         Default Value: Disabled.  Will use one priority for all low priority clients.
@@ -189,13 +163,13 @@ by the client.
 Running on VxWorks
 ------------------
 
-To run the server and client on a single VxWorks target:
+A typical run of the server and client on a single VxWorks target:
 
   -> iam "<your login>"
   -> ld < server
   -> ld < client
-  -> spa server, "-s", "-f", "ior.txt", "-t", "2"
-  -> spa client, "-s", "-f", "ior.txt", "-t", "2", "-n", "1000"
+  -> spa server, "-f", "ior.txt", "-t", "2"
+  -> spa client, "-f", "ior.txt", "-t", "2", "-n", "1000"
 
 RESULTS
 -------
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index d997763cb11..e584c49b608 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -57,7 +57,7 @@ Task_State::Task_State (void)
 int
 Task_State::parse_args (int argc,char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "U:mu:n:t:d:rxof:g:1cl");
+  ACE_Get_Opt opts (argc, argv, "mu:n:t:d:rxof:g:1cl");
   int c;
 
   while ((c = opts ()) != -1)
@@ -73,6 +73,9 @@ Task_State::parse_args (int argc,char *argv[])
     case 'c':
       context_switch_test_ = 1;
       break;
+    case 'm':
+      use_multiple_priority_ = 1;
+      break;
     case '1':
       one_to_n_test_ = 1;
       break;
@@ -129,16 +132,21 @@ Task_State::parse_args (int argc,char *argv[])
       continue;
     case '?':
     default:
-      ACE_DEBUG ((LM_DEBUG, "usage:  %s"
-                  "[-d datatype Octet=0, Short=1, Long=2, Struct=3]"
-                  " [-n num_calls]"
-                  " [-t num_threads]"
-                  " [-f ior_file]"
-                  " [-x] // makes a call to servant to shutdown"
-                  " [-o] // makes client use oneway calls instead"
-                  " [-s] // makes client *NOT* use the name service"
-                  " [-g granularity_of_timing]"
-                  "\n", argv [0]));
+      ACE_DEBUG ((LM_DEBUG, "usage:  %s\t"
+                  "[<ORB OPTIONS>]        // ORB options, e.g., \"-ORBobjrefstyle url\"                               \n\t\t"
+                  "[-d <datatype>]        // what datatype to use for calls:  Octet=0, Short=1, Long=2, Struct=3      \n\t\t"
+                  "[-n <num_calls>]       // number of CORBA calls to make.                                           \n\t\t"
+                  "[-t <num_of_clients>]  // number of client threads to create                                       \n\t\t"
+                  "[-f <ior_file>]        // specify the file from which we read the object references (iors), if any.\n\t\t"
+                  "[-r]                   // run thread-per-rate test.                                                \n\t\t"
+                  "[-o]                   // makes client use oneway calls.  By default, twoway calls are used.       \n\t\t"
+                  "[-x]                   // makes a call to servant to shutdown                                      \n\t\t"
+                  "[-u <seconds> ]        // run the client utilization test for a number of <seconds>.               \n\t\t"
+                  "[-1]                   // run the one-to-n test.                                                   \n\t\t"
+                  "[-g <granularity>]     // choose the granularity of the timing of CORBA calls                      \n\t\t"
+                  "[-c]                   // run the number of context switches test.                                 \n\t\t"
+                  "[-m]                   // use multiple priorities for the low priority clients.                    \n"
+		  ,argv [0]));
       return -1;
     }