Wed Jan 31 15:03:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 55 insertions, 81 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index bcf3c550450..952dddfa39d 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,11 +1,18 @@
+Wed Jan 31 15:03:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/ExecutionManager/DAM_Map.{h,cpp}:
+        * DAnCE/ExecutionManager/Execution_Manager.cpp
+        * DAnCE/ExecutionManager/Execution_Manager_Impl.{h,cpp}:
+          Const changes, layout improvements
+
 Tue Jan 30 20:49:50 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
          * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
          * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp:
-         
+
            Compile fixes for FC6.
- 
-Tue Jan 30 20:43:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+Tue Jan 30 20:43:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
           Changed the check for the bind, with -1 return an error, with
@@ -13,14 +20,14 @@ Tue Jan 30 20:43:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
           Thanks to Sandro Andrade <sandro dot andrade at gmail dot com>
           for reporting that ReDAC was broken.
 
-Tue Jan 30 11:27:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jan 30 11:27:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Server_init.{h,cpp}:
           Change argument of BindObjectPath to a _ptr. Fixes bugzilla
           2779. Thanks to Abdullah Sowayan <abdullah.sowayan@lmco.com>
           for reporting this.
 
-Mon Jan 29 19:23:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Jan 29 19:23:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Swapping_Servant_Home_Impl_Base.{h,cpp}:
         * ciao/Upgradeable_Context_Impl_T.cpp:
diff --git a/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp b/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
index 350fb63d331..003f25b95e0 100644
--- a/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
+++ b/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
@@ -16,13 +16,13 @@ namespace CIAO
     }
 
     size_t
-    DAM_Map::size (void)
+    DAM_Map::size (void) const
     {
       return this->map_.current_size ();
     }
 
     bool
-    DAM_Map::is_plan_available (const ACE_CString &str)
+    DAM_Map::is_plan_available (const ACE_CString &str) const
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::is_plan_available");
       if (this->map_.find (str) == 0)
@@ -41,8 +41,7 @@ namespace CIAO
       ::Deployment::DomainApplicationManager_var tmp;
 
       /// There should be duplicate when assigning a _var to an _var.
-      int const retval =  this->map_.find (str,
-                                           tmp);
+      int const retval =  this->map_.find (str, tmp);
 
       if (CIAO::debug_level () > 9)
         {
@@ -62,9 +61,7 @@ namespace CIAO
       ::Deployment::DomainApplicationManager_ptr dam)
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::bind_dam_reference");
-      int const retval =
-        this->map_.rebind (str,
-                         dam);
+      int const retval = this->map_.rebind (str, dam);
 
       if (retval != 0)
         return false;
@@ -77,8 +74,7 @@ namespace CIAO
     DAM_Map::get_dams ()
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::get_dams");
-      CORBA::ULong const sz =
-        this->map_.current_size ();
+      CORBA::ULong const sz = this->map_.current_size ();
 
       // Initialize the list of DomainApplication Managers
       Deployment::DomainApplicationManagers_var list;
@@ -89,13 +85,11 @@ namespace CIAO
       // Add the manager to the list
       list->length (sz);
 
-      Iterator end =
-        this->map_.end ();
+      Iterator end = this->map_.end ();
 
       CORBA::ULong i = 0;
 
-      for (Iterator b =
-             this->map_.begin (); b != end; ++b)
+      for (Iterator b = this->map_.begin (); b != end; ++b)
         {
           list [i] =
             Deployment::DomainApplicationManager::_duplicate ((*b).int_id_.in ());
@@ -110,8 +104,7 @@ namespace CIAO
     DAM_Map::unbind_dam (const ACE_CString &str)
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::unbind_dam");
-      int const retval =
-        this->map_.unbind (str);
+      int const retval = this->map_.unbind (str);
 
       if (retval != 0)
         return false;
diff --git a/CIAO/DAnCE/ExecutionManager/DAM_Map.h b/CIAO/DAnCE/ExecutionManager/DAM_Map.h
index d69c9d10e9a..dc4e07e5155 100644
--- a/CIAO/DAnCE/ExecutionManager/DAM_Map.h
+++ b/CIAO/DAnCE/ExecutionManager/DAM_Map.h
@@ -38,7 +38,7 @@ namespace CIAO
     public:
       DAM_Map (void);
 
-      bool is_plan_available (const ACE_CString &str);
+      bool is_plan_available (const ACE_CString &str) const;
 
       ::Deployment::DomainApplicationManager_ptr
       fetch_dam_reference (const ACE_CString &str);
@@ -47,12 +47,11 @@ namespace CIAO
         const ACE_CString &str,
         ::Deployment::DomainApplicationManager_ptr tmp);
 
-      Deployment::DomainApplicationManagers *
-      get_dams ();
+      Deployment::DomainApplicationManagers *get_dams ();
 
       bool unbind_dam (const ACE_CString &str);
 
