X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FSALOME_ContainerManager.hxx;h=e543d20744805bfd4e7e297398c2948c79c3e0d7;hb=e61c3f5e439eae3822cb22176c5493668e5a7df5;hp=7b1f26eab23e6d971d7fb4603b2a22758ac68b00;hpb=7d2fe213bdf5bf962ce11e253020c9d3e0bc1cce;p=modules%2Fkernel.git diff --git a/src/Container/SALOME_ContainerManager.hxx b/src/Container/SALOME_ContainerManager.hxx index 7b1f26eab..e543d2074 100644 --- a/src/Container/SALOME_ContainerManager.hxx +++ b/src/Container/SALOME_ContainerManager.hxx @@ -1,24 +1,25 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// 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. +// 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. +// 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 +// 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + #ifndef __SALOME_CONTAINERMANAGER_HXX__ #define __SALOME_CONTAINERMANAGER_HXX__ @@ -27,112 +28,145 @@ #include #include CORBA_CLIENT_HEADER(SALOME_Component) #include CORBA_CLIENT_HEADER(SALOME_ContainerManager) -#include "SALOME_ResourcesManager.hxx" -#include "SALOME_LoadRateManager.hxx" +#include "SALOME_ResourcesCatalog_Parser.hxx" + +#include "Utils_Mutex.hxx" #include +#include class SALOME_NamingService; +class SALOME_ResourcesManager_Client; -class CONTAINER_EXPORT SALOME_ContainerManager: - public POA_Engines::ContainerManager +class CONTAINER_EXPORT SALOME_ContainerManager : public POA_Engines::ContainerManager { public: - SALOME_ContainerManager(CORBA::ORB_ptr orb, PortableServer::POA_var poa, SALOME_ResourcesManager *rm, SALOME_NamingService *ns); + SALOME_ContainerManager(CORBA::ORB_ptr orb, PortableServer::POA_var poa, SALOME_NamingService *ns); ~SALOME_ContainerManager(); - Engines::Container_ptr - FindOrStartContainer(const Engines::MachineParameters& params, - const Engines::MachineList& possibleComputer); - - Engines::Container_ptr - StartContainer(const Engines::MachineParameters& params, - const Engines::MachineList& possibleComputer, - Engines::ResPolicy policy, - const std::string& container_exe="SALOME_Container"); - - Engines::Container_ptr - StartContainer(const Engines::MachineParameters& params, - Engines::ResPolicy policy, - const Engines::CompoList& componentList); + // Corba Methods + Engines::Container_ptr GiveContainer(const Engines::ContainerParameters& params); - Engines::Container_ptr - GiveContainer(const Engines::MachineParameters& params, - Engines::ResPolicy policy, - const Engines::CompoList& componentList); + void ShutdownContainers(); + // C++ Methods void Shutdown(); - void ShutdownContainers(); static const char *_ContainerManagerNameInNS; - // Parallel extension - Engines::Container_ptr - FindOrStartParallelContainer(const Engines::MachineParameters& params, - const Engines::MachineList& possibleComputer); protected: + // C++ methods Engines::Container_ptr - FindContainer(const Engines::MachineParameters& params, - const Engines::MachineList& possibleComputers); + FindContainer(const Engines::ContainerParameters& params, + const Engines::ResourceList& possibleResources); Engines::Container_ptr - FindContainer(const Engines::MachineParameters& params, - const char *theMachine); + FindContainer(const Engines::ContainerParameters& params, + const std::string& resource); - // Parallel extension - CORBA::Object_ptr - LaunchParallelContainer(const std::string& command, - const Engines::MachineParameters& params, - const std::string& name); + std::string BuildCommandToLaunchRemoteContainer(const std::string & resource_name, + const Engines::ContainerParameters& params, + const std::string& container_exe="SALOME_Container") const; - void fillBatchLaunchedContainers(); + std::string BuildCommandToLaunchLocalContainer(const Engines::ContainerParameters& params, + const std::string& machinesFile, + const std::string& container_exe,//"SALOME_Container" + std::string& tmpFileName) const; - long GetIdForContainer(void); + std::string BuildTempFileToLaunchRemoteContainer(const std::string& resource_name, + const Engines::ContainerParameters& params, std::string& tmpFileName) const; - std::string BuildCommandToLaunchRemoteContainer(const std::string& machine, - const Engines::MachineParameters& params, const long id, - const std::string& container_exe="SALOME_Container"); + static void RmTmpFile(std::string& tmpFile); - std::string BuildCommandToLaunchLocalContainer(const Engines::MachineParameters& params, const long id, - const std::string& container_exe="SALOME_Container"); + void AddOmninamesParams(std::string& command) const; - std::string BuildTempFileToLaunchRemoteContainer(const std::string& machine, - const Engines::MachineParameters& params) throw(SALOME_Exception); + void AddOmninamesParams(std::ostream& fileStream) const; - void RmTmpFile(); + static std::string BuildTemporaryFileName(); - void AddOmninamesParams(std::string& command) const; + std::string GetMPIZeroNode(const std::string machine, const std::string machinesFile) const; + + std::string machinesFile(const int nbproc); - void AddOmninamesParams(std::ofstream& fileStream) const; + std::set getpidofprogram(const std::string program); - std::string BuildTemporaryFileName() const; + static std::string getCommandToRunRemoteProcess(AccessProtocolType protocol, const std::string & hostname, const std::string & username); - // Parallel extension - std::string BuildCommandToLaunchLocalParallelContainer(const std::string& exe_name, - const Engines::MachineParameters& params, - const std::string& log = "default"); - void startMPI(); - bool _MpiStarted; + Engines::Container_ptr + LaunchContainer(const Engines::ContainerParameters& params, + const std::string & resource_selected, + const std::string & hostname, + const std::string & machFile, + const std::string & containerNameInNS); - long _id; CORBA::ORB_var _orb; PortableServer::POA_var _poa; - SALOME_ResourcesManager *_ResManager; + SALOME_ResourcesManager_Client *_resManager; SALOME_NamingService *_NS; - static std::vector _batchLaunchedContainers; - static std::vector::iterator _batchLaunchedContainersIter; - //! attribute that contains current tmp files generated - std::string _TmpFileName; + //! different behaviour if $APPLI exists (SALOME Application) + bool _isAppliSalomeDefined; - //! contains the rsh or ssh command to access directly to machine. - // Only used by this->RmTmpFile in case of a remote launch. - std::string _CommandForRemAccess; + //! attribute that contains the number of processes used in batch mode by MPI containers + int _nbprocUsed; - //! different behaviour if $APPLI exists (SALOME Application) - bool _isAppliSalomeDefined; + static omni_mutex _numInstanceMutex ; // lib and instance protection + + //! attributes to allow concurrency for // GiveContainer + Utils_Mutex _giveContainerMutex1; + + pid_t _pid_mpiServer; + + // Begin of PacO++ Parallel extension + typedef std::vector actual_launch_machine_t; + + bool checkPaCOParameters(Engines::ContainerParameters & params, std::string resource_selected); + + Engines::Container_ptr + StartPaCOPPContainer(const Engines::ContainerParameters& params, std::string resource_selected); + + + std::string BuildCommandToLaunchPaCOProxyContainer(const Engines::ContainerParameters& params, + std::string machine_file_name, + std::string & proxy_hostname); + + std::string BuildCommandToLaunchPaCONodeContainer(const Engines::ContainerParameters& params, + const std::string & machine_file_name, + SALOME_ContainerManager::actual_launch_machine_t & vect_machine, + const std::string & proxy_hostname); + + void LogConfiguration(const std::string & log_type, + const std::string & exe_type, + const std::string & container_name, + const std::string & hostname, + std::string & begin, + std::string & end); + + CORBA::Object_ptr + LaunchPaCOProxyContainer(const std::string& command, + const Engines::ContainerParameters& params, + const std::string& hostname); + + bool + LaunchPaCONodeContainer(const std::string& command, + const Engines::ContainerParameters& params, + const std::string& name, + SALOME_ContainerManager::actual_launch_machine_t & vect_machine); + // End of PaCO++ Parallel extension +public: + static char *GetenvThreadSafe(const char *name); + static std::string GetenvThreadSafeAsString(const char *name); + static int SystemThreadSafe(const char *command); + static void AddOmninamesParams(std::ostream& fileStream, SALOME_NamingService *ns); + static void MakeTheCommandToBeLaunchedASync(std::string& command); + static int GetTimeOutToLoaunchServer(); + static void SleepInSecond(int ellapseTimeInSecond); + private: + static const int TIME_OUT_TO_LAUNCH_CONT; + static Utils_Mutex _getenvMutex; + static Utils_Mutex _systemMutex; }; #endif