From 80ce4efec3ef05e3be6a4a0d41b86b6fef31f21c Mon Sep 17 00:00:00 2001 From: wolff1 Date: Fri, 27 Feb 2009 18:40:51 +0000 Subject: ChangeLogTag: Fri Feb 27 18:39:39 UTC 2009 Friedhelm Wolf --- CIAO/ChangeLog | 20 ++++++++ .../FaultCorrelationManager.mpc | 2 +- .../FaultCorrelationManager_Impl.cpp | 10 +++- .../FaultCorrelationManager_Impl.h | 9 ++-- .../FaultCorrelationManager_Module.cpp | 4 +- .../Interfaces/ExecutionManager_svnt_export.h | 58 ++++++++++++++++++++++ CIAO/DAnCE/Interfaces/FaultCorrelationManager.idl | 4 +- CIAO/DAnCE/Interfaces/Interfaces.mpc | 12 +++-- CIAO/DAnCE/tests/FaultCorrelation/proc_failure.mpc | 2 +- 9 files changed, 105 insertions(+), 16 deletions(-) create mode 100644 CIAO/DAnCE/Interfaces/ExecutionManager_svnt_export.h diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 4ec1f11cff7..91283609cc7 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,23 @@ +Fri Feb 27 18:39:39 UTC 2009 Friedhelm Wolf + + * DAnCE/Interfaces/FaultCorrelationManager.idl + * DAnCE/Interfaces/ExecutionManager_svnt_export.h + * DAnCE/Interfaces/Interfaces.mpc: + + The FaultCorrelationManager now supports + DAnCE::ExecutionManagerDaemon instead of only + Deployment::ExecutionManager so that a plan launcher can work + with it. + + * DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.h + * DAnCE/FaultCorrelationManager/FaultCorrelationManager.mpc + * DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp + * DAnCE/FaultCorrelationManager/FaultCorrelationManager_Module.cpp + * DAnCE/tests/FaultCorrelation/proc_failure.mpc: + + Adjusted these files to reflect the change in the interface + inheritance structure. + Fri Feb 27 18:12:13 UTC 2009 Friedhelm Wolf * DAnCE/Deployment/FaultCorrelationManager.idl diff --git a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager.mpc b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager.mpc index e18f54862de..60802c22879 100644 --- a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager.mpc +++ b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager.mpc @@ -13,7 +13,7 @@ project(FaultCorrelationManager_Module) : dance_lib, dance_deployment_svnt, nami project(FaultCorrelationManager_Exec) : utils, dance_exe, naming_serv { exename = fcm after += FaultCorrelationManager_Module - libs += FaultCorrelationManager + libs += DAnCE_FaultCorrelationManager_svnt FaultCorrelationManager Source_Files { FaultCorrelationManager_Exec.cpp diff --git a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp index eb30cf7ad7b..9f0a0d88772 100644 --- a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp +++ b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.cpp @@ -18,10 +18,10 @@ namespace DAnCE { FaultCorrelationManager_Impl::FaultCorrelationManager_Impl ( CORBA::ORB_ptr orb, - Deployment::ExecutionManager_ptr exec_mgr, + DAnCE::ExecutionManagerDaemon_ptr exec_mgr, const PROPERTY_MAP & options) : orb_ (CORBA::ORB::_duplicate (orb)), - exec_mgr_ (Deployment::ExecutionManager::_duplicate (exec_mgr)), + exec_mgr_ (DAnCE::ExecutionManagerDaemon::_duplicate (exec_mgr)), properties_ (options.current_size ()) { PROPERTY_MAP::const_iterator i = options.begin (); @@ -166,6 +166,12 @@ namespace DAnCE exec_mgr_->destroyManager (manager); } + void + FaultCorrelationManager_Impl::shutdown (void) + { + exec_mgr_->shutdown (); + } + void FaultCorrelationManager_Impl::process_deployment_plan ( const Deployment::DeploymentPlan & plan) diff --git a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.h b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.h index 71042894ddd..cdd3a9dac39 100644 --- a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.h +++ b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Impl.h @@ -19,8 +19,7 @@ #include "FaultCorrelationManager_export.h" #include "Interfaces/FaultCorrelationManagerS.h" #include "Deployment/Deployment_common.h" -#include "Deployment/Deployment_ExecutionManagerC.h" -//#include "Deployment/Deployment_DomainApplicationManagerC.h" +#include "Interfaces/ExecutionManagerDaemonC.h" namespace DAnCE { @@ -34,7 +33,7 @@ namespace DAnCE public: // the fixed listener port is caused by the usage of CCM Object locator FaultCorrelationManager_Impl (CORBA::ORB_ptr orb, - Deployment::ExecutionManager_ptr exec_mgr, + DAnCE::ExecutionManagerDaemon_ptr exec_mgr, const PROPERTY_MAP &options); virtual ~FaultCorrelationManager_Impl(); @@ -58,6 +57,8 @@ namespace DAnCE virtual void destroyManager ( ::Deployment::DomainApplicationManager_ptr manager); + virtual void shutdown (void); + private: void process_deployment_plan (const Deployment::DeploymentPlan & plan); @@ -85,7 +86,7 @@ namespace DAnCE private: CORBA::ORB_var orb_; - Deployment::ExecutionManager_var exec_mgr_; + DAnCE::ExecutionManagerDaemon_var exec_mgr_; PROPERTY_MAP properties_; diff --git a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Module.cpp b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Module.cpp index 469ba53dfcd..8ef95df1fa7 100644 --- a/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Module.cpp +++ b/CIAO/DAnCE/FaultCorrelationManager/FaultCorrelationManager_Module.cpp @@ -314,8 +314,8 @@ FaultCorrelationManager_Module::create_object (CORBA::ORB_ptr orb, CORBA::Object_var obj = orb->string_to_object (this->options_.exec_mgr_ior_); - Deployment::ExecutionManager_var exec_mgr = - Deployment::ExecutionManager::_narrow (obj.in ()); + DAnCE::ExecutionManagerDaemon_var exec_mgr = + DAnCE::ExecutionManagerDaemon::_narrow (obj.in ()); //Creating node manager servant DAnCE::FaultCorrelationManager_Impl * fcm = 0; diff --git a/CIAO/DAnCE/Interfaces/ExecutionManager_svnt_export.h b/CIAO/DAnCE/Interfaces/ExecutionManager_svnt_export.h new file mode 100644 index 00000000000..9fa10cbc103 --- /dev/null +++ b/CIAO/DAnCE/Interfaces/ExecutionManager_svnt_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ExecutionManager_svnt +// ------------------------------ +#ifndef EXECUTIONMANAGER_SVNT_EXPORT_H +#define EXECUTIONMANAGER_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (EXECUTIONMANAGER_SVNT_HAS_DLL) +# define EXECUTIONMANAGER_SVNT_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && EXECUTIONMANAGER_SVNT_HAS_DLL */ + +#if !defined (EXECUTIONMANAGER_SVNT_HAS_DLL) +# define EXECUTIONMANAGER_SVNT_HAS_DLL 1 +#endif /* ! EXECUTIONMANAGER_SVNT_HAS_DLL */ + +#if defined (EXECUTIONMANAGER_SVNT_HAS_DLL) && (EXECUTIONMANAGER_SVNT_HAS_DLL == 1) +# if defined (EXECUTIONMANAGER_SVNT_BUILD_DLL) +# define ExecutionManager_svnt_Export ACE_Proper_Export_Flag +# define EXECUTIONMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define EXECUTIONMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* EXECUTIONMANAGER_SVNT_BUILD_DLL */ +# define ExecutionManager_svnt_Export ACE_Proper_Import_Flag +# define EXECUTIONMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define EXECUTIONMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* EXECUTIONMANAGER_SVNT_BUILD_DLL */ +#else /* EXECUTIONMANAGER_SVNT_HAS_DLL == 1 */ +# define ExecutionManager_svnt_Export +# define EXECUTIONMANAGER_SVNT_SINGLETON_DECLARATION(T) +# define EXECUTIONMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* EXECUTIONMANAGER_SVNT_HAS_DLL == 1 */ + +// Set EXECUTIONMANAGER_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (EXECUTIONMANAGER_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define EXECUTIONMANAGER_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define EXECUTIONMANAGER_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !EXECUTIONMANAGER_SVNT_NTRACE */ + +#if (EXECUTIONMANAGER_SVNT_NTRACE == 1) +# define EXECUTIONMANAGER_SVNT_TRACE(X) +#else /* (EXECUTIONMANAGER_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define EXECUTIONMANAGER_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (EXECUTIONMANAGER_SVNT_NTRACE == 1) */ + +#endif /* EXECUTIONMANAGER_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/CIAO/DAnCE/Interfaces/FaultCorrelationManager.idl b/CIAO/DAnCE/Interfaces/FaultCorrelationManager.idl index 4e911491017..735fd05e573 100644 --- a/CIAO/DAnCE/Interfaces/FaultCorrelationManager.idl +++ b/CIAO/DAnCE/Interfaces/FaultCorrelationManager.idl @@ -4,11 +4,11 @@ #define FAULTCORRELATIONMANAGER_IDL #include "orbsvcs/orbsvcs/LWFT/FaultNotification.idl" -#include "DAnCE/Deployment/Deployment_ExecutionManager.idl" +#include "ExecutionManagerDaemon.idl" module DAnCE { - interface FaultCorrelationManager : FLARE::FaultNotification, Deployment::ExecutionManager { + interface FaultCorrelationManager : FLARE::FaultNotification, DAnCE::ExecutionManagerDaemon { void stop_failver_unit (in string fou_id); }; }; diff --git a/CIAO/DAnCE/Interfaces/Interfaces.mpc b/CIAO/DAnCE/Interfaces/Interfaces.mpc index 9729275226c..5aef3cd303b 100644 --- a/CIAO/DAnCE/Interfaces/Interfaces.mpc +++ b/CIAO/DAnCE/Interfaces/Interfaces.mpc @@ -5,6 +5,9 @@ project (DAnCE_ExecutionManager_idl): ciaoidldefaults, anytypecode { custom_only = 1 idlflags += -Wb,stub_export_macro=ExecutionManager_stub_Export idlflags += -Wb,stub_export_include=ExecutionManager_stub_export.h + idlflags += -Wb,skel_export_macro=ExecutionManager_svnt_Export + idlflags += -Wb,skel_export_include=ExecutionManager_svnt_export.h + IDL_Files { ExecutionManagerDaemon.idl } @@ -75,7 +78,7 @@ project (DAnCE_FaultCorrelationManager_idl): ciaoidldefaults, anytypecode { } project (DAnCE_FaultCorrelationManager_stub): dance_lib, messaging, dance_deployment_stub { - after += DAnCE_FaultCorrelationManager_idl + after += DAnCE_FaultCorrelationManager_idl ExecutionManager_stub sharedname = DAnCE_FaultCorrelationManager_stub libs += LWFT_ReplicationManager @@ -90,16 +93,17 @@ project (DAnCE_FaultCorrelationManager_stub): dance_lib, messaging, dance_deploy } project (DAnCE_FaultCorrelationManager_svnt): dance_lib, messaging, dance_deployment_svnt, ciao_output, ciaolib_with_idl { - after += DAnCE_FaultCorrelationManager_idl + after += DAnCE_FaultCorrelationManager_idl ExecutionManager_idl sharedname = DAnCE_FaultCorrelationManager_svnt - libs += LWFT_ReplicationManager DAnCE_FaultCorrelationManager_stub + libs += LWFT_ReplicationManager DAnCE_FaultCorrelationManager_stub DAnCE_ExecutionManager_stub - dynamicflags = FAULTCORRELATIONMANAGER_SVNT_BUILD_DLL + dynamicflags = FAULTCORRELATIONMANAGER_SVNT_BUILD_DLL EXECUTIONMANAGER_SVNT_BUILD_DLL IDL_Files { } Source_Files { FaultCorrelationManagerS.cpp + ExecutionManagerDaemonS.cpp } } diff --git a/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.mpc b/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.mpc index 55591f048d2..08cfc42dadd 100644 --- a/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.mpc +++ b/CIAO/DAnCE/tests/FaultCorrelation/proc_failure.mpc @@ -1,6 +1,6 @@ // $Id$ project(proc_failure) : dance_deployment_stub { - libs += DAnCE_FaultCorrelationManager_stub + libs += DAnCE_FaultCorrelationManager_stub DAnCE_ExecutionManager_stub Source_Files { proc_failure.cpp -- cgit v1.2.1