-// SALOME LifeCycleCORBA : implementation of containers and engines life cycle both in Python and C++
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// SALOME LifeCycleCORBA : implementation of containers and engines life cycle both in Python and C++
// File : SALOME_LifeCycleCORBA.cxx
// Author : Paul RASCLE, EDF
// Module : SALOME
-// $Header$
#include <iostream>
#include <fstream>
#include <iomanip>
#include <time.h>
-#ifndef WNT
+#ifndef WIN32
#include <sys/time.h>
+ #include <unistd.h>
#endif
-#include "OpUtil.hxx"
+#include "Basics_Utils.hxx"
#include "utilities.h"
#include <ServiceUnreachable.hxx>
#include "SALOME_LifeCycleCORBA.hxx"
-#ifndef WNT
+#include "SALOME_ResourcesManager.hxx"
+#include "SALOMESDS_DataServerManager.hxx"
+
#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
-#else
-#include "SALOME_ModuleCatalog.hh"
-#endif
+#include CORBA_CLIENT_HEADER(SALOME_Session)
+#include CORBA_CLIENT_HEADER(DSC_Engines)
+#include CORBA_CLIENT_HEADER(SALOME_Registry)
+#include CORBA_CLIENT_HEADER(SALOMEDS)
+#include CORBA_CLIENT_HEADER(SALOME_SDS)
+#include CORBA_CLIENT_HEADER(Logger)
+#include CORBA_CLIENT_HEADER(SALOME_Launcher)
+
+#include "SALOME_ResourcesManager.hxx"
#include "SALOME_ContainerManager.hxx"
#include "SALOME_Component_i.hxx"
#include "SALOME_NamingService.hxx"
-
-using namespace std;
+#include "SALOME_FileTransferCORBA.hxx"
IncompatibleComponent::IncompatibleComponent( void ):
SALOME_Exception( "IncompatibleComponent" )
}
IncompatibleComponent::IncompatibleComponent(const IncompatibleComponent &ex):
- SALOME_Exception( ex )
+ SALOME_Exception( ex )
{
}
+/*! \class SALOME_LifeCycleCORBA
+ \brief A class to manage life cycle of SALOME components.
+
+*/
+
//=============================================================================
-/*!
+/*!
* Constructor
*/
//=============================================================================
// be sure to have an instance of traceCollector, when used via SWIG
// in a Python module
int argc = 0;
- char *xargv = "";
+ char *xargv = (char*)"";
char **argv = &xargv;
CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
// LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb);
+ _NSnew=0;
if (!ns)
{
_NS = new SALOME_NamingService(orb);
+ _NSnew=_NS;
}
else _NS = ns;
//add try catch
- _NS->Change_Directory("/"); // mpv 250105: current directory may be not root
+ _NS->Change_Directory("/"); // mpv 250105: current directory may be not root
// (in SALOMEDS for an example)
// not enough: set a current directory in naming service is not thread safe
// if naming service instance is shared among several threads...
CORBA::Object_var obj =
_NS->Resolve(SALOME_ContainerManager::_ContainerManagerNameInNS);
- ASSERT( !CORBA::is_nil(obj));
+ if (CORBA::is_nil(obj))
+ throw SALOME_Exception("Error: Cannot resolve ContainerManager in Naming Service");
_ContManager=Engines::ContainerManager::_narrow(obj);
obj = _NS->Resolve(SALOME_ResourcesManager::_ResourcesManagerNameInNS);
- ASSERT( !CORBA::is_nil(obj));
+ if (CORBA::is_nil(obj))
+ throw SALOME_Exception("Error: Cannot resolve ResourceManager in Naming Service");
_ResManager=Engines::ResourcesManager::_narrow(obj);
}
//=============================================================================
-/*!
+/*!
* Destructor
*/
//=============================================================================
SALOME_LifeCycleCORBA::~SALOME_LifeCycleCORBA()
{
+ if(_NSnew)delete _NSnew;
}
//=============================================================================
-/*! Public -
- * Find and aready existing and registered component instance.
- * \param params machine parameters like type or name...
+/*! \brief Find an already existing and registered component instance.
+ *
+ * \param params container parameters like type or name...
* \param componentName the name of component class
* \param studyId default = 0 : multistudy instance
* \return a CORBA reference of the component instance, or _nil if not found
*/
//=============================================================================
-
-Engines::Component_ptr
-SALOME_LifeCycleCORBA::FindComponent(const Engines::MachineParameters& params,
- const char *componentName,
- int studyId)
+Engines::EngineComponent_ptr
+SALOME_LifeCycleCORBA::FindComponent(const Engines::ContainerParameters& params,
+ const char *componentName,
+ int studyId)
{
if (! isKnownComponentClass(componentName))
- return Engines::Component::_nil();
+ return Engines::EngineComponent::_nil();
- Engines::CompoList clist;
- clist.length(1);
- clist[0] = componentName;
- Engines::MachineList_var listOfMachines =
- _ResManager->GetFittingResources(params, clist);
+ Engines::ContainerParameters new_params(params);
+ new_params.resource_params.componentList.length(1);
+ new_params.resource_params.componentList[0] = componentName;
+ new_params.resource_params.can_run_containers = true;
+ Engines::ResourceList_var listOfResources;
+ try
+ {
+ listOfResources = _ResManager->GetFittingResources(new_params.resource_params);
+ }
+ catch( const SALOME::SALOME_Exception& ex )
+ {
+ return Engines::EngineComponent::_nil();
+ }
- Engines::Component_var compo = _FindComponent(params,
- componentName,
- studyId,
- listOfMachines);
+ Engines::EngineComponent_var compo = _FindComponent(new_params,
+ componentName,
+ studyId,
+ listOfResources);
return compo._retn();
}
//=============================================================================
-/*! Public -
- * Load a component instance on a container defined by machine parameters
- * \param params machine parameters like type or name...
+/*! \brief Load a component instance on a container defined by its parameters
+ *
+ * \param params container parameters like type or name...
* \param componentName the name of component class
* \param studyId default = 0 : multistudy instance
* \return a CORBA reference of the component instance, or _nil if problem
*/
//=============================================================================
-Engines::Component_ptr
-SALOME_LifeCycleCORBA::LoadComponent(const Engines::MachineParameters& params,
- const char *componentName,
- int studyId)
+Engines::EngineComponent_ptr
+SALOME_LifeCycleCORBA::LoadComponent(const Engines::ContainerParameters& params,
+ const char *componentName,
+ int studyId)
{
// --- Check if Component Name is known in ModuleCatalog
if (! isKnownComponentClass(componentName))
- return Engines::Component::_nil();
+ return Engines::EngineComponent::_nil();
- Engines::CompoList clist;
- clist.length(1);
- clist[0] = componentName;
- Engines::MachineList_var listOfMachines =
- _ResManager->GetFittingResources(params, clist);
+ Engines::ContainerParameters new_params(params);
+ new_params.resource_params.componentList.length(1);
+ new_params.resource_params.componentList[0] = componentName;
+ new_params.resource_params.can_run_containers = true;
- Engines::Component_var compo = _LoadComponent(params,
- componentName,
- studyId,
- listOfMachines);
+ Engines::ResourceList_var listOfResources;
+ try
+ {
+ listOfResources = _ResManager->GetFittingResources(new_params.resource_params);
+ }
+ catch( const SALOME::SALOME_Exception& ex )
+ {
+ return Engines::EngineComponent::_nil();
+ }
+ new_params.resource_params.resList = listOfResources;
+
+ Engines::EngineComponent_var compo = _LoadComponent(new_params,
+ componentName,
+ studyId);
return compo._retn();
}
//=============================================================================
-/*! Public -
- * Find and aready existing and registered component instance or load a new
- * component instance on a container defined by machine parameters.
- * \param params machine parameters like type or name...
+/*! \brief Find an already existing and registered component instance or load a new
+ * component instance on a container defined by its parameters.
+ *
+ * \param params container parameters like type or name...
* \param componentName the name of component class
* \param studyId default = 0 : multistudy instance
* \return a CORBA reference of the component instance, or _nil if problem
*/
//=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
SALOME_LifeCycleCORBA::
-FindOrLoad_Component(const Engines::MachineParameters& params,
- const char *componentName,
- int studyId)
+FindOrLoad_Component(const Engines::ContainerParameters& params,
+ const char *componentName,
+ int studyId)
{
// --- Check if Component Name is known in ModuleCatalog
if (! isKnownComponentClass(componentName))
- return Engines::Component::_nil();
+ return Engines::EngineComponent::_nil();
- Engines::CompoList clist;
- clist.length(1);
- clist[0] = componentName;
- Engines::MachineList_var listOfMachines =
- _ResManager->GetFittingResources(params,clist);
+ Engines::ContainerParameters new_params(params);
+ new_params.resource_params.componentList.length(1);
+ new_params.resource_params.componentList[0] = componentName;
+ new_params.resource_params.can_run_containers = true;
- Engines::Component_var compo = _FindComponent(params,
- componentName,
- studyId,
- listOfMachines);
+ Engines::ResourceList_var listOfResources;
+ try
+ {
+ listOfResources = _ResManager->GetFittingResources(new_params.resource_params);
+ }
+ catch( const SALOME::SALOME_Exception& ex )
+ {
+ return Engines::EngineComponent::_nil();
+ }
+
+ Engines::EngineComponent_var compo = _FindComponent(new_params,
+ componentName,
+ studyId,
+ listOfResources);
if(CORBA::is_nil(compo))
- compo = _LoadComponent(params,
- componentName,
- studyId,
- listOfMachines);
+ {
+ new_params.resource_params.resList = listOfResources;
+ compo = _LoadComponent(new_params,
+ componentName,
+ studyId);
+ }
return compo._retn();
}
//=============================================================================
-/*! Public -
- * Find and aready existing and registered component instance or load a new
- * component instance on a container defined by name
+/*! \brief Find an already existing and registered component instance or load a new
+ * component instance on a container defined by name
+ *
* \param containerName the name of container, under one of the forms
* - 1 aContainer (local container)
* - 2 machine/aContainer (container on hostname = machine)
*/
//=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
SALOME_LifeCycleCORBA::FindOrLoad_Component(const char *containerName,
- const char *componentName)
+ const char *componentName)
{
- char *valenv=getenv("SALOME_BATCH");
- if(valenv)
- if (strcmp(valenv,"1")==0)
- {
- MESSAGE("SALOME_LifeCycleCORBA::FindOrLoad_Component BATCH " << containerName << " " << componentName ) ;
- _NS->Change_Directory("/Containers");
- CORBA::Object_ptr obj=_NS->Resolve(containerName);
- Engines::Container_var cont=Engines::Container::_narrow(obj);
- bool isLoadable = cont->load_component_Library(componentName);
- if (!isLoadable) return Engines::Component::_nil();
-
- Engines::Component_ptr myInstance =
- cont->create_component_instance(componentName, 0);
- return myInstance;
- }
MESSAGE("SALOME_LifeCycleCORBA::FindOrLoad_Component INTERACTIF " << containerName << " " << componentName ) ;
- //#if 0
- // --- Check if Component Name is known in ModuleCatalog
+ // --- Check if Component Name is known in ModuleCatalog
if (! isKnownComponentClass(componentName))
- return Engines::Component::_nil();
+ return Engines::EngineComponent::_nil();
// --- Check if containerName contains machine name (if yes: rg>0)
-
char *stContainer=strdup(containerName);
- string st2Container(stContainer);
+ std::string st2Container(stContainer);
int rg=st2Container.find("/");
- Engines::MachineParameters_var params=new Engines::MachineParameters;
+ Engines::ContainerParameters params;
preSet(params);
if (rg<0)
- {
- // containerName doesn't contain "/" => Local container
- params->container_name=CORBA::string_dup(stContainer);
- params->hostname=CORBA::string_dup(GetHostname().c_str());
- }
- else
- {
- stContainer[rg]='\0';
- params->container_name=CORBA::string_dup(stContainer+rg+1);
- params->hostname=CORBA::string_dup(stContainer);
- }
- params->isMPI = false;
- SCRUTE(params->container_name);
-// SCRUTE(params->hostname);
-// SCRUTE(params->OS);
-// SCRUTE(params->mem_mb);
-// SCRUTE(params->cpu_clock);
-// SCRUTE(params->nb_proc_per_node);
-// SCRUTE(params->nb_node);
-// SCRUTE(params->isMPI);
+ {
+ // containerName doesn't contain "/" => Local container
+ params.container_name = CORBA::string_dup(stContainer);
+ }
+ else
+ {
+ stContainer[rg]='\0';
+ params.container_name = CORBA::string_dup(stContainer+rg+1);
+ params.resource_params.hostname = CORBA::string_dup(stContainer);
+ }
+ params.isMPI = false;
+ SCRUTE(params.container_name);
free(stContainer);
- return FindOrLoad_Component(params,componentName);
- //#endif
+ return FindOrLoad_Component(params, componentName);
}
//=============================================================================
-/*! Public -
- * Check if the component class is known in module catalog
+/*! \brief Check if the component class is known in module catalog
+ *
* \param componentName the name of component class
* \return true if found, false otherwise
*/
bool SALOME_LifeCycleCORBA::isKnownComponentClass(const char *componentName)
{
-
try
+ {
+ CORBA::Object_var obj = _NS->Resolve("/Kernel/ModulCatalog");
+ SALOME_ModuleCatalog::ModuleCatalog_var Catalog =
+ SALOME_ModuleCatalog::ModuleCatalog::_narrow(obj) ;
+ ASSERT(! CORBA::is_nil(Catalog));
+ SALOME_ModuleCatalog::Acomponent_var compoInfo =
+ Catalog->GetComponent(componentName);
+ if (CORBA::is_nil (compoInfo))
{
- CORBA::Object_var obj = _NS->Resolve("/Kernel/ModulCatalog");
- SALOME_ModuleCatalog::ModuleCatalog_var Catalog =
- SALOME_ModuleCatalog::ModuleCatalog::_narrow(obj) ;
- ASSERT(! CORBA::is_nil(Catalog));
- SALOME_ModuleCatalog::Acomponent_var compoInfo =
- Catalog->GetComponent(componentName);
- if (CORBA::is_nil (compoInfo))
- {
- INFOS("Catalog Error: Component not found in the catalog" );
- INFOS( componentName );
- return false;
- }
- else return true;
+ MESSAGE("Catalog Error: Component not found in the catalog " << componentName);
+ return false;
}
+ else return true;
+ }
catch (ServiceUnreachable&)
- {
- INFOS("Caught exception: Naming Service Unreachable");
- }
+ {
+ INFOS("Caught exception: Naming Service Unreachable");
+ }
catch (...)
- {
- INFOS("Caught unknown exception.");
- }
+ {
+ INFOS("Caught unknown exception.");
+ }
return false;
}
//=============================================================================
-/*! Public -
- * Not so complex... useful ?
+/*! \brief Initialisation of a given Engines::ResourceParameters with default values.
*/
//=============================================================================
-bool
-SALOME_LifeCycleCORBA::isMpiContainer(const Engines::MachineParameters& params)
- throw(IncompatibleComponent)
+void
+SALOME_LifeCycleCORBA::preSet(Engines::ResourceParameters& params)
{
- if( params.isMPI )
- return true;
- else
- return false;
+ params.name = "";
+ params.hostname = "";
+ params.OS = "";
+ params.nb_proc = 0;
+ params.mem_mb = 0;
+ params.cpu_clock = 0;
+ params.nb_node = 0;
+ params.nb_proc_per_node = 0;
+ params.policy = "";
+ params.can_launch_batch_jobs = false;
+ params.can_run_containers = false;
}
-
//=============================================================================
-/*! Public -
- * Pre initialisation of a given Engines::MachineParameters with default
- * values.
- * - container_name = "" : not relevant
- * - hostname = "" : not relevant
- * - OS = "" : not relevant
- * - mem_mb = 0 : not relevant
- * - cpu_clock = 0 : not relevant
- * - nb_proc_per_node = 0 : not relevant
- * - nb_node = 0 : not relevant
- * - isMPI = false : standard components
+/*! \brief Initialisation of a given Engines::ContainerParameters with default values.
*/
//=============================================================================
-void SALOME_LifeCycleCORBA::preSet( Engines::MachineParameters& params)
+void SALOME_LifeCycleCORBA::preSet( Engines::ContainerParameters& params)
{
params.container_name = "";
- params.hostname = "";
- params.OS = "";
- params.mem_mb = 0;
- params.cpu_clock = 0;
- params.nb_proc_per_node = 0;
- params.nb_node = 0;
+ params.mode = "";
+ params.workingdir = "";
+ params.nb_proc = 0;
params.isMPI = false;
-
params.parallelLib = "";
- params.nb_component_nodes = 0;
+ SALOME_LifeCycleCORBA::preSet(params.resource_params);
}
//=============================================================================
-/*! Public -
+/*!
* \return a number of processors not 0, only for MPI containers
*/
//=============================================================================
-int SALOME_LifeCycleCORBA::NbProc(const Engines::MachineParameters& params)
+int SALOME_LifeCycleCORBA::NbProc(const Engines::ContainerParameters& params)
{
- if( !isMpiContainer(params) )
+ if( !params.isMPI )
return 0;
- else if( (params.nb_node <= 0) && (params.nb_proc_per_node <= 0) )
+ else if( params.nb_proc <= 0 )
return 1;
- else if( params.nb_node == 0 )
- return params.nb_proc_per_node;
- else if( params.nb_proc_per_node == 0 )
- return params.nb_node;
else
- return params.nb_node * params.nb_proc_per_node;
+ return params.nb_proc;
}
//=============================================================================
-/*! Public -
+/*! \brief Get the container manager
+ *
* \return the container Manager
*/
//=============================================================================
}
//=============================================================================
-/*! Public -
+/*! \brief Get the resources manager
+ *
* \return the container Manager
*/
//=============================================================================
return resManager._retn();
}
+//=============================================================================
+/*! \brief shutdown all the SALOME servers except SALOME_Session_Server and omniNames
+ */
+//=============================================================================
+
+void SALOME_LifeCycleCORBA::shutdownServers()
+{
+ // get each Container from NamingService => shutdown it
+ // (the order is inverse to the order of servers initialization)
+
+ SALOME::Session_var session = SALOME::Session::_nil();
+ CORBA::Long pid = 0;
+ CORBA::Object_var objS = _NS->Resolve("/Kernel/Session");
+ if (!CORBA::is_nil(objS))
+ {
+ session = SALOME::Session::_narrow(objS);
+ if (!CORBA::is_nil(session))
+ {
+ pid = session->getPID();
+ session->Shutdown();
+ }
+ }
+
+ std::string hostname = Kernel_Utils::GetHostname();
+
+ // 1) ConnectionManager
+ try
+ {
+ CORBA::Object_var objCnM=_NS->Resolve("/ConnectionManager");
+ Engines::ConnectionManager_var connMan=Engines::ConnectionManager::_narrow(objCnM);
+ if ( !CORBA::is_nil(connMan) && ( pid != connMan->getPID() ) )
+ connMan->ShutdownWithExit();
+ }
+ catch(const CORBA::Exception& e)
+ {
+ // ignore and continue
+ }
+
+ timespec ts_req;
+ ts_req.tv_nsec=100000000;
+ ts_req.tv_sec=0;
+
+//Wait some time so that ConnectionManager be completely shutdown
+#ifndef WIN32
+ nanosleep(&ts_req,0);
+#endif
+
+ // 2) SALOMEDS
+ try
+ {
+ CORBA::Object_var objSDS = _NS->Resolve("/myStudyManager");
+ SALOMEDS::StudyManager_var studyManager = SALOMEDS::StudyManager::_narrow(objSDS) ;
+ if ( !CORBA::is_nil(studyManager) && ( pid != studyManager->getPID() ) )
+ studyManager->Shutdown();
+ }
+ catch(const CORBA::Exception& e)
+ {
+ // ignore and continue
+ }
+
+//Wait some time so that study be completely shutdown
+#ifndef WIN32
+ nanosleep(&ts_req,0);
+#endif
+
+ // 3) ModuleCatalog
+ try
+ {
+ CORBA::Object_var objMC=_NS->Resolve("/Kernel/ModulCatalog");
+ SALOME_ModuleCatalog::ModuleCatalog_var catalog = SALOME_ModuleCatalog::ModuleCatalog::_narrow(objMC);
+ if ( !CORBA::is_nil(catalog) && ( pid != catalog->getPID() ) )
+ catalog->shutdown();
+ }
+ catch(const CORBA::Exception& e)
+ {
+ // ignore and continue
+ }
+
+//Wait some time so that ModulCatalog be completely shutdown
+#ifndef WIN32
+ nanosleep(&ts_req,0);
+#endif
+ // 4 ) Remote ScopeServer (the DataServer is hosted by SalomeLauncher shutdown right after)
+ try
+ {
+ CORBA::Object_var objDSM(_NS->Resolve(SALOMESDS::DataServerManager::NAME_IN_NS));
+ SALOME::DataServerManager_var dsm(SALOME::DataServerManager::_narrow(objDSM));
+ if ( !CORBA::is_nil(dsm) )
+ dsm->shutdownScopes();
+ }
+ catch(const CORBA::Exception& e)
+ {
+ // ignore and continue
+ }
+
+ // 5) SalomeLauncher
+ try
+ {
+ CORBA::Object_var objSL = _NS->Resolve("/SalomeLauncher");
+ Engines::SalomeLauncher_var launcher = Engines::SalomeLauncher::_narrow(objSL);
+ if (!CORBA::is_nil(launcher) && (pid != launcher->getPID()))
+ launcher->Shutdown();
+ }
+ catch(const CORBA::Exception& e)
+ {
+ // ignore and continue
+ }
+
+//Wait some time so that launcher be completely shutdown
+#ifndef WIN32
+ nanosleep(&ts_req,0);
+#endif
+
+ // 6) Registry
+ try
+ {
+ CORBA::Object_var objR = _NS->Resolve("/Registry");
+ Registry::Components_var registry = Registry::Components::_narrow(objR);
+ if ( !CORBA::is_nil(registry) && ( pid != registry->getPID() ) )
+ registry->Shutdown();
+ }
+ catch(const CORBA::Exception& e)
+ {
+ // ignore and continue
+ }
+
+ // 7) Logger
+ int argc = 0;
+ char *xargv = (char*)"";
+ char **argv = &xargv;
+ CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+
+ CORBA::Object_var objLog = CORBA::Object::_nil();
+ CosNaming::NamingContext_var inc;
+ CORBA::Object_var theObj = CORBA::Object::_nil();
+ std::string stdname = "Logger";
+ CosNaming::Name name;
+ name.length(1);
+ name[0].id = CORBA::string_dup(stdname.c_str());
+ try
+ {
+ if(!CORBA::is_nil(orb))
+ theObj = orb->resolve_initial_references("NameService");
+ if (!CORBA::is_nil(theObj))
+ inc = CosNaming::NamingContext::_narrow(theObj);
+ }
+ catch(...)
+ {
+ }
+ if(!CORBA::is_nil(inc))
+ {
+ try
+ {
+ objLog = inc->resolve(name);
+ SALOME_Logger::Logger_var logger = SALOME_Logger::Logger::_narrow(objLog);
+ if ( !CORBA::is_nil(logger) )
+ logger->shutdown();
+ }
+ catch(...)
+ {
+ }
+ }
+}
+
+//=============================================================================
+/*! \brief shutdown omniNames
+ */
+//=============================================================================
+
+void SALOME_LifeCycleCORBA::killOmniNames()
+{
+ std::string portNumber (::getenv ("NSPORT") );
+ if ( !portNumber.empty() )
+ {
+#ifdef WIN32
+#else
+ std::string cmd ;
+ cmd = std::string( "ps -eo pid,command | grep -v grep | grep -E \"omniNames.*")
+ + portNumber
+ + std::string("\" | awk '{cmd=sprintf(\"kill -9 %s\",$1); system(cmd)}'" );
+ MESSAGE(cmd);
+ try {
+ system ( cmd.c_str() );
+ }
+ catch ( ... ) {
+ }
+#endif
+ }
+
+ std::string python_exe;
+
+ python_exe = std::string("python");
+#ifdef WIN32
+ #ifdef _DEBUG_
+ python_exe += std::string("_d");
+ #endif
+#endif
+
+ if ( !portNumber.empty() )
+ {
+ std::string cmd = ("from killSalomeWithPort import cleanApplication; ");
+ cmd += std::string("cleanApplication(") + portNumber + "); ";
+ //cmd = python_exe + std::string(" -c \"") + cmd +"\" > /dev/null 2> /dev/null";
+ cmd = python_exe + std::string(" -c \"") + cmd +"\"";
+ MESSAGE(cmd);
+ system( cmd.c_str() );
+ }
+
+#ifdef WITH_PORTMANAGER
+ // shutdown portmanager
+ if ( !portNumber.empty() )
+ {
+ std::string cmd = ("from PortManager import releasePort; ");
+ cmd += std::string("releasePort(") + portNumber + "); ";
+ //cmd = python_exe + std::string(" -c \"") + cmd +"\" > /dev/null 2> /dev/null";
+ cmd = python_exe + std::string(" -c \"") + cmd +"\"";
+ MESSAGE(cmd);
+ system( cmd.c_str() );
+ }
+#endif
+}
//=============================================================================
-/*! Protected -
- * Find and aready existing and registered component instance.
+/*! \brief Find an already existing and registered component instance.
+ *
+ * - build a list of machines on which an instance of the component is running,
+ * - find the best machine among the list
+ *
* \param params machine parameters like type or name...
* \param componentName the name of component class
* \param studyId default = 0 : multistudy instance
* \param listOfMachines list of machine address
* \return a CORBA reference of the component instance, or _nil if not found
- * - build a list of machines on which an instance of the component is running,
- * - find the best machine among the list
*/
//=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
SALOME_LifeCycleCORBA::
-_FindComponent(const Engines::MachineParameters& params,
- const char *componentName,
- int studyId,
- const Engines::MachineList& listOfMachines)
+_FindComponent(const Engines::ContainerParameters& params,
+ const char *componentName,
+ int studyId,
+ const Engines::ResourceList& listOfResources)
{
// --- build the list of machines on which the component is already running
-
const char *containerName = params.container_name;
int nbproc = NbProc(params);
-// MESSAGE("_FindComponent, required " << containerName <<
-// " " << componentName << " " << nbproc);
- Engines::MachineList_var machinesOK = new Engines::MachineList;
+ Engines::ResourceList_var resourcesOK = new Engines::ResourceList;
- unsigned int lghtOfmachinesOK = 0;
- machinesOK->length(listOfMachines.length());
+ unsigned int lghtOfresourcesOK = 0;
+ resourcesOK->length(listOfResources.length());
- for(unsigned int i=0; i<listOfMachines.length(); i++)
- {
- const char *currentMachine=listOfMachines[i];
-// MESSAGE("_FindComponent, look at " << currentMachine);
- CORBA::Object_var obj = _NS->ResolveComponent(currentMachine,
- containerName,
- componentName,
- nbproc);
- if (!CORBA::is_nil(obj))
- machinesOK[lghtOfmachinesOK++] = CORBA::string_dup(currentMachine);
- }
+ for(unsigned int i=0; i < listOfResources.length(); i++)
+ {
+ const char * currentResource = listOfResources[i];
+ Engines::ResourceDefinition_var resource_definition =
+ _ResManager->GetResourceDefinition(currentResource);
+ CORBA::Object_var obj = _NS->ResolveComponent(resource_definition->hostname.in(),
+ containerName,
+ componentName,
+ nbproc);
+ if (!CORBA::is_nil(obj))
+ resourcesOK[lghtOfresourcesOK++] = CORBA::string_dup(currentResource);
+ }
// --- find the best machine among the list
-
- if(lghtOfmachinesOK != 0)
- {
- machinesOK->length(lghtOfmachinesOK);
- CORBA::String_var bestMachine = _ResManager->FindFirst(machinesOK);
- CORBA::Object_var obj = _NS->ResolveComponent(bestMachine,
- containerName,
- componentName,
- nbproc);
- return Engines::Component::_narrow(obj);
- }
+ if(lghtOfresourcesOK != 0)
+ {
+ resourcesOK->length(lghtOfresourcesOK);
+ CORBA::String_var bestResource = _ResManager->FindFirst(resourcesOK);
+ Engines::ResourceDefinition_var resource_definition =
+ _ResManager->GetResourceDefinition(bestResource);
+ CORBA::Object_var obj = _NS->ResolveComponent(resource_definition->hostname.in(),
+ containerName,
+ componentName,
+ nbproc);
+ return Engines::EngineComponent::_narrow(obj);
+ }
else
- return Engines::Component::_nil();
+ return Engines::EngineComponent::_nil();
}
//=============================================================================
-/*! Protected -
- * Load a component instance.
+/*! \brief Load a component instance.
+ *
+ * - Finds a container in the list of machine or start one.
+ * - Try to load the component library in the container,
+ * - then create an instance of the component.
+ *
* \param params machine parameters like type or name...
* \param componentName the name of component class
* \param studyId default = 0 : multistudy instance
- * \param listOfMachines list of machine address
* \return a CORBA reference of the component instance, or _nil if problem
- * - Finds a container in the list of machine or start one.
- * - Try to load the component library in the container,
- * - then create an instance of the component.
*/
//=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
SALOME_LifeCycleCORBA::
-_LoadComponent(const Engines::MachineParameters& params,
- const char *componentName,
- int studyId,
- const Engines::MachineList& listOfMachines)
+_LoadComponent(const Engines::ContainerParameters& params,
+ const char *componentName,
+ int studyId)
{
MESSAGE("_LoadComponent, required " << params.container_name <<
- " " << componentName << " " << NbProc(params));
+ " " << componentName << " " << NbProc(params));
- Engines::Container_var cont =
- _ContManager->FindOrStartContainer(params,
- listOfMachines);
- if (CORBA::is_nil(cont)) return Engines::Component::_nil();
+ Engines::ContainerParameters local_params(params);
+ local_params.mode = CORBA::string_dup("findorstart");
+ Engines::Container_var cont = _ContManager->GiveContainer(local_params);
+ if (CORBA::is_nil(cont)) return Engines::EngineComponent::_nil();
- bool isLoadable = cont->load_component_Library(componentName);
- if (!isLoadable) return Engines::Component::_nil();
+ char* reason;
+ bool isLoadable = cont->load_component_Library(componentName,reason);
+ if (!isLoadable)
+ {
+ //std::cerr << reason << std::endl;
+ CORBA::string_free(reason);
+ return Engines::EngineComponent::_nil();
+ }
+ CORBA::string_free(reason);
- Engines::Component_var myInstance =
+ Engines::EngineComponent_var myInstance =
cont->create_component_instance(componentName, studyId);
return myInstance._retn();
}
-Engines::Component_ptr
-SALOME_LifeCycleCORBA::Load_ParallelComponent(const Engines::MachineParameters& params,
+//=============================================================================
+/*! \brief Load a parallel component instance.
+ *
+ * \param params machine parameters like type or name...
+ * \param componentName the name of component class
+ * \param studyId default = 0 : multistudy instance
+ * \return a CORBA reference of the parallel component instance, or _nil if problem
+ */
+//=============================================================================
+Engines::EngineComponent_ptr
+SALOME_LifeCycleCORBA::Load_ParallelComponent(const Engines::ContainerParameters& params,
const char *componentName,
int studyId)
{
MESSAGE("Number of component nodes : " << params.nb_component_nodes);
MESSAGE("Component Name : " << componentName);*/
- Engines::CompoList clist;
- clist.length(1);
- clist[0] = componentName;
- MESSAGE("Building a list of machines");
- Engines::MachineList_var listOfMachines = _ResManager->GetFittingResources(params, clist);
- if (listOfMachines->length() == 0)
- {
- INFOS("No matching machines founded !");
- return Engines::Component::_nil();
- }
+ Engines::ContainerParameters parms(params);
+ parms.resource_params.componentList.length(1);
+ parms.resource_params.componentList[0] = componentName;
+ parms.mode = CORBA::string_dup("findorstart");
MESSAGE("Starting Parallel Container");
- Engines::Container_var cont = _ContManager->FindOrStartParallelContainer(params, listOfMachines);
+ Engines::Container_var cont = _ContManager->GiveContainer(parms);
if (CORBA::is_nil(cont)) {
INFOS("FindOrStartParallelContainer() returns a NULL container !");
- return Engines::Component::_nil();
+ return Engines::EngineComponent::_nil();
}
MESSAGE("Loading component library");
- bool isLoadable = cont->load_component_Library(componentName);
+ char* reason;
+ bool isLoadable = cont->load_component_Library(componentName,reason);
if (!isLoadable) {
INFOS(componentName <<" library is not loadable !");
- return Engines::Component::_nil();
+ //std::cerr << reason << std::endl;
+ CORBA::string_free(reason);
+ return Engines::EngineComponent::_nil();
}
+ CORBA::string_free(reason);
MESSAGE("Creating component instance");
// @PARALLEL@ permits to identify that the component requested
// is a parallel component.
- string name = string(componentName) + string("@PARALLEL@");
- Engines::Component_var myInstance = cont->create_component_instance(name.c_str(), studyId);
+ std::string name = std::string(componentName);
+ Engines::EngineComponent_var myInstance = cont->create_component_instance(name.c_str(), studyId);
if (CORBA::is_nil(myInstance))
INFOS("create_component_instance returns a NULL component !");
return myInstance._retn();
}
+/*! \brief copy a file from a source host to a destination host
+ * \param hostSrc the source host
+ * \param fileSrc the file to copy from the source host to the destination host
+ * \param hostDest the destination host
+ * \param fileDest the destination file
+ */
+void SALOME_LifeCycleCORBA::copyFile(const char* hostSrc, const char* fileSrc, const char* hostDest, const char* fileDest)
+{
+ if(strcmp(hostDest,"localhost") == 0)
+ {
+ //if localhost use a shortcut
+ SALOME_FileTransferCORBA transfer(hostSrc,fileSrc);
+ transfer.getLocalFile(fileDest);
+ return;
+ }
+
+ Engines::ContainerManager_var contManager = getContainerManager();
+
+ Engines::ContainerParameters params;
+ preSet(params);
+
+ params.resource_params.hostname = hostDest;
+ params.mode = CORBA::string_dup("findorstart");
+ Engines::Container_var containerDest = contManager->GiveContainer(params);
+
+ params.resource_params.hostname = hostSrc;
+ Engines::Container_var containerSrc = contManager->GiveContainer(params);
+
+ containerDest->copyFile(containerSrc,fileSrc,fileDest);
+}
+
+/*! \brief get the naming service used by the life cycle
+ *
+ * \return the naming service
+ */
+SALOME_NamingService * SALOME_LifeCycleCORBA::namingService()
+{
+ return _NS;
+}
+
+/*! \brief get the orb used by the life cycle
+ *
+ * \return the orb
+ */
+CORBA::ORB_ptr SALOME_LifeCycleCORBA::orb()
+{
+ return _NS->orb();
+}