diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-13 18:28:28 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-13 18:28:28 +0000 |
commit | 5c939196d9713206fdeb05795c57caf84dba3f03 (patch) | |
tree | 0087d49dc10cf55b27d42d6439e3bf19bfd67a57 /DAnCE/LocalityManager | |
parent | 3018889b98ea7eadc1869f79bf7b3e546294b5d1 (diff) | |
download | ATCD-5c939196d9713206fdeb05795c57caf84dba3f03.tar.gz |
Mon Sep 13 18:15:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
*:
Zapped trailing whitespaces using
find -name \*.h -o -name \*.cpp -name \*.inl | xargs perl -i -pe's/\s+\n/\n/'
Diffstat (limited to 'DAnCE/LocalityManager')
24 files changed, 214 insertions, 214 deletions
diff --git a/DAnCE/LocalityManager/Configuration/CPU_Affinity.h b/DAnCE/LocalityManager/Configuration/CPU_Affinity.h index 7fdf3198c65..18b480d0d18 100644 --- a/DAnCE/LocalityManager/Configuration/CPU_Affinity.h +++ b/DAnCE/LocalityManager/Configuration/CPU_Affinity.h @@ -26,15 +26,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor CPU_Affinity (void); - - // Destructor + + // Destructor virtual ~CPU_Affinity (void); - + virtual char * type (void); - + virtual void configure (const ::Deployment::Property & prop); }; diff --git a/DAnCE/LocalityManager/Configuration/Process_Name.h b/DAnCE/LocalityManager/Configuration/Process_Name.h index 7b78784b20f..d69fa057a1b 100644 --- a/DAnCE/LocalityManager/Configuration/Process_Name.h +++ b/DAnCE/LocalityManager/Configuration/Process_Name.h @@ -26,15 +26,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Process_Name (void); - - // Destructor + + // Destructor virtual ~Process_Name (void); - + virtual char * type (void); - + virtual void configure (const ::Deployment::Property & prop); }; diff --git a/DAnCE/LocalityManager/Configuration/Process_Priority.h b/DAnCE/LocalityManager/Configuration/Process_Priority.h index 659670ed2f3..9d62fcd55fd 100644 --- a/DAnCE/LocalityManager/Configuration/Process_Priority.h +++ b/DAnCE/LocalityManager/Configuration/Process_Priority.h @@ -26,15 +26,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Process_Priority (void); - - // Destructor + + // Destructor virtual ~Process_Priority (void); - + virtual char * type (void); - + virtual void configure (const ::Deployment::Property & prop); }; diff --git a/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h b/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h index 7b8c62651c8..7b224ff870d 100644 --- a/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h +++ b/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h @@ -6,7 +6,7 @@ * @author William R. Otte <wotte@dre.vanderbilt.edu> **/ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_codegen.cpp:1521 #ifndef DANCE_LOCALITYMANAGERI_PDD6RP_H_ @@ -38,75 +38,75 @@ namespace DAnCE : public virtual POA_DAnCE::LocalityManager { public: - // Constructor + // Constructor LocalityManager_i (const ACE_TString &uuid, std::list <std::string> plugin_config_files, CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - + void init (Deployment::Properties *prop); - // Destructor + // Destructor virtual ~LocalityManager_i (void); - + virtual ::Deployment::Properties * configuration (void); - + virtual ::Deployment::ApplicationManager_ptr preparePlan ( const ::Deployment::DeploymentPlan & plan, ::Deployment::ResourceCommitmentManager_ptr resourceCommitment); - + virtual void destroyManager (::Deployment::ApplicationManager_ptr manager); - + virtual void shutdown (void); - + virtual void finishLaunch (const ::Deployment::Connections & providedReference, ::CORBA::Boolean start); - + virtual void start (void); - + virtual ::Deployment::Application_ptr startLaunch (const ::Deployment::Properties & configProperty, ::Deployment::Connections_out providedReference); - + virtual void destroyApplication (::Deployment::Application_ptr app); - + private: void install_instances (const ::Deployment::Properties &prop); - + void collect_references (::Deployment::Connections_out &providedReference); - + ACE_TString uuid_; - + std::list< std::string > plugin_config_files_; CORBA::ORB_var orb_; PortableServer::POA_var poa_; - + typedef std::list< CORBA::ULong > INSTANCE_LIST; - typedef std::map <std::string, + typedef std::map <std::string, INSTANCE_LIST> HANDLER_TABLE; - + HANDLER_TABLE instance_handlers_; - + Plugin_Manager::INSTALL_ORDER handler_order_; - + typedef std::map < std::string, CORBA::Any_var > REFERENCE_MAP; - + REFERENCE_MAP instance_references_; - + ::Deployment::DeploymentPlan plan_; - + ::Deployment::Properties_var props_; - + DAnCE::Deployment_Scheduler scheduler_; - + CORBA::ULong spawn_delay_; }; diff --git a/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.h b/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.h index 4487d0b000f..7b9d733910f 100644 --- a/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.h +++ b/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.h @@ -43,7 +43,7 @@ namespace DAnCE ACE_TString uuid_; ACE_TString callback_ior_str_; ACE_TString output_file_; - + std::list < std::string > plugin_config_; }; } diff --git a/DAnCE/LocalityManager/Handler/Config_Handler_Impl.h b/DAnCE/LocalityManager/Handler/Config_Handler_Impl.h index 40ef22087f3..724768dc131 100644 --- a/DAnCE/LocalityManager/Handler/Config_Handler_Impl.h +++ b/DAnCE/LocalityManager/Handler/Config_Handler_Impl.h @@ -4,8 +4,8 @@ /** * @file Config_Handler_Impl.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef DANCE_CONFIG_HANDLER_H @@ -28,15 +28,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Config_Handler_Impl (void); - - // Destructor + + // Destructor virtual ~Config_Handler_Impl (void); - + virtual char * instance_type (void); - + ::CORBA::StringSeq * dependencies (void); @@ -44,7 +44,7 @@ namespace DAnCE void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -59,29 +59,29 @@ namespace DAnCE ::CORBA::ULong instanceRef, const ::CORBA::Any & instance_reference); - virtual + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, ::CORBA::Any_out) {}; - + virtual void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - virtual + virtual void instance_configured (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) {}; + ::CORBA::ULong) {}; virtual void configure(const Deployment::Properties&); - + virtual void close (void); - + private: static const char *instance_type_; }; @@ -89,7 +89,7 @@ namespace DAnCE extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr DAnCE_Locality_Handler_Export create_Config_Handler (void); } diff --git a/DAnCE/LocalityManager/Handler/Inst_Handler_Impl.h b/DAnCE/LocalityManager/Handler/Inst_Handler_Impl.h index a169d4ec963..6878514602f 100644 --- a/DAnCE/LocalityManager/Handler/Inst_Handler_Impl.h +++ b/DAnCE/LocalityManager/Handler/Inst_Handler_Impl.h @@ -4,8 +4,8 @@ /** * @file Inst_Handler_Impl.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef DANCE_INST_HANDLER_H @@ -28,15 +28,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Inst_Handler_Impl (void); - - // Destructor + + // Destructor virtual ~Inst_Handler_Impl (void); - + virtual char * instance_type (void); - + ::CORBA::StringSeq * dependencies (void); @@ -44,7 +44,7 @@ namespace DAnCE void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -59,29 +59,29 @@ namespace DAnCE ::CORBA::ULong instanceRef, const ::CORBA::Any & instance_reference); - virtual + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, ::CORBA::Any_out) {}; - + virtual void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - virtual + virtual void instance_configured (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) {}; + ::CORBA::ULong) {}; virtual void configure(const Deployment::Properties&); - + virtual void close (void); - + private: static const char *instance_type_; }; @@ -89,7 +89,7 @@ namespace DAnCE extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr DAnCE_Locality_Handler_Export create_Inst_Handler (void); } diff --git a/DAnCE/LocalityManager/Handler/Interceptor_Handler_Impl.h b/DAnCE/LocalityManager/Handler/Interceptor_Handler_Impl.h index 154e2d72f7d..4e30581c842 100644 --- a/DAnCE/LocalityManager/Handler/Interceptor_Handler_Impl.h +++ b/DAnCE/LocalityManager/Handler/Interceptor_Handler_Impl.h @@ -4,8 +4,8 @@ /** * @file Interceptor_Handler_Impl.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef DANCE_INTERCEPTOR_HANDLER_H @@ -28,15 +28,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Interceptor_Handler_Impl (void); - - // Destructor + + // Destructor virtual ~Interceptor_Handler_Impl (void); - + virtual char * instance_type (void); - + ::CORBA::StringSeq * dependencies (void); @@ -44,7 +44,7 @@ namespace DAnCE void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -59,29 +59,29 @@ namespace DAnCE ::CORBA::ULong instanceRef, const ::CORBA::Any & instance_reference); - virtual + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, ::CORBA::Any_out) {}; - + virtual void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - virtual + virtual void instance_configured (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) {}; + ::CORBA::ULong) {}; virtual void configure(const Deployment::Properties&); - + virtual void close (void); - + private: static const char *instance_type_; }; @@ -89,7 +89,7 @@ namespace DAnCE extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr DAnCE_Locality_Handler_Export create_Interceptor_Handler (void); } diff --git a/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h b/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h index 82dbf6a230c..91b65a5fc93 100644 --- a/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h +++ b/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h @@ -99,7 +99,7 @@ namespace DAnCE void create_properties (const Server_Info &info, Deployment::Properties_out config); - + struct Server_Info { enum ProcessStatus diff --git a/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h b/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h index 5d61094176a..576b2ed5cfe 100644 --- a/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h +++ b/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h @@ -4,8 +4,8 @@ /** * @file Locality_Manager_Handler_Impl.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef DANCE_LOCALITYMANAGERI_MIGAYG_H_ @@ -30,12 +30,12 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Locality_Handler_i (void); - - // Destructor + + // Destructor virtual ~Locality_Handler_i (void); - + virtual char * instance_type (void); @@ -46,7 +46,7 @@ namespace DAnCE void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -61,29 +61,29 @@ namespace DAnCE ::CORBA::ULong instanceRef, const ::CORBA::Any & instance_reference); - virtual + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, ::CORBA::Any_out) {}; - + virtual void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - virtual + virtual void instance_configured (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) {}; + ::CORBA::ULong) {}; virtual void configure(const Deployment::Properties&); - + virtual void close (void); - + private: static const char *instance_type_; DAnCE_LocalityActivator_i *activator_; @@ -92,7 +92,7 @@ namespace DAnCE extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr DAnCE_Locality_Handler_Export create_Locality_Handler (void); } diff --git a/DAnCE/LocalityManager/Handler/Plugin_Conf.h b/DAnCE/LocalityManager/Handler/Plugin_Conf.h index 4c32b74bb57..8aba027cd6f 100644 --- a/DAnCE/LocalityManager/Handler/Plugin_Conf.h +++ b/DAnCE/LocalityManager/Handler/Plugin_Conf.h @@ -18,15 +18,15 @@ namespace DAnCE { public: void load_from_text_file (const ACE_TCHAR *file); - + private: void deploy_plan (::Deployment::DeploymentPlan &plan); - + void create_entry (const char *artifact, const char *entrypoint, const char *type, ::Deployment::DeploymentPlan &plan, - CORBA::ULong pos); + CORBA::ULong pos); }; } #endif diff --git a/DAnCE/LocalityManager/Interceptors/Best_Effort.h b/DAnCE/LocalityManager/Interceptors/Best_Effort.h index 5d08dad0b3c..9cdfadbbbfc 100644 --- a/DAnCE/LocalityManager/Interceptors/Best_Effort.h +++ b/DAnCE/LocalityManager/Interceptors/Best_Effort.h @@ -24,13 +24,13 @@ namespace DAnCE : public virtual DAnCE::DeploymentInterceptor_Base { public: - // Constructor - + // Constructor + Best_Effort (void); - - // Destructor + + // Destructor virtual ~Best_Effort (void); - + virtual void post_install (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong index, @@ -47,31 +47,31 @@ namespace DAnCE void post_configured (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_activate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_passivate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_remove (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); virtual void configure(const Deployment::Properties&); - + private: }; } extern "C" { - ::DAnCE::DeploymentInterceptor_ptr + ::DAnCE::DeploymentInterceptor_ptr DAnCE_Error_Interceptors_Export create_DAnCE_Best_Effort (void); } diff --git a/DAnCE/LocalityManager/Scheduler/Dependency_Sorter.h b/DAnCE/LocalityManager/Scheduler/Dependency_Sorter.h index ddc5cb9828a..078d59b9394 100644 --- a/DAnCE/LocalityManager/Scheduler/Dependency_Sorter.h +++ b/DAnCE/LocalityManager/Scheduler/Dependency_Sorter.h @@ -31,12 +31,12 @@ namespace DAnCE /// Add a dependency to the map. void add_dependency (const std::string &subject, const std::string &install_after); - + void calculate_order (INSTALL_ORDER &); private: typedef std::map < std::string, IH_DEPS > DEP_MAP; - + DEP_MAP dep_map_; }; } diff --git a/DAnCE/LocalityManager/Scheduler/Deployment_Completion.h b/DAnCE/LocalityManager/Scheduler/Deployment_Completion.h index 89f960a7679..83f527eb8c5 100644 --- a/DAnCE/LocalityManager/Scheduler/Deployment_Completion.h +++ b/DAnCE/LocalityManager/Scheduler/Deployment_Completion.h @@ -33,19 +33,19 @@ namespace DAnCE virtual ~Deployment_Completion (void); virtual void update (const Event_Future &future); - + void accept (Event_Future &future); /// Waits for completion of all events, with a timeout bool wait_on_completion (ACE_Time_Value *tv); - + void completed_events (Event_List &event_list); protected: virtual void on_all_completed (); virtual void on_all_completed_with_failure (); - + bool single_threaded_wait_on_completion (ACE_Time_Value *tv); private: @@ -53,7 +53,7 @@ namespace DAnCE TAO_SYNCH_MUTEX mutex_; ACE_Condition< TAO_SYNCH_MUTEX > condition_; - + Event_List completed_events_; }; diff --git a/DAnCE/LocalityManager/Scheduler/Deployment_Event.h b/DAnCE/LocalityManager/Scheduler/Deployment_Event.h index 491a0380e8b..80f8b1e6ffb 100644 --- a/DAnCE/LocalityManager/Scheduler/Deployment_Event.h +++ b/DAnCE/LocalityManager/Scheduler/Deployment_Event.h @@ -33,26 +33,26 @@ namespace DAnCE bool exception_; CORBA::Any_var contents_; }; - + typedef ACE_Future< Event_Result > Event_Future; - + typedef std::list <Event_Future> Event_List; - - class Deployment_Scheduler_Export Deployment_Event : + + class Deployment_Scheduler_Export Deployment_Event : public virtual ACE_Method_Request { public: Deployment_Event (Event_Future holder, const char *name, const char *instance_type); - + Event_Future get_future (void); - + protected: Event_Future holder_; std::string name_; std::string instance_type_; - }; + }; } #if defined (__ACE_INLINE__) diff --git a/DAnCE/LocalityManager/Scheduler/Events/Action_Base.h b/DAnCE/LocalityManager/Scheduler/Events/Action_Base.h index 2df49327dab..13963444875 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Action_Base.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Action_Base.h @@ -19,23 +19,23 @@ namespace DAnCE Action_Base (Event_Future holder, const char *name, const char *instance_type); - + virtual ~Action_Base (void); - + virtual int call (void); - + protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &) = 0; - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr) = 0; - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &) = 0; - + virtual void create_unexpected_exception (const std::string &, const std::string &) = 0; - + virtual void create_valid_result (Event_Result &) = 0; - + ::CORBA::Any_var instance_excep_; }; } diff --git a/DAnCE/LocalityManager/Scheduler/Events/Configured.h b/DAnCE/LocalityManager/Scheduler/Events/Configured.h index 126ced680bf..09f4fb50245 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Configured.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Configured.h @@ -1,7 +1,7 @@ /** * @file Configured.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -26,25 +26,25 @@ namespace DAnCE ::CORBA::ULong instanceRef, const char *instance_type, Event_Future holder); - + virtual ~Instance_Configured (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); - + private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong instanceRef_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Events/Connect.h b/DAnCE/LocalityManager/Scheduler/Events/Connect.h index 9be0214f7df..f267f992851 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Connect.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Connect.h @@ -1,7 +1,7 @@ /** * @file Connect.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -27,26 +27,26 @@ namespace DAnCE const ::CORBA::Any &provided_ref, const char *instance_type, Event_Future holder); - + virtual ~Connect_Instance (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong connectionRef_; ::CORBA::Any provided_ref_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Events/Endpoint.h b/DAnCE/LocalityManager/Scheduler/Events/Endpoint.h index 99ed12cd5f8..4f36d90ced9 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Endpoint.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Endpoint.h @@ -1,7 +1,7 @@ /** * @file Endpoint.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -26,26 +26,26 @@ namespace DAnCE ::CORBA::ULong connectionRef, const char *instance_type, Event_Future holder); - + virtual ~Endpoint_Reference (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong connectionRef_; ::CORBA::Any_var ref_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Events/Install.h b/DAnCE/LocalityManager/Scheduler/Events/Install.h index f46ece21ef1..4668ebf07c0 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Install.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Install.h @@ -31,20 +31,20 @@ namespace DAnCE protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); - + private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong instanceRef_; - + ::CORBA::Any_var instance_; }; } diff --git a/DAnCE/LocalityManager/Scheduler/Events/Passivate.h b/DAnCE/LocalityManager/Scheduler/Events/Passivate.h index 4ad3563d7c5..3a1dec91065 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Passivate.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Passivate.h @@ -1,7 +1,7 @@ /** * @file Passivate.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -27,26 +27,26 @@ namespace DAnCE const CORBA::Any &ref, const char *instance_type, Event_Future holder); - + virtual ~Passivate_Instance (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong instanceRef_; const ::CORBA::Any &ref_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Events/Remove.h b/DAnCE/LocalityManager/Scheduler/Events/Remove.h index b0fc368c5e9..0aa8a2ef236 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Remove.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Remove.h @@ -1,7 +1,7 @@ /** * @file Remove.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -27,26 +27,26 @@ namespace DAnCE const CORBA::Any &reference, const char *instance_type, Event_Future holder); - + virtual ~Remove_Instance (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); private: ::Deployment::DeploymentPlan & plan_; ::CORBA::ULong instanceRef_; ::CORBA::Any reference_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Events/Start.h b/DAnCE/LocalityManager/Scheduler/Events/Start.h index 1e420e8dd1c..3d6ecc0e870 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Start.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Start.h @@ -1,7 +1,7 @@ /** * @file Start.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -27,26 +27,26 @@ namespace DAnCE const CORBA::Any &instance_ref, const char *instance_type, Event_Future holder); - + virtual ~Start_Instance (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); - + private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong instanceRef_; const CORBA::Any &ref_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Plugin_Manager.h b/DAnCE/LocalityManager/Scheduler/Plugin_Manager.h index 52a7d3657b1..ad294799373 100644 --- a/DAnCE/LocalityManager/Scheduler/Plugin_Manager.h +++ b/DAnCE/LocalityManager/Scheduler/Plugin_Manager.h @@ -3,8 +3,8 @@ * @author William R. Otte <wotte@dre.vanderbilt.edu * * $Id$ - * - * Singleton class to manage the lifecycle of deployment + * + * Singleton class to manage the lifecycle of deployment * interceptors and plug-ins. */ @@ -33,18 +33,18 @@ namespace DAnCE { public: Plugin_Manager (void); - + ~Plugin_Manager (void); - + void set_orb (CORBA::ORB_ptr orb); - + CORBA::ORB_ptr get_orb (void); /// Set the configuration of the plugin_manager void set_configuration (const Deployment::Properties &config); - + typedef Dependency_Sorter::IH_DEPS IH_DEPS; - + /// Registers a new installation handler. char * register_installation_handler (const ACE_TCHAR *artifact, const ACE_TCHAR *entrypoint, @@ -53,24 +53,24 @@ namespace DAnCE /// Registers a new deployment interceptor void register_interceptor (const ACE_TCHAR *artifact, const ACE_TCHAR *entrypoint); - - + + typedef Dependency_Sorter::Invalid_Install_Order Invalid_Install_Order; typedef Dependency_Sorter::INSTALL_ORDER INSTALL_ORDER; void get_installation_order (INSTALL_ORDER &); - - ::DAnCE::InstanceDeploymentHandler_ptr + + ::DAnCE::InstanceDeploymentHandler_ptr fetch_installation_handler (const char *instance_type); - - typedef std::list < ::DAnCE::DeploymentInterceptor_var > + + typedef std::list < ::DAnCE::DeploymentInterceptor_var > INTERCEPTORS; - + const INTERCEPTORS & fetch_interceptors (void); - + void register_configuration_plugin (const ACE_TCHAR *artifact, const ACE_TCHAR *entrypoint); - + ::DAnCE::LocalityConfiguration_ptr get_configuration_handler (const char *id); @@ -79,21 +79,21 @@ namespace DAnCE typedef std::map < std::string, ::DAnCE::InstanceDeploymentHandler_var > HANDLER_MAP; - + typedef std::map < std::string, LocalityConfiguration_var > CONFIG_MAP; - + HANDLER_MAP handler_map_; - + INTERCEPTORS interceptors_; - + CONFIG_MAP config_plugins_; - + Dependency_Sorter ih_dep_; - + CORBA::ORB_var orb_; }; - + typedef ACE_Singleton <Plugin_Manager, TAO_SYNCH_MUTEX> PLUGIN_MANAGER; } @@ -102,4 +102,4 @@ DEPLOYMENT_SCHEDULER_SINGLETON_DECLARE (ACE_Singleton, DAnCE::Plugin_Manager, TAO_SYNCH_MUTEX) #endif - + |