Thu Apr 12 13:54:10 2001 Joe Hoffert <joeh@cs.wustl.edu>

6 files changed, 114 insertions, 3 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index fd0b2265857..9bf3ca6c8c0 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,20 @@
+Thu Apr 12 13:54:10 2001  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * performance-tests/Latency/test_i.cpp: 
+        * performance-tests/Latency/st_server.cpp: 
+        * performance-tests/Latency/st_client.cpp:
+          Added Quantify hooks
+
+        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf: 
+        * performance-tests/Latency/st_server.conf: 
+        * performance-tests/Latency/st_client.conf:
+          Moved "-ORBConnectionCacheLock null" from the default
+          Resource_Factory to the Advanced_Resource_Factory.
+          This was creating a mutex for a single-threaded app.
+          There should never be both in a configuration file
+          since the Advanced Resource Factory subsumes all the
+          options of the default Resource Factory
+
 Thu Apr 12 12:22:28 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * tests/Makefile:
diff --git a/TAO/performance-tests/Latency/st_client.conf b/TAO/performance-tests/Latency/st_client.conf
index c7f80d4d2d8..3aee8e23f68 100644
--- a/TAO/performance-tests/Latency/st_client.conf
+++ b/TAO/performance-tests/Latency/st_client.conf
@@ -3,6 +3,5 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Advanced_Resource_Factory "-ORBresources global -ORBInputCDRAllocator null -ORBReactorType select_st"
-static Resource_Factory "-ORBConnectionCacheLock null"
+static Advanced_Resource_Factory "-ORBresources global -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Latency/st_client.cpp b/TAO/performance-tests/Latency/st_client.cpp
index e96c8531ba5..ae992702e84 100644
--- a/TAO/performance-tests/Latency/st_client.cpp
+++ b/TAO/performance-tests/Latency/st_client.cpp
@@ -12,6 +12,38 @@
 
 ACE_RCSID(Latency, st_client, "$Id$")
 
+//#define USING_QUANTIFY 1
+
+#if defined (USING_QUANTIFY)
+
+#if defined (ACE_WIN32)
+
+#include "pure.h"
+
+#else /* !ACE_WIN32 */
+
+#include "quantify.h"
+
+inline int QuantifyClearData ()
+{
+  return quantify_clear_data ();
+}
+
+inline int QuantifyStartRecordingData ()
+{
+  return quantify_start_recording_data ();
+}
+
+inline int QuantifyStopRecordingData ()
+{
+  return quantify_stop_recording_data ();
+}
+
+#endif /* ACE_WIN32 */
+
+#endif /* USING_QUANTIFY */
+
+
 const char *ior = "file://test.ior";
 int niterations = 100;
 int period = -1;
@@ -116,6 +148,13 @@ main (int argc, char *argv[])
 
       ACE_Sample_History history (niterations);
 
+#if defined (USING_QUANTIFY)
+  // Reset Quantify data recording; whatever happened in the past is
+  // not relevant to this test.
+  QuantifyClearData ();
+  QuantifyStartRecordingData ();
+#endif /* USING_QUANTIFY */
+
       ACE_hrtime_t test_start = ACE_OS::gethrtime ();
       for (int i = 0; i < niterations; ++i)
         {
@@ -133,6 +172,13 @@ main (int argc, char *argv[])
 	      ACE_OS::sleep (tv);
 	    }
         }
+
+#if defined (USING_QUANTIFY)
+  // Stop recording data here; whatever happens after this in the test
+  // is not relevant to this test.
+  QuantifyStopRecordingData ();
+#endif /* USING_QUANTIFY */
+
       ACE_hrtime_t test_end = ACE_OS::gethrtime ();
 
       ACE_DEBUG ((LM_DEBUG, "test finished\n"));
diff --git a/TAO/performance-tests/Latency/st_server.conf b/TAO/performance-tests/Latency/st_server.conf
index 23dc6a12cb6..6a09b8d50d5 100644
--- a/TAO/performance-tests/Latency/st_server.conf
+++ b/TAO/performance-tests/Latency/st_server.conf
@@ -1,4 +1,4 @@
 # $Id$
 #
-static Advanced_Resource_Factory "-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st "
+static Advanced_Resource_Factory "-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Latency/st_server.cpp b/TAO/performance-tests/Latency/st_server.cpp
index dd3425aae53..c9165a8607e 100644
--- a/TAO/performance-tests/Latency/st_server.cpp
+++ b/TAO/performance-tests/Latency/st_server.cpp
@@ -8,6 +8,37 @@
 
 ACE_RCSID(Latency, st_server, "$Id$")
 
+//#define USING_QUANTIFY 1
+
+#if defined (USING_QUANTIFY)
+
+#if defined (ACE_WIN32)
+
+#include "pure.h"
+
+#else /* !ACE_WIN32 */
+
+#include "quantify.h"
+
+inline int QuantifyClearData ()
+{
+  return quantify_clear_data ();
+}
+
+inline int QuantifyStartRecordingData ()
+{
+  return quantify_start_recording_data ();
+}
+
+inline int QuantifyStopRecordingData ()
+{
+  return quantify_stop_recording_data ();
+}
+
+#endif /* ACE_WIN32 */
+
+#endif /* USING_QUANTIFY */
+
 const char *ior_output_file = "test.ior";
 int workload = 0;
 
@@ -45,6 +76,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
+
+#if defined (USING_QUANTIFY)
+  // Reset Quantify data recording; whatever happened in the past is
+  // not relevant to this test.
+  QuantifyClearData ();
+#endif /* USING_QUANTIFY */
+
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
diff --git a/TAO/performance-tests/Latency/test_i.cpp b/TAO/performance-tests/Latency/test_i.cpp
index 39758503d79..4834c74b937 100644
--- a/TAO/performance-tests/Latency/test_i.cpp
+++ b/TAO/performance-tests/Latency/test_i.cpp
@@ -13,6 +13,11 @@ CORBA::ULongLong
 Test_i::test_method (CORBA::ULongLong stamp,
                      CORBA::Environment&) ACE_THROW_SPEC (())
 {
+
+#if defined (USING_QUANTIFY)
+  QuantifyStartRecordingData ();
+#endif /* USING_QUANTIFY */
+
   for (int i = 0; i != this->workload_; ++i)
     {
       ACE_Time_Value tv (0, 0);
@@ -21,6 +26,12 @@ Test_i::test_method (CORBA::ULongLong stamp,
       ACE_OS::sleep (tv);
     }
   return stamp;
+
+#if defined (USING_QUANTIFY)
+  // Stop recording data here; whatever happens after this in the test
+  // is not relevant to this test.
+  QuantifyStopRecordingData ();
+#endif /* USING_QUANTIFY */
 }
 
 void