Fri Feb 11 11:16:00 UTC 2011 Martin Corino <mcorino@remedy.nl>

        Merged changes from Remedy work branch.

20 files changed, 25 insertions, 90 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 58a2da23934..b71c28d89de 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -164,7 +164,7 @@ Cubit_Client::Cubit_Client (int shutdown)
 {
 }
 
-// Simple function that returns the substraction of 117 from the
+// Simple function that returns the subtraction of 117 from the
 // parameter.
 
 int
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 0c969d01ac9..39696deb2a4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -57,7 +57,7 @@ public:
 
 private:
   int func (u_int i);
-  // Simple function that returns the substraction of 117 from the
+  // Simple function that returns the subtraction of 117 from the
   // parameter.
 
   int read_ior (const ACE_TCHAR *filename);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
index 6e5455e2499..ec5eb31b91b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
@@ -3,5 +3,5 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST" 
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
+static Client_Strategy_Factory "-ORBClientConnectionHandler ST"
+static Server_Strategy_Factory "-ORBConcurrency reactive"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
index 728b156ecc0..163ec651984 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
@@ -6,6 +6,6 @@
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBConnectionCacheLock null"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler ST"/>
- <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive -ORBPOALock null"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler ST"/>
+ <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index 2aa568bf9af..eb5b4dd1e30 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
@@ -4,6 +4,6 @@
 #
 
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock thread -ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
index 239410f8b86..60269f5dee6 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
@@ -6,6 +6,6 @@
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
- <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBPOALock thread -ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
index 56478215e3d..f96d9a39f74 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
@@ -4,4 +4,4 @@
 #
 
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW" 
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
index cfde325a4c0..e26cbd04d3d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
@@ -6,5 +6,5 @@
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf
index 7482152738d..e406f816f5d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf
@@ -4,4 +4,4 @@
 #
 
 static Advanced_Resource_Factory "-ORBReactorType select_st  -ORBInputCDRAllocator null"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
index c76b951b729..32ae378187c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
@@ -6,5 +6,5 @@
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st  -ORBInputCDRAllocator null"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
index d3d195dabce..2de29f90f01 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
@@ -8,5 +8,5 @@
 #
 
 static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
index b876d3df416..20e85bd18d2 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
@@ -10,6 +10,6 @@
  <!--  the only problems are on shutdown. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
- <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
index 63b5a7940ad..fd18a5d03d7 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -62,15 +62,6 @@ ACE_Sched_Params::priority_max(ACE_SCHED_FIFO,ACE_SCOPE_THREAD)
 ACE_THR_PRI_FIFO_DEF + 25
 #endif /* ! __Lynx__ */
 
-#if defined (CHORUS_MVME)
-#define PCCTIMER_INIT {int pTime;/*Initialize the PCC timer chip */pccTimerInit ();\
-if (pccTimer (PCC2_TIMER1_START, &pTime) != K_OK)\
-ACE_DEBUG ((LM_DEBUG,"pccTimer has a pending benchmark\n"));\
-}
-#else /* !CHORUS_MVME */
-#define PCCTIMER_INIT
-#endif /* !CHORUS_MVME */
-
 #if defined (VXWORKS) && defined (FORCE_ARGS)
 static char *force_argv[]=
 {
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index f7c6a762c03..9d9e10b1f9c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -38,12 +38,8 @@
 #include "Globals.h"
 #include "Timer.h"
 
-#if defined (CHORUS_MVME)
-# include "pccTimer.h"
-#endif /* CHORUS_MVME */
-
 // FUZZ: disable check_for_math_include
-#if !defined (__KCC) && !defined (__xlC__)
+#if !defined (__xlC__)
     // Some plaforms define an exception structure in math.h...
 # if defined (__GNUG__)
     // And some compilers have this workaround.  Disable it with this
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
index 80be1bd682c..33fd84ef56d 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
@@ -5,33 +5,20 @@
 
 MT_Cubit_Timer::MT_Cubit_Timer (u_int granularity)
   :granularity_ (granularity)
-#if defined (CHORUS_MVME)
-  , pstartTime_ (0)
-  , pstopTime_ (0)
-#endif /* CHORUS_MVME */
 {
 }
 
 void
 MT_Cubit_Timer::start (void)
 {
-#if defined (CHORUS_MVME)
-  this->pstartTime_ = pccTime1Get();
-#else /* CHORUS_MVME */
   this->timer_.start ();
-#endif /* !CHORUS_MVME */
 }
 
 void
 MT_Cubit_Timer::stop (void)
 {
-#if defined (CHORUS_MVME)
-  this->pstopTime_ = pccTime1Get ();
-#else /* CHORUS_MVME */
-  // If CHORUS_MVME is not defined just use plain timer_.stop ().
   this->timer_.stop ();
   this->timer_.elapsed_time (this->delta_);
-#endif /* !CHORUS_MVME */
 }
 
 ACE_timer_t
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
index 45c22dbb567..eb6931459a3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
@@ -50,12 +50,6 @@ private:
   // This is the granularity of the timing of the CORBA requests. A
   // value of 5 represents that we will take time every 5 requests,
   // instead of the default of every request (1).
-
-#if defined (CHORUS_MVME)
-  // Variables for the pccTimer.
-  int pstartTime_;
-  int pstopTime_;
-#endif /* CHORUS_MVME */
 };
 
 #endif /* _MT_CUBIT_TIMER_H */
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index b1536bd8bbb..822032d3714 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -128,7 +128,6 @@ Client_i::init (int argc, ACE_TCHAR *argv[])
         this->ts_->thread_count_ =
           ACE_OS::atoi (this->argv_[i+1]);
     }
-  PCCTIMER_INIT;
   return 0;
 }
 
@@ -248,11 +247,7 @@ Client_i::output_latency (void)
            i++,iterator.advance ())
         {
           ACE_OS::sprintf (buffer + ACE_OS::strlen (buffer),
-#if defined (CHORUS_MVME)
-                          "\t%u\n",
-#else
                           "\t%f\n",
-#endif /* !CHORUS_MVME */
                            *latency);
           ACE_OS::fputs (buffer,
                          latency_file_handle);
@@ -295,11 +290,6 @@ Client_i::calc_util_time (void)
 
   // Execute one computation.
   timer.start ();
-#if defined (CHORUS_MVME)
-  this->util_thread_->computation ();
-  timer.stop ();
-  this->util_task_duration_ = timer.get_elapsed ();
-#else
   for (u_int i = 0;
        i < NUM_UTIL_COMPUTATIONS;
        ++i)
@@ -307,7 +297,6 @@ Client_i::calc_util_time (void)
 
   timer.stop ();
   this->util_task_duration_ = timer.get_elapsed () / NUM_UTIL_COMPUTATIONS;
-#endif /* !CHORUS_MVME */
 }
 
 int
@@ -534,18 +523,7 @@ Client_i::print_latency_stats (void)
       // it to Excel to calculate jitter, in the mean time we come up
       // with the sqrt() function.
       output_latency ();
-#elif defined (CHORUS_MVME)
-      ACE_DEBUG ((LM_DEBUG,
-                  "Test done.\n"
-                  "High priority client latency : %u usec\n"
-                  "Low priority client latency : %u usec\n",
-                  this->high_priority_client_->get_high_priority_latency (),
-                  this->low_priority_client_[0]->get_low_priority_latency () ));
-      // Output the latency values to a file, tab separated, to import
-      // it to Excel to calculate jitter, in the mean time we come up
-      // with the sqrt() function.
-      output_latency ();
-#else /* !CHORUS_MVME */
+#else
       ACE_DEBUG ((LM_DEBUG, "Test done.\n"
                   "High priority client latency : %f usec, jitter: %f usec\n"
                   "Low priority client latency : %f usec, jitter: %f usec\n",
@@ -554,8 +532,8 @@ Client_i::print_latency_stats (void)
                   this->low_priority_client_[0]->get_low_priority_latency (),
                   this->low_priority_client_[0]->get_low_priority_jitter ()));
       // output_latency ();
-#endif /* !ACE_VXWORKS && !CHORUS_MVME */
     }
+#endif
 }
 
 void
@@ -857,12 +835,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   // Run the tests.
   client.run ();
 
-#if defined (CHORUS_MVME)
-  int pTime;
-  if (pccTimer (PCC2_TIMER1_STOP,
-                &pTime) != K_OK)
-    ACE_DEBUG ((LM_DEBUG,
-                "pccTimer has a pending bench mark\n"));
-#endif /* CHORUS_MVME */
   return 0;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
index 0a6b5894a19..3cccca50c16 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
@@ -30,10 +30,6 @@
 #include "Util_Thread.h"
 #include "Timer.h"
 
-#if defined (CHORUS_MVME)
-#include "pccTimer.h"
-#endif /* CHORUS_MVME */
-
 #if defined (VME_DRIVER)
 #include <hostLib.h>
 extern "C" STATUS vmeDrv (void);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
index bb4034051b9..2bdce0c3f02 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -4,5 +4,5 @@
 #
 
 static Advanced_Resource_Factory "-ORBInputCDRAllocator null -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
index 3d76eda6597..73ad6ac6461 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
@@ -6,6 +6,6 @@
  <!--  Please see $TAO_ROOT/docs/Options.html for details on these options. -->
  <!--  -->
  <static id="Advanced_Resource_Factory" params="-ORBInputCDRAllocator null -ORBConnectionCacheLock null"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
- <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"/>
 </ACE_Svc_Conf>