- Major update for launcher:

[modules/kernel.git] / src / ResourcesManager / SALOME_ResourcesManager.hxx

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.hxx b/src/ResourcesManager/SALOME_ResourcesManager.hxx
index c8ec2a911fb76204a026af0b0caf12dbfdb63d34..6034fc6c7961ad001f40c4f8d93cf93d9acfc28e 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef __SALOME_RESOURCESMANAGER_HXX__
 #define __SALOME_RESOURCESMANAGER_HXX__
 
@@ -45,6 +46,10 @@
 # define SALOMERESOURCESMANAGER_EXPORT
 #endif
 
+#ifdef WNT
+#pragma warning(disable:4275) // Disable warning interface non dll
+#endif
+
 // --- WARNING ---
 // The call of BuildTempFileToLaunchRemoteContainer and RmTmpFile must be done
 // in a critical section to be sure to be clean.
@@ -63,20 +68,28 @@ class SALOMERESOURCESMANAGER_EXPORT SALOME_ResourcesManager:
 
     ~SALOME_ResourcesManager();
 
-    Engines::MachineList *
-    GetFittingResources(const Engines::MachineParameters& params);
+    // CORBA Methods
+    Engines::ResourceList * GetFittingResources(const Engines::ResourceParameters& params);
+    char* FindFirst(const Engines::ResourceList& listOfResources);
+    char* Find(const char *policy, const Engines::ResourceList& listOfResources);
+    Engines::ResourceDefinition * GetResourceDefinition(const char * name);
+    void AddResource(const Engines::ResourceDefinition& new_resource,
+                    CORBA::Boolean write,
+                    const char * xml_file);
 
-    char* FindFirst(const Engines::MachineList& listOfMachines);
-    char* Find(const char *policy, const Engines::MachineList& listOfMachines);
-
-    Engines::MachineDefinition* GetMachineParameters(const char *hostname);
+    void RemoveResource(const char * resource_name,
+                       CORBA::Boolean write,
+                       const char * xml_file);
 
+    // Cpp Methods
     void Shutdown();
-
-    static const char *_ResourcesManagerNameInNS;
-
     ResourcesManager_cpp *GetImpl() { return &_rm; }
+    std::string getMachineFile(std::string resource_name, 
+                               CORBA::Long nb_procs,
+                               std::string parallelLib);
+
 
+    static const char *_ResourcesManagerNameInNS;
   protected:
     
     SALOME_NamingService *_NS;
@@ -88,7 +101,6 @@ class SALOMERESOURCESMANAGER_EXPORT SALOME_ResourcesManager:
     MapOfParserResourcesType _resourcesBatchList;
 
     ResourcesManager_cpp _rm;
-
   };
 
 #endif // RESSOURCESCATALOG_IMPL_H