X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FSALOME_ContainerManager.hxx;h=e543d20744805bfd4e7e297398c2948c79c3e0d7;hb=e61c3f5e439eae3822cb22176c5493668e5a7df5;hp=fc55e7579f9e76140a31508b49a593de0da11a05;hpb=6ba22390ee3d60fabbb7fcfca5a0911feca55717;p=modules%2Fkernel.git

diff --git a/src/Container/SALOME_ContainerManager.hxx b/src/Container/SALOME_ContainerManager.hxx
index fc55e7579..e543d2074 100644
--- a/src/Container/SALOME_ContainerManager.hxx
+++ b/src/Container/SALOME_ContainerManager.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  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
@@ -66,7 +66,7 @@ protected:
                 const std::string& resource);
 
   std::string BuildCommandToLaunchRemoteContainer(const std::string & resource_name,
-                                                  const Engines::ContainerParameters& params, 
+                                                  const Engines::ContainerParameters& params,
                                                   const std::string& container_exe="SALOME_Container") const;
 
   std::string BuildCommandToLaunchLocalContainer(const Engines::ContainerParameters& params,
@@ -81,9 +81,7 @@ protected:
 
   void AddOmninamesParams(std::string& command) const;
 
-  void AddOmninamesParams(std::ostringstream& oss) const;
-
-  void AddOmninamesParams(std::ofstream& fileStream) const;
+  void AddOmninamesParams(std::ostream& fileStream) const;
 
   static std::string BuildTemporaryFileName();
 
@@ -108,7 +106,7 @@ protected:
   SALOME_ResourcesManager_Client *_resManager;
   SALOME_NamingService *_NS;
 
-  //! different behaviour if $APPLI exists (SALOME Application) 
+  //! different behaviour if $APPLI exists (SALOME Application)
   bool _isAppliSalomeDefined;
 
   //! attribute that contains the number of processes used in batch mode by MPI containers
@@ -126,7 +124,7 @@ protected:
 
   bool checkPaCOParameters(Engines::ContainerParameters & params, std::string resource_selected);
 
-  Engines::Container_ptr 
+  Engines::Container_ptr
   StartPaCOPPContainer(const Engines::ContainerParameters& params, std::string resource_selected);
 
 
@@ -137,31 +135,37 @@ protected:
 
   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); 
+                                                    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 & begin,
                         std::string & end);
 
-  CORBA::Object_ptr 
-  LaunchPaCOProxyContainer(const std::string& command, 
+  CORBA::Object_ptr
+  LaunchPaCOProxyContainer(const std::string& command,
                            const Engines::ContainerParameters& params,
                            const std::string& hostname);
 
-  bool 
-  LaunchPaCONodeContainer(const std::string& command, 
+  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);
-private:
+  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;
 };