- ParallelDSC exemples ok

diff --git a/idl/DSC_Engines.idl b/idl/DSC_Engines.idl
index e473fc35a281b0010393a5d554dbed2df3ff6564..9ace69068b220773a5ccc7e312eee24e6178ad80 100644 (file)
--- a/idl/DSC_Engines.idl
+++ b/idl/DSC_Engines.idl
@@ -383,7 +383,8 @@ module Engines {
       \see Engines_ParallelDSC_i::add_parallel_provides_proxy_port
      */
     void set_paco_proxy(in Object ref, 
-                       in string provides_port_name);
+                       in string provides_port_name,
+                       in Ports::PortProperties port_prop);
 
     /*! 
       The SUPERV module call this method before starting the service. Thus the service 

diff --git a/src/DSC/ParallelDSC/ParallelDSC_i.cxx b/src/DSC/ParallelDSC/ParallelDSC_i.cxx
index a6f71c179a1f2d9739c0a2f256bcde27b4fef7e1..587037c49f1778f266ed4725970777e77616e221 100644 (file)
--- a/src/DSC/ParallelDSC/ParallelDSC_i.cxx
+++ b/src/DSC/ParallelDSC/ParallelDSC_i.cxx
@@ -52,13 +52,14 @@ Engines_ParallelDSC_i::get_proxy(const char* provides_port_name) {
 
 CORBA::Boolean 
 Engines_ParallelDSC_i::add_parallel_provides_proxy_port(const CORBA::Object_ptr ref, 
-                                                       const char * provides_port_name) 
+                                                       const char * provides_port_name,
+                                                       Ports::PortProperties_ptr port_prop) 
 {
   assert(provides_port_name);
   CORBA::Boolean rtn_bool = false;
   CORBA::Object_ptr _comp_proxy = _orb->string_to_object(_ior.c_str());
   Engines::Parallel_DSC_var real_comp_proxy = Engines::Parallel_DSC::_narrow(_comp_proxy);
-  real_comp_proxy->set_paco_proxy(ref, provides_port_name);
+  real_comp_proxy->set_paco_proxy(ref, provides_port_name, port_prop);
   rtn_bool = true;
   return rtn_bool;
 }

diff --git a/src/DSC/ParallelDSC/ParallelDSC_i.hxx b/src/DSC/ParallelDSC/ParallelDSC_i.hxx
index cfa514a3b702cd9c4d95a4e8652ce42c8aacc42c..0524de5eafe710663fbb9a2b254f73573bc0ea14 100644 (file)
--- a/src/DSC/ParallelDSC/ParallelDSC_i.hxx
+++ b/src/DSC/ParallelDSC/ParallelDSC_i.hxx
@@ -49,7 +49,7 @@ public:
   virtual ~Engines_ParallelDSC_i();
 
   
-  virtual CORBA::Boolean init_service(const char* service_name) {return true;};
+  //virtual CORBA::Boolean init_service(const char* service_name) {return true;}
 
   /*!
    * \see Engines::DSC::add_provides_port
@@ -177,7 +177,8 @@ public:
    * \return true if the proxy is correctly added.
    */
   virtual CORBA::Boolean add_parallel_provides_proxy_port(const CORBA::Object_ptr ref, 
-                                                         const char * provides_port_name);
+                                                         const char * provides_port_name,
+                                                         Ports::PortProperties_ptr port_prop);
 
   /*! 
    * This method by the nodes that do not add the proxy to wait is reference.

diff --git a/src/ParallelContainer/SALOME_ParallelContainerNodeDummy.cxx b/src/ParallelContainer/SALOME_ParallelContainerNodeDummy.cxx
index d400ab47cce3c0ff0fd4fa36ba6f11d357c3679d..f08a384c75ae2c44428838d43b49aa169caa5dfe 100644 (file)
--- a/src/ParallelContainer/SALOME_ParallelContainerNodeDummy.cxx
+++ b/src/ParallelContainer/SALOME_ParallelContainerNodeDummy.cxx
@@ -50,7 +50,7 @@
 
 using namespace std;
 
-#ifdef DEBUG_PARALLEL
+#ifdef _DEBUG_
 #include <signal.h>
 
 void handler(int t) {
@@ -67,7 +67,7 @@ int main(int argc, char* argv[])
 {
        INFOS("Launching a parallel container node");
 
-#ifdef DEBUG_PARALLEL
+#ifdef _DEBUG_
        signal(SIGSEGV, handler);
 #endif
 

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 67bb35f752f1d5c419bd5bd15819ca60994a8124..dd87b6406386e62d5ae0427258fd142af8c75e3f 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -941,8 +941,11 @@ SALOME_ResourcesManager::BuildCommandToLaunchLocalParallelContainer(const std::s
   if (parallelLib == "Dummy")
   {
     //command = "gdb --args ";
+    //command = "valgrind --tool=memcheck --log-file=val_log ";
     //command += real_exe_name;
+    
     command = real_exe_name;
+    
     command += " " + _NS->ContainerName(rtn);
     command += " " + parallelLib;
     command += " " + hostname;
@@ -998,6 +1001,8 @@ SALOME_ResourcesManager::BuildCommandToLaunchLocalParallelContainer(const std::s
   {
     command = "/usr/X11R6/bin/xterm -e \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH; export PATH=$PATH;  " 
       + command + " \" &";
+    //command = "/usr/X11R6/bin/xterm -e \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH; export PATH=$PATH;  " 
+    //  + command + "; cat \" &";
   }
   return command;