-      size_t size (void);
+      size_t size (void) const;
 
     private:
       typedef
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index c7b5df7b96a..391a833faf4 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -67,8 +67,7 @@ namespace CIAO
       CORBA::String_var ior =
         orb->object_to_string (obj);
 
-      FILE* ior_output_file_ =
-        ACE_OS::fopen (ior_file_name_, "w");
+      FILE* ior_output_file_ = ACE_OS::fopen (ior_file_name_, "w");
 
       if (ior_output_file_)
         {
@@ -115,7 +114,6 @@ namespace CIAO
       CosNaming::Name name (1);
       name.length (1);
 
-      // String dup required for MSVC6
       name[0].id = CORBA::string_dup ("ExecutionManager");
 
       // Register the servant with the Naming Service
@@ -124,7 +122,7 @@ namespace CIAO
           // Register the servant with the Naming Service
           naming_context->bind (name, obj);
         }
-      catch (CosNaming::NamingContext::AlreadyBound &)
+      catch (const CosNaming::NamingContext::AlreadyBound &)
         {
           ACE_DEBUG ((LM_DEBUG, "Execution_Manager.cpp: Name already bound, rebinding....\n"));
           naming_context->rebind (name, obj);
@@ -140,21 +138,17 @@ namespace CIAO
       try
         {
           CORBA::ORB_var orb =
-            CORBA::ORB_init (argc,
-                             argv,
-                             "");
+            CORBA::ORB_init (argc, argv);
 
           if (!parse_args (argc, argv))
             return -1;
 
           // Get reference to Root POA.
-          CORBA::Object_var obj
-            = orb->resolve_initial_references ("RootPOA");
+          CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
           PortableServer::POA_var poa =
             PortableServer::POA::_narrow (obj.in ());
 
-
           if (CORBA::is_nil (poa.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                "(%P|%t) CIAO_ExecutionManager: "
@@ -172,34 +166,28 @@ namespace CIAO
           // Implicit activation
           PortableServer::ServantBase_var safe_daemon (daemon_servant);
 
-          CIAO::ExecutionManagerDaemon_var daemon =
-            daemon_servant->_this ();
+          CIAO::ExecutionManagerDaemon_var daemon = daemon_servant->_this ();
 
           TAO::Utils::Implicit_Deactivator de (daemon_servant);
           bool retval = false;
 
           if (register_with_ns_)
             {
-              retval =
-                register_with_ns (orb.in (),
-                                  daemon.in ());
+              retval = register_with_ns (orb.in (), daemon.in ());
             }
 
           if (write_to_ior_)
             {
-              retval =
-                write_ior_file (orb.in (),
-                                daemon.in ());
+              retval = write_ior_file (orb.in (), daemon.in ());
             }
 
           if (!retval)
             return -1;
 
           // Activate POA manager
-          PortableServer::POAManager_var mgr =
-            poa->the_POAManager ();
+          PortableServer::POAManager_var mgr = poa->the_POAManager ();
 
-          if (mgr.in () == 0)
+          if (CORBA::is_nil (mgr.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                "(%P|%t) CIAO_ExecutionManager: "
                                "Nil POA Manager error, returning \n"),
@@ -220,14 +208,13 @@ namespace CIAO
           // destroy.
           (void) de.release ();
 
-          poa->destroy (1,
-                        1);
+          poa->destroy (1, 1);
 
           orb->destroy ();
         }
       catch (const CORBA::Exception& ex)
         {
-          ex._tao_print_exception ("CIAO_ExecutionManager::main\t\n");
+          ex._tao_print_exception ("CIAO_ExecutionManager::main\n");
           return -1;
         }
 
@@ -242,6 +229,5 @@ namespace CIAO
 int
 main (int argc, char *argv[])
 {
-  return CIAO::Execution_Manager::run_main (argc,
-                                            argv);
+  return CIAO::Execution_Manager::run_main (argc, argv);
 }
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
index 8a93b2f5ef0..e2e1e4a6764 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
@@ -111,8 +111,7 @@ namespace CIAO
       ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) About to set uuid on DAM...\n"));
       dam_servant->set_uuid (plan.UUID.in ());
 
-      Deployment::DomainApplicationManager_var dam =
-        dam_servant->_this ();
+      Deployment::DomainApplicationManager_var dam = dam_servant->_this ();
 
       /// @@ TODO:Need to check the return value......
       ///
@@ -146,8 +145,7 @@ namespace CIAO
     void
     Execution_Manager_Impl::destroyManager (
       Deployment::DomainApplicationManager_ptr manager)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StopError))
+      ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError))
     {
       CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::destroyManagers");
       try
@@ -172,8 +170,7 @@ namespace CIAO
         }
       catch (const CORBA::Exception& ex)
         {
-          ex._tao_print_exception (
-            "Execution_Manager_Impl::destroyManager\t\n");
+          ex._tao_print_exception ("Execution_Manager_Impl::destroyManager\n");
           throw Deployment::StopError ();
         }
     }
@@ -227,8 +224,7 @@ namespace CIAO
         }
       catch (const CORBA::Exception& ex)
         {
-          ex._tao_print_exception (
-            "Execution_Manager_Impl::destroyManager\t\n");
+          ex._tao_print_exception ("Execution_Manager_Impl::destroyManager\n");
           throw Deployment::StopError ();
         }
     }
@@ -287,7 +283,7 @@ namespace CIAO
       catch (const CORBA::Exception& ex)
         {
           ex._tao_print_exception (
-            "Execution_Manager_Impl::perform_redeployment\t\n");
+            "Execution_Manager_Impl::perform_redeployment\n");
           throw;
         }
     }
@@ -317,7 +313,7 @@ namespace CIAO
         }
       catch (const CORBA::Exception& ex)
         {
-          ex._tao_print_exception ("Execution_Manager_Impl::getPlan\t\n");
+          ex._tao_print_exception ("Execution_Manager_Impl::getPlan\n");
           throw;
         }
     }
@@ -361,7 +357,7 @@ namespace CIAO
       catch (const CORBA::Exception& ex)
         {
           ex._tao_print_exception (
-            "Execution_Manager_Impl::finalize_global_binding\t\n");
+            "Execution_Manager_Impl::finalize_global_binding\n");
           throw Deployment::InvalidConnection ();
         }
     }
@@ -396,7 +392,7 @@ namespace CIAO
       catch (const CORBA::Exception& ex)
         {
           ex._tao_print_exception (
-            "Execution_Manager_Impl::passivate_shared_components\t\n");
+            "Execution_Manager_Impl::passivate_shared_components\n");
           throw Deployment::StartError ();
         }
     }
@@ -431,19 +427,15 @@ namespace CIAO
       catch (const CORBA::Exception& ex)
         {
           ex._tao_print_exception (
-            "Execution_Manager_Impl::passivate_shared_components\t\n");
+            "Execution_Manager_Impl::passivate_shared_components\n");
           throw Deployment::StartError ();
         }
     }
 
-
     Deployment::NodeApplication_ptr
-
-    Execution_Manager_Impl::
-    find_node_application (const Component_Binding_Info & binding)
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::Deployment::InvalidConnection))
+    Execution_Manager_Impl::find_node_application (
+      const Component_Binding_Info & binding)
+      ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::InvalidConnection))
     {
       // Find the DAM based on plan_UUID
       Deployment::DomainApplicationManager_var dam;
@@ -463,8 +455,8 @@ namespace CIAO
 
       // Find the NA based on the NodeName field of the binding
       // This is a CORBA call on the DAM
-      Deployment::NodeApplication_var
-        node_app = dam->get_node_app (binding.node_.c_str ());
+      Deployment::NodeApplication_var node_app =
+        dam->get_node_app (binding.node_.c_str ());
 
       if (CORBA::is_nil (node_app.in ()))
         {
@@ -493,8 +485,8 @@ namespace CIAO
     }
 
     bool
-    Execution_Manager_Impl::
-    is_component_running (const char * name, const char * plan_uuid)
+    Execution_Manager_Impl::is_component_running (
+      const char * name, const char * plan_uuid)
     {
       for (ACE_Unbounded_Set<Component_Binding_Info>::iterator
            iter = this->shared_components_.begin ();
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
index cf674d37fe9..9da6d172565 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
@@ -34,9 +34,8 @@ namespace CIAO
      *
      * @class Execution_Manager_Impl
      *
-     * @brief This class implements the
-     * ExecutionManger. ExecutionManager starts the execution process
-     * after the planning stage.
+     * @brief This class implements the ExecutionManger. ExecutionManager
+     * starts the execution process after the planning stage.
      *
      */
     class Execution_Manager_Impl
@@ -58,8 +57,7 @@ namespace CIAO
                          Deployment::PlanError,
                          Deployment::StartError));
 
-      virtual Deployment::DomainApplicationManagers *
-      getManagers ()
+      virtual Deployment::DomainApplicationManagers *getManagers ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       // Below method is CIAO specific extension
@@ -96,8 +94,7 @@ namespace CIAO
                          ::Deployment::InvalidProperty,
                          ::Components::RemoveFailure));
 
-      virtual Deployment::DeploymentPlan * getPlan (
-          const char * plan_uuid)
+      virtual Deployment::DeploymentPlan * getPlan (const char * plan_uuid)
         ACE_THROW_SPEC ((::CORBA::SystemException));
 
     /// ****************** C++ Methods *************************