Merge pull request #892 from jwillemsen/jwi-orbsvcsrtevent

RTEvent performance-tests cleanup

14 files changed, 2 insertions, 57 deletions

diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
index f1ef71572b6..08b2b33d1b0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
@@ -6,10 +6,6 @@
 
 #include "EC_Destroyer.h"
 
-#if !defined(__ACE_INLINE__)
-#include "EC_Destroyer.inl"
-#endif /* __ACE_INLINE__ */
-
 EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec)
   :  ec_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec))
 {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
index 88e7c470977..f4078e534df 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
@@ -38,8 +38,4 @@ private:
   RtecEventChannelAdmin::EventChannel_var ec_;
 };
 
-#if defined(__ACE_INLINE__)
-#include "EC_Destroyer.inl"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_PERF_RTEC_EC_DESTROYER_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl
deleted file mode 100644
index 5af0172c245..00000000000
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * @file EC_Destroyer.inl
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl
deleted file mode 100644
index a568d801898..00000000000
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * @file Low_Priority_Setup.inl
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
index e572d42ac75..00786c73bde 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
@@ -9,10 +9,6 @@
 #include "RIR_Narrow.h"
 #include "tao/Policy_ManagerC.h"
 
-#if !defined(__ACE_INLINE__)
-#include "PriorityBand_Setup.inl"
-#endif /* __ACE_INLINE__ */
-
 PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
                                         const RTCORBA_Setup &rtcorba_setup)
 {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
index 62889e0527c..f0f23d54db3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
@@ -35,8 +35,4 @@ public:
   ~PriorityBand_Setup (void);
 };
 
-#if defined(__ACE_INLINE__)
-#include "PriorityBand_Setup.inl"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_PERF_RTEC_PRIORITYBAND_SETUP_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl
deleted file mode 100644
index 54a3ef0e5de..00000000000
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * @file PriorityBand_Setup.inl
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- */
-
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h
index aeb1f8daf2f..c817a22f08c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h
@@ -10,7 +10,6 @@
 #include "rtec_perf_export.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
-#include "ace/Auto_Ptr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -38,8 +37,7 @@ public:
   RTCORBA::Priority process_priority (void) const;
 
 private:
-  void setup_lane (int priority, RTCORBA::ThreadpoolLane &lane
- );
+  void setup_lane (int priority, RTCORBA::ThreadpoolLane &lane);
 
 private:
   RTCORBA::PriorityMappingManager_var priority_mapping_manager_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
index da170a07a03..e037fbf7d54 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
@@ -21,19 +21,11 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba,
   : use_rt_corba_ (use_rt_corba)
   , syncscope_setup_ (orb)
 {
-
   if (use_rt_corba)
     {
       ACE_auto_ptr_reset (this->rtcorba_setup_,
                           new RTCORBA_Setup (orb,
                                              rt_class,
                                              nthreads));
-
-#if 0
-      ACE_auto_ptr_reset (this->priorityband_setup_,
-                          new PriorityBand_Setup (orb,
-                                                  *this->rtcorba_setup_));
-
-#endif /* 0 */
     }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
index bf6044196ba..82ee76d81fa 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
@@ -43,7 +43,6 @@ private:
   int use_rt_corba_;
 
   auto_ptr<RTCORBA_Setup> rtcorba_setup_;
-  auto_ptr<PriorityBand_Setup> priorityband_setup_;
   SyncScope_Setup syncscope_setup_;
 };
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
index 2d582b4de62..865bc73a6f2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
@@ -12,6 +12,7 @@
 #include "orbsvcs/Event/EC_RTCORBA_Factory.h"
 
 #include "ace/Dynamic_Service.h"
+#include "ace/Auto_Ptr.h"
 
 TAO_EC_Event_Channel *
 RTEC_Initializer::create (PortableServer::POA_ptr consumer_poa,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
index b897fc4c96d..a75014c780a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
@@ -8,10 +8,6 @@
 #include "RIR_Narrow.h"
 #include "tao/AnyTypeCode/Any.h"
 
-#if !defined(__ACE_INLINE__)
-#include "SyncScope_Setup.inl"
-#endif /* __ACE_INLINE__ */
-
 SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb,
                                   Messaging::SyncScope value)
 {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
index 5f4d1b441f5..75689632305 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
@@ -40,8 +40,4 @@ private:
              Messaging::SyncScope value);
 };
 
-#if defined(__ACE_INLINE__)
-#include "SyncScope_Setup.inl"
-#endif /* __ACE_INLINE__ */
-
 #endif /* TAO_PERF_RTEC_SYNCSCOPE_SETUP_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl
deleted file mode 100644
index efa4eba2fc4..00000000000
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * @file SyncScope_Setup.inl
- *
- * @author Carlos O'Ryan <coryan@uci.edu>
- */