Layout and docu changes

7 files changed, 124 insertions, 143 deletions

diff --git a/TAO/tao/Dynamic_TP/DTP_Config.h b/TAO/tao/Dynamic_TP/DTP_Config.h
index 9cda4ab6d86..1cb1cb90ead 100644
--- a/TAO/tao/Dynamic_TP/DTP_Config.h
+++ b/TAO/tao/Dynamic_TP/DTP_Config.h
@@ -47,7 +47,6 @@ struct TAO_Dynamic_TP_Export TAO_DTP_Definition
     stack_size_(ACE_DEFAULT_THREAD_STACKSIZE),
     timeout_(60,0),
     queue_depth_(0){}
-
 };
 
 class TAO_Dynamic_TP_Export TAO_DTP_Config_Registry_Installer
@@ -101,7 +100,6 @@ private:
   int parse_string (int &curarg, int argc, ACE_TCHAR* argv[], const ACE_TCHAR *match, ACE_TCHAR *&value);
   void report_option_value_error (const ACE_TCHAR* option_name,
                                   const ACE_TCHAR* option_value);
-
 };
 
 static TAO_DTP_Config_Registry_Installer config_installer;
diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
index b3aa6d5ffd4..fd884660896 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
+++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h
@@ -42,7 +42,6 @@ class TAO_DTP_ORBInitializer
   , public virtual ::CORBA::LocalObject
 {
 public:
-
   TAO_DTP_ORBInitializer (void);
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
@@ -50,11 +49,8 @@ public:
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
-
   /// Register Dynamic_TP policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
-
-private:
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
index b1a30f0a276..8b81afd949f 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
+++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h
@@ -33,7 +33,6 @@ class TAO_ORB_Core;
 class TAO_Dynamic_TP_Export TAO_DTP_ORB_Loader : public ACE_Service_Object
 {
 public:
-
   /// Constructor.
   TAO_DTP_ORB_Loader (void);
 
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
index 530af5a0300..a0a021149f0 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h
@@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Dynamic_TP_Export TAO_DTP_POA_Loader : public ACE_Service_Object
 {
 public:
-
   /// Constructor.
   TAO_DTP_POA_Loader (void);
 
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
index 2d8608d0960..3b9acd43681 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h
@@ -32,10 +32,8 @@
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
 #include "ace/OS_NS_strings.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-
 class TAO_DTP_POA_Strategy;
 typedef TAO_Intrusive_Ref_Count_Handle<TAO_DTP_POA_Strategy>
         TAO_DTP_POA_Strategy_Handle;
@@ -58,7 +56,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy:
   public TAO::CSD::Strategy_Base
 {
  public:
-
   /// Constructors.
   /// This constructor supports situations where dynamic instantiation
   /// of a thread pool for POAs is initiated from a svc.conf file.
@@ -110,7 +107,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy:
   /// This is requested on the user application level.
   void cancel_requests(PortableServer::Servant servant);
 
-
  protected:
   /// Handle the dispatching of a remote request.
   ///
@@ -157,8 +153,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy:
      const PortableServer::ObjectId& oid);
 
  private:
-
-
   /**
    * Helper method that is responsible for looking up the servant
    * state object in the servant state map *if* the "serialize
@@ -201,10 +195,8 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy:
   /// been sent in from an application or, if false, needs to be
   /// looked up from a Dynamic TP Config repo. It works in conjunction with
   /// dynamic_tp_config_name_ above.
-
   bool config_initialized_;
 
-
   void set_dtp_config(TAO_DTP_Definition &tp_config);
 };
 
diff --git a/TAO/tao/Dynamic_TP/DTP_Task.h b/TAO/tao/Dynamic_TP/DTP_Task.h
index 77f2cfabdd4..73dfeff8651 100644
--- a/TAO/tao/Dynamic_TP/DTP_Task.h
+++ b/TAO/tao/Dynamic_TP/DTP_Task.h
@@ -34,175 +34,174 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-    /**
-     * @class TP_Task
-     *
-     * @brief Active Object managing a queue of request objects.
-     *
-     * There are two types of "users" of a TP_Task object:
-     *
-     *    1) The TP_Strategy object that "owns" this task object.
-     *    2) The worker threads that "run" this task object as an
-     *       "active object".
-     *
-     * The TP_Strategy object that "owns" this task object dictates
-     * when the worker threads are activated and when they are shutdown.  It
-     * also injects requests into this task's queue via calls to the
-     * add_request() method.  It is also the TP_Strategy object that
-     * dictates the number of worker threads to be activated via a call to
-     * the set_num_threads() method.
-     *
-     * The active object pattern is implemented via the use of the
-     * the ACE_Task_Base base class, and each worker thread will
-     * invoke this task's svc() method, and when the svc() returns, the
-     * worker thread will invoke this task's close() method (with the
-     * flag argument equal to 0).
-     */
-    class TAO_Dynamic_TP_Export TAO_DTP_Task : public ACE_Task_Base
-    {
-    public:
-
-      /// Default Constructor.
-      TAO_DTP_Task();
+/**
+  * @class TP_Task
+  *
+  * @brief Active Object managing a queue of request objects.
+  *
+  * There are two types of "users" of a TP_Task object:
+  *
+  *    1) The TP_Strategy object that "owns" this task object.
+  *    2) The worker threads that "run" this task object as an
+  *       "active object".
+  *
+  * The TP_Strategy object that "owns" this task object dictates
+  * when the worker threads are activated and when they are shutdown.  It
+  * also injects requests into this task's queue via calls to the
+  * add_request() method.  It is also the TP_Strategy object that
+  * dictates the number of worker threads to be activated via a call to
+  * the set_num_threads() method.
+  *
+  * The active object pattern is implemented via the use of the
+  * the ACE_Task_Base base class, and each worker thread will
+  * invoke this task's svc() method, and when the svc() returns, the
+  * worker thread will invoke this task's close() method (with the
+  * flag argument equal to 0).
+  */
+class TAO_Dynamic_TP_Export TAO_DTP_Task : public ACE_Task_Base
+{
+public:
 
-      /// Virtual Destructor.
-      virtual ~TAO_DTP_Task();
+  /// Default Constructor.
+  TAO_DTP_Task();
 
-      struct Open_Args {
-        TAO_DTP_Definition task_thread_config;
-      };
+  /// Virtual Destructor.
+  virtual ~TAO_DTP_Task();
 
+  struct Open_Args {
+    TAO_DTP_Definition task_thread_config;
+  };
 
-      /// Put a request object on to the request queue.
-      /// Returns true if successful, false otherwise (it has been "rejected").
-      bool add_request(TAO::CSD::TP_Request* request);
 
-      /// Activate the worker threads
-      virtual int open(void* args = 0);
+  /// Put a request object on to the request queue.
+  /// Returns true if successful, false otherwise (it has been "rejected").
+  bool add_request(TAO::CSD::TP_Request* request);
 
-      /// The "mainline" executed by each worker thread.
-      virtual int svc();
+  /// Activate the worker threads
+  virtual int open(void* args = 0);
 
-      virtual int close (u_long flag = 0);
+  /// The "mainline" executed by each worker thread.
+  virtual int svc();
 
-      /// Set the thread and queue config.
+  virtual int close (u_long flag = 0);
 
-      void set_init_pool_threads(size_t thr_count);
+  /// Set the thread and queue config.
 
-      void set_min_pool_threads(size_t thr_count);
+  void set_init_pool_threads(size_t thr_count);
 
-      void set_max_pool_threads(size_t thr_count);
+  void set_min_pool_threads(size_t thr_count);
 
-      void set_thread_stack_size(size_t stack_sz);
+  void set_max_pool_threads(size_t thr_count);
 
-      void set_thread_idle_time(ACE_Time_Value thr_timeout);
+  void set_thread_stack_size(size_t stack_sz);
 
-      void set_max_request_queue_depth(size_t queue_depth);
+  void set_thread_idle_time(ACE_Time_Value thr_timeout);
 
-      /// Get the thread and queue config.
+  void set_max_request_queue_depth(size_t queue_depth);
 
-      size_t get_init_pool_threads();
+  /// Get the thread and queue config.
 
-      size_t get_min_pool_threads();
+  size_t get_init_pool_threads();
 
-      size_t get_max_pool_threads();
+  size_t get_min_pool_threads();
 
-      size_t get_max_request_queue_depth();
+  size_t get_max_pool_threads();
 
-      size_t get_thread_stack_size();
+  size_t get_max_request_queue_depth();
 
-      time_t get_thread_idle_time();
+  size_t get_thread_stack_size();
 
-      /// Cancel all requests that are targeted for the provided servant.
-      void cancel_servant (PortableServer::Servant servant);
+  time_t get_thread_idle_time();
 
-    private:
-      /// get the next available request. Return true if one available, nonblocking
-      bool request_ready (TAO::CSD::TP_Dispatchable_Visitor &v,
-                          TAO::CSD::TP_Request_Handle &r);
+  /// Cancel all requests that are targeted for the provided servant.
+  void cancel_servant (PortableServer::Servant servant);
 
-      /// release the request, reset the accepting flag if necessary
-      void clear_request (TAO::CSD::TP_Request_Handle &r);
+private:
+  /// get the next available request. Return true if one available, nonblocking
+  bool request_ready (TAO::CSD::TP_Dispatchable_Visitor &v,
+                      TAO::CSD::TP_Request_Handle &r);
 
-      void add_busy (void);
-      void remove_busy (void);
-      void add_active (void);
-      bool remove_active (bool);
-      bool need_active (void);
-      bool above_minimum (void);
+  /// release the request, reset the accepting flag if necessary
+  void clear_request (TAO::CSD::TP_Request_Handle &r);
 
-      typedef TAO_SYNCH_MUTEX         LockType;
-      typedef TAO_Condition<LockType> ConditionType;
+  void add_busy (void);
+  void remove_busy (void);
+  void add_active (void);
+  bool remove_active (bool);
+  bool need_active (void);
+  bool above_minimum (void);
 
-      /// Lock used to synchronize the "active_workers_" condition
-      LockType aw_lock_;
-      /// Lock used to synchronize manipulation of the queue
-      LockType queue_lock_;
-      /// Lock used to synchronize the "work_available_" condition
-      LockType work_lock_;
+  typedef TAO_SYNCH_MUTEX         LockType;
+  typedef TAO_Condition<LockType> ConditionType;
 
-      /// Condition used to signal worker threads that they may be able to
-      /// find a request in the queue_ that needs to be dispatched to a
-      /// servant that is currently "not busy".
-      /// This condition will be signal()'ed each time a new request is
-      /// added to the queue_, and also when a servant has become "not busy".
-      ConditionType work_available_;
+  /// Lock used to synchronize the "active_workers_" condition
+  LockType aw_lock_;
+  /// Lock used to synchronize manipulation of the queue
+  LockType queue_lock_;
+  /// Lock used to synchronize the "work_available_" condition
+  LockType work_lock_;
 
-      /// This condition will be signal()'ed each time the num_threads_
-      /// data member has its value changed.  This is used to keep the
-      /// close(1) invocation (ie, a shutdown request) blocked until all
-      /// of the worker threads have stopped running.
-      ConditionType active_workers_;
+  /// Condition used to signal worker threads that they may be able to
+  /// find a request in the queue_ that needs to be dispatched to a
+  /// servant that is currently "not busy".
+  /// This condition will be signal()'ed each time a new request is
+  /// added to the queue_, and also when a servant has become "not busy".
+  ConditionType work_available_;
 
-      /// The number of threads that are currently active. This may be
-      /// different than the total number of threads since the latter
-      /// may include threads that are shutting down but not reaped.
-      size_t active_count_;
+  /// This condition will be signal()'ed each time the num_threads_
+  /// data member has its value changed.  This is used to keep the
+  /// close(1) invocation (ie, a shutdown request) blocked until all
+  /// of the worker threads have stopped running.
+  ConditionType active_workers_;
 
-      /// Flag used to indicate when this task will (or will not) accept
-      /// requests via the the add_request() method.
-      bool accepting_requests_;
+  /// The number of threads that are currently active. This may be
+  /// different than the total number of threads since the latter
+  /// may include threads that are shutting down but not reaped.
+  size_t active_count_;
 
-      /// Flag used to initiate a shutdown request to all worker threads.
-      bool shutdown_;
+  /// Flag used to indicate when this task will (or will not) accept
+  /// requests via the the add_request() method.
+  bool accepting_requests_;
 
-      /// Flag to indicate something is on the queue. works in conjunction with
-      /// the work_available condition
-      bool check_queue_;
+  /// Flag used to initiate a shutdown request to all worker threads.
+  bool shutdown_;
 
-      /// Flag used to avoid multiple open() calls.
-      bool opened_;
+  /// Flag to indicate something is on the queue. works in conjunction with
+  /// the work_available condition
+  bool check_queue_;
 
-      /// The number of requests in the local queue.
-      size_t num_queue_requests_;
+  /// Flag used to avoid multiple open() calls.
+  bool opened_;
 
-      /// The number of currently active worker threads.
-      ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned long> busy_threads_;
+  /// The number of requests in the local queue.
+  size_t num_queue_requests_;
 
-      /// The queue of pending servant requests (a.k.a. the "request queue").
-      TAO::CSD::TP_Queue queue_;
+  /// The number of currently active worker threads.
+  ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned long> busy_threads_;
 
-      /// The low water mark for dynamic threads to settle to.
-      size_t init_pool_threads_;
+  /// The queue of pending servant requests (a.k.a. the "request queue").
+  TAO::CSD::TP_Queue queue_;
 
-      /// The low water mark for dynamic threads to settle to.
-      size_t min_pool_threads_;
+  /// The low water mark for dynamic threads to settle to.
+  size_t init_pool_threads_;
 
-      /// The high water mark for dynamic threads to be limited to.
-      size_t max_pool_threads_;
+  /// The low water mark for dynamic threads to settle to.
+  size_t min_pool_threads_;
 
-      /// If the max_pool_threads_ value has been met, then ORB requests coming in can be queued.
-      /// This is the maximum number that will be allowed.
-      size_t max_request_queue_depth_;
+  /// The high water mark for dynamic threads to be limited to.
+  size_t max_pool_threads_;
 
-      /// This is the memory stack size allowable for each thread.
-      size_t thread_stack_size_;
+  /// If the max_pool_threads_ value has been met, then ORB requests coming in can be queued.
+  /// This is the maximum number that will be allowed.
+  size_t max_request_queue_depth_;
 
-      /// This is the maximum amount of time in seconds that an idle thread can
-      /// stay alive before being taken out of the pool.
-      ACE_Time_Value thread_idle_time_;
-    };
+  /// This is the memory stack size allowable for each thread.
+  size_t thread_stack_size_;
 
+  /// This is the maximum amount of time in seconds that an idle thread can
+  /// stay alive before being taken out of the pool.
+  ACE_Time_Value thread_idle_time_;
+};
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
index 520d3e5964c..2ba8a45bf58 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h
@@ -48,7 +48,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_New_Leader_Generator
   : public TAO_New_Leader_Generator
 {
 public:
-
   /// Constructor.
   TAO_DTP_New_Leader_Generator (TAO_DTP_Thread_Pool &lane);
 
@@ -57,7 +56,6 @@ public:
   bool no_leaders_available (void);
 
 private:
-
   /// Pool associated with this leader generator.
   TAO_DTP_Thread_Pool &pool_;
 };