ChangeLogTag : Wed Jul 21 12:26:21 1999 Alexander Babu Arulanthu <alex@cs.wustl.edu>

9 files changed, 405 insertions, 36 deletions

diff --git a/TAO/performance-tests/Latency/Makefile b/TAO/performance-tests/Latency/Makefile
index 319e64b63b7..840161e7ceb 100644
--- a/TAO/performance-tests/Latency/Makefile
+++ b/TAO/performance-tests/Latency/Makefile
@@ -18,7 +18,7 @@ IDLFILES = testC testS
 BIN = client server st-client
 
 ifdef AMI
-BIN += ami-latency-client
+BIN += ami-latency-client ami-throughput-client
 endif # AMI
 
 SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
@@ -29,6 +29,7 @@ SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES))
 
 ifdef AMI
 AMI_LATENCY_CLIENT_OBJS = ami-latency-client.o testC.o
+AMI_THROUGHPUT_CLIENT_OBJS = ami-throughput-client.o testC.o
 endif # AMI
 
 BUILD = $(BIN)
@@ -70,6 +71,9 @@ st-client: $(addprefix $(VDIR),$(ST_CLIENT_OBJS))
 ifdef AMI
 ami-latency-client: $(addprefix $(VDIR),$(AMI_LATENCY_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+ami-throughput-client: $(addprefix $(VDIR),$(AMI_THROUGHPUT_CLIENT_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 endif # AMI
 
 realclean: clean
diff --git a/TAO/performance-tests/Latency/README b/TAO/performance-tests/Latency/README
index e24106e9174..9a3259d7d55 100644
--- a/TAO/performance-tests/Latency/README
+++ b/TAO/performance-tests/Latency/README
@@ -21,3 +21,18 @@ How to run:
 
 $ server -ORBSvcConf server.conf -n 2
 $ client -ORBSvcConf client.conf -n 4 -i 1000
+
+$ st-client -i 1000 -k file://ior_file -ORBdebuglevel 0 \ 
+        -ORBSvcConf client-st-exclusive.conf
+
+$ ami-latency-client -k file://ior_file -i 1000 \
+        -ORBSvcConf client-st-muxed.conf
+
+AMI Throughput Test:
+==================
+$ server -o ior_file -ORBEndpoint iiop://localhost:port \
+        -ORBSvcConf server.conf
+
+$ ami-throughput-client -s -k file://ior_file -i 1000 \
+                -ORBSvcConf client-st-muxed.conf \
+                -ORBPreconnect iiop://localhost:port
diff --git a/TAO/performance-tests/Latency/ami-throughput-client.cpp b/TAO/performance-tests/Latency/ami-throughput-client.cpp
new file mode 100644
index 00000000000..4d6f2561a96
--- /dev/null
+++ b/TAO/performance-tests/Latency/ami-throughput-client.cpp
@@ -0,0 +1,339 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+#include "ace/Stats.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/Sched_Params.h"
+#include "testS.h"
+
+ACE_RCSID(Latency, client, "$Id$")
+  
+const char *ior = "file://test.ior";
+
+size_t niterations = 5;
+
+int sleep_flag = 0;
+
+int done = 0;
+
+ACE_hrtime_t latency_base;
+
+ACE_hrtime_t throughput_base;
+
+ACE_Throughput_Stats throughput_stats;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "k:n:i:s");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+        // case 'n':
+        // nthreads = ACE_OS::atoi (get_opts.optarg);
+        // break;
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.optarg);
+        break;
+      case 's':
+        sleep_flag = 1;
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           // "-n <nthreads> "
+                           "-i <niterations> "
+                           "-s "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+// *********************************************************************
+
+class Handler : public POA_AMI_Test_Handler
+{
+public:
+  Handler (CORBA::ORB_ptr orb)
+    : nreplies_received_ (0),
+      orb_ (orb)
+    {};
+  
+  void test_method (CORBA::Environment &)
+    {
+      // Get the currect time.
+      ACE_hrtime_t now = ACE_OS::gethrtime ();
+      
+      // Take the sample.
+      throughput_stats.sample (now - throughput_base,
+                               now - latency_base);
+
+      // Inc count.
+      this->nreplies_received_++;
+
+      // Check for end.
+      if (this->nreplies_received_ == niterations)
+        {
+          done = 1;
+          if (sleep_flag)
+            orb_->shutdown ();
+        }
+    };
+  
+  ~Handler (void) {};
+
+private:
+  size_t nreplies_received_;
+  // Number of replies received so far.
+
+  CORBA::ORB_ptr orb_;
+  // ORB pointer.
+};
+
+// *********************************************************************
+
+class Reply_Handler_Task : public ACE_Task_Base
+{
+  // = TITLE
+  //     Run the thread handling the reply.
+  //
+  // = DESCRIPTION
+  //     Use the ACE_Task_Base class to run the reply handling.
+  //
+public:
+  Reply_Handler_Task (void);
+  // Constructor.
+  
+  void set (Test_ptr server,
+            int niterations, 
+            CORBA::ORB_ptr orb,
+            AMI_Test_Handler_ptr reply_handler);
+  // Set the test attributes.
+
+  void accumulate_into (ACE_Throughput_Stats &throughput) const;
+  // Accumulate the throughput statistics into <throughput>
+
+  void dump_stats (const char* msg, ACE_UINT32 gsf);
+  // Accumulate the throughput statistics into <throughput>
+
+  // = The ACE_Task_Base methods....
+  virtual int svc (void);
+
+private:
+  Test_var server_;
+  // The server.
+
+  int niterations_;
+  // The number of iterations on each client thread.
+  
+  CORBA::ORB_ptr orb_;
+  // Cache the ORB pointer.
+
+  AMI_Test_Handler_ptr reply_handler_;
+  // ReplyHandler object.
+};
+
+// *********************************************************************
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      ACE_DEBUG ((LM_DEBUG, "High res. timer calibration...."));
+      ACE_High_Res_Timer::calibrate ();
+      ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+      
+      CORBA::Object_var object =
+        orb->string_to_object (ior, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Test_var server =
+        Test::_narrow (object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (server.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Object reference <%s> is nil\n",
+                             ior),
+                            1);
+        }
+
+      // ReplyHandler object.
+      Handler handler (orb);
+      AMI_Test_Handler_var reply_handler = handler._this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      // Activate POA to handle the call back.
+      
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+      
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      // Initiate the Handler task to receive replies.
+      
+      Reply_Handler_Task reply_handler_task;
+      
+      // Init the Reply Handler task.
+      reply_handler_task.set (server.in (),
+                              niterations,
+                              orb,
+                              reply_handler.in ());
+
+      // Activate Reply Handler task.
+      if (reply_handler_task.activate (THR_BOUND | THR_SCHED_FIFO | THR_NEW_LWP | THR_JOINABLE,
+                                       1,
+                                       1,
+                                       priority + 1) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "Cannot activate client threads"),
+                          1);
+
+      // Init global throughput base.
+      throughput_base = ACE_OS::gethrtime ();
+
+      // Issue asynchronous invocations.
+      for (size_t i = 0; i < niterations; ++i)
+        {
+          // Get timestamp.
+          latency_base = ACE_OS::gethrtime ();
+          
+          // Invoke asynchronous operation.
+          server->sendc_test_method (reply_handler.in (),
+                                     ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          if (TAO_debug_level > 0 && i % 100 == 0)
+            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
+        }
+
+      // Wait for the Reply Handler task.
+      ACE_Thread_Manager::instance ()->wait ();
+      
+      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
+      
+      // Output statistics.
+      
+      ACE_Throughput_Stats throughput;
+      char buf[64];
+      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      
+      reply_handler_task.accumulate_into (throughput);
+
+      ACE_OS::sprintf (buf, "Reply Handler Thread");
+      reply_handler_task.dump_stats (buf, gsf);
+
+      throughput.dump_results ("Aggregated", gsf);
+      
+      // server->shutdown (ACE_TRY_ENV);
+      // ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Catched exception:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+// ****************************************************************
+
+Reply_Handler_Task::Reply_Handler_Task (void)
+  : niterations_ (0),
+    orb_ (0),
+    reply_handler_ (0)
+{
+}
+
+void
+Reply_Handler_Task::set (Test_ptr server, 
+                         int niterations, 
+                         CORBA::ORB_ptr orb,
+                         AMI_Test_Handler_ptr reply_handler)
+{
+  this->server_ = Test::_duplicate (server);
+  this->niterations_ = niterations;
+  this->orb_ = orb;
+  this->reply_handler_ = reply_handler;
+}
+
+int
+Reply_Handler_Task::svc (void)
+{
+  if (sleep_flag)
+    // Spend 10 msecs running the ORB.
+    this->orb_->run ();
+  else
+    while (!done)
+      this->orb_->perform_work ();
+  return 0;
+}
+
+void
+Reply_Handler_Task::accumulate_into (ACE_Throughput_Stats &t) const
+{
+  t.accumulate (throughput_stats);
+}
+
+void
+Reply_Handler_Task::dump_stats (const char* msg, ACE_UINT32 gsf)
+{
+  throughput_stats.dump_results (msg, gsf);
+}
diff --git a/TAO/performance-tests/Latency/client-st-exclusive.conf b/TAO/performance-tests/Latency/client-st-exclusive.conf
index cd88de887e2..9a6166dfbb3 100644
--- a/TAO/performance-tests/Latency/client-st-exclusive.conf
+++ b/TAO/performance-tests/Latency/client-st-exclusive.conf
@@ -1,2 +1,4 @@
 # $Id$
-static Client_Strategy_Factory "-ORBclientconnectionhandler ST"
+static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
+
diff --git a/TAO/performance-tests/Latency/client-st-muxed.conf b/TAO/performance-tests/Latency/client-st-muxed.conf
index 2f4a9aac71a..2a536a30e06 100644
--- a/TAO/performance-tests/Latency/client-st-muxed.conf
+++ b/TAO/performance-tests/Latency/client-st-muxed.conf
@@ -1,2 +1,5 @@
 # $Id$
+static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
 static Client_Strategy_Factory "-ORBClientConnectionHandler ST -ORBTransportMuxStrategy MUXED"
+
+
diff --git a/TAO/performance-tests/Latency/client.cpp b/TAO/performance-tests/Latency/client.cpp
index b00e82c03b3..961e3890910 100644
--- a/TAO/performance-tests/Latency/client.cpp
+++ b/TAO/performance-tests/Latency/client.cpp
@@ -217,19 +217,20 @@ Client::svc (void)
           // Invoke method.
           server_->test_method (ACE_TRY_ENV);
           
-          // Sleep for 10 msecs.
-          if (sleep_flag)
-            ACE_OS::sleep (sleep_time);
-
           // Grab timestamp again.
           ACE_hrtime_t now = ACE_OS::gethrtime ();
-
-          ACE_TRY_CHECK;
           
           // Record statistics.
           this->throughput_.sample (now - throughput_base,
                                     now - latency_base);
 
+          ACE_TRY_CHECK;
+          
+          // Sleep for 10 msecs.
+          if (sleep_flag)
+            ACE_OS::sleep (sleep_time);
+          
+
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
         }
diff --git a/TAO/performance-tests/Latency/server.conf b/TAO/performance-tests/Latency/server.conf
index 0a9c9ed5cf6..4757e8f3a1a 100644
--- a/TAO/performance-tests/Latency/server.conf
+++ b/TAO/performance-tests/Latency/server.conf
@@ -1,3 +1,4 @@
 # $Id$
 #
-static Resource_Factory "-ORBReactorType tp"
+# static Resource_Factory "-ORBReactorType tp"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationOfSystemids 0" 
diff --git a/TAO/performance-tests/Latency/server.cpp b/TAO/performance-tests/Latency/server.cpp
index 721930c7a9e..1275c0212fa 100644
--- a/TAO/performance-tests/Latency/server.cpp
+++ b/TAO/performance-tests/Latency/server.cpp
@@ -21,22 +21,22 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case 'n':
-	nthreads = ACE_OS::atoi (get_opts.optarg);
-	break;
+        nthreads = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'w':
-	workload = ACE_OS::atoi (get_opts.optarg);
-	break;
+        workload = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -71,10 +71,14 @@ main (int argc, char *argv[])
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+                                              priority);
+  
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                              priority);
 
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
   if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
                                               priority,
                                               ACE_SCOPE_PROCESS)) != 0)
@@ -121,23 +125,23 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
 
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
diff --git a/TAO/performance-tests/Latency/st-client.cpp b/TAO/performance-tests/Latency/st-client.cpp
index d59e64bef06..441eab8560d 100644
--- a/TAO/performance-tests/Latency/st-client.cpp
+++ b/TAO/performance-tests/Latency/st-client.cpp
@@ -71,7 +71,7 @@ public:
   // Accumulate the throughput statistics into <throughput>
 
   // = The ACE_Task_Base methods....
-  virtual int svc (void);
+  int svc (void);
 
 private:
   Test_var server_;
@@ -203,19 +203,19 @@ Client::svc (void)
           // Invoke method.
           server_->test_method (ACE_TRY_ENV);
           
-          // Sleep for 10 msecs.
-          if (sleep_flag)
-            ACE_OS::sleep (sleep_time);
-
           // Grab timestamp again.
           ACE_hrtime_t now = ACE_OS::gethrtime ();
 
-          ACE_TRY_CHECK;
-          
           // Record statistics.
           this->throughput_.sample (now - throughput_base,
                                     now - latency_base);
 
+          ACE_TRY_CHECK;
+
+          // Sleep for 10 msecs.
+          if (sleep_flag)
+            ACE_OS::sleep (sleep_time);
+
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
         }