From: ribes Date: Fri, 20 Apr 2007 11:22:13 +0000 (+0000) Subject: - ParallelDSC exemples ok X-Git-Tag: DSC_20070514~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b4a33291af23c68f70a234a7701ca4b68aded946;p=modules%2Fkernel.git - ParallelDSC exemples ok --- diff --git a/idl/DSC_Engines.idl b/idl/DSC_Engines.idl index e473fc35a..9ace69068 100644 --- 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 a6f71c179..587037c49 100644 --- 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 cfa514a3b..0524de5ea 100644 --- 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 d400ab47c..f08a384c7 100644 --- 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 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 67bb35f75..dd87b6406 100644 --- 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;