From 942c46f9c51cb1203e37b1f3548f45a8e1e986ef Mon Sep 17 00:00:00 2001 From: ribes Date: Thu, 5 Mar 2009 14:43:24 +0000 Subject: [PATCH] - Changing names for YACSGEN --- src/DSC/ParallelDSC/Makefile.am | 10 +++--- ...s.cxx => Param_Double_Port_provides_i.cxx} | 24 +++++++------- ...s.hxx => Param_Double_Port_provides_i.hxx} | 8 ++--- ..._uses.cxx => Param_Double_Port_uses_i.cxx} | 32 +++++++++---------- ..._uses.hxx => Param_Double_Port_uses_i.hxx} | 6 ++-- 5 files changed, 41 insertions(+), 39 deletions(-) rename src/DSC/ParallelDSC/{param_double_port_provides.cxx => Param_Double_Port_provides_i.cxx} (93%) rename src/DSC/ParallelDSC/{param_double_port_provides.hxx => Param_Double_Port_provides_i.hxx} (92%) rename src/DSC/ParallelDSC/{param_double_port_uses.cxx => Param_Double_Port_uses_i.cxx} (75%) rename src/DSC/ParallelDSC/{param_double_port_uses.hxx => Param_Double_Port_uses_i.hxx} (93%) diff --git a/src/DSC/ParallelDSC/Makefile.am b/src/DSC/ParallelDSC/Makefile.am index 3fd8deefe..64346973e 100644 --- a/src/DSC/ParallelDSC/Makefile.am +++ b/src/DSC/ParallelDSC/Makefile.am @@ -31,8 +31,9 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am # =============================================================== # # header files -salomeinclude_HEADERS = ParallelDSC_i.hxx param_double_port_provides.hxx \ - param_double_port_uses.hxx +salomeinclude_HEADERS = ParallelDSC_i.hxx \ + Param_Double_Port_provides_i.hxx \ + Param_Double_Port_uses_i.hxx # # =============================================================== @@ -66,8 +67,9 @@ COMMON_LIBS = # lib_LTLIBRARIES = libSalomeParallelDSCContainer.la -libSalomeParallelDSCContainer_la_SOURCES = ParallelDSC_i.cxx param_double_port_provides.cxx \ - param_double_port_uses.cxx +libSalomeParallelDSCContainer_la_SOURCES = ParallelDSC_i.cxx \ + Param_Double_Port_provides_i.cxx \ + Param_Double_Port_uses_i.cxx libSalomeParallelDSCContainer_la_CXXFLAGS = $(COMMON_CPPFLAGS) diff --git a/src/DSC/ParallelDSC/param_double_port_provides.cxx b/src/DSC/ParallelDSC/Param_Double_Port_provides_i.cxx similarity index 93% rename from src/DSC/ParallelDSC/param_double_port_provides.cxx rename to src/DSC/ParallelDSC/Param_Double_Port_provides_i.cxx index dbad2ae41..2ea3c6637 100644 --- a/src/DSC/ParallelDSC/param_double_port_provides.cxx +++ b/src/DSC/ParallelDSC/Param_Double_Port_provides_i.cxx @@ -23,7 +23,7 @@ #include #include -#include "param_double_port_provides.hxx" +#include "Param_Double_Port_provides_i.hxx" #include #include @@ -32,7 +32,7 @@ #include #include -param_double_port_provides_i::param_double_port_provides_i(CORBA::ORB_ptr orb, char * ior, int rank) : +Param_Double_Port_provides_i::Param_Double_Port_provides_i(CORBA::ORB_ptr orb, char * ior, int rank) : Ports::Param_Double_Port_serv(orb,ior,rank), Ports::Param_Double_Port_base_serv(orb,ior,rank), Ports::Data_Port_serv(orb,ior,rank), @@ -68,7 +68,7 @@ param_double_port_provides_i::param_double_port_provides_i(CORBA::ORB_ptr orb, c pthread_cond_init(seq_results_condition_cp, NULL); } -param_double_port_provides_i::~param_double_port_provides_i() +Param_Double_Port_provides_i::~Param_Double_Port_provides_i() { if (_seq_data) delete _seq_data; @@ -95,8 +95,8 @@ param_double_port_provides_i::~param_double_port_provides_i() delete seq_results_condition_cp; } -param_double_port_provides_i * -param_double_port_provides_i::init_port(Engines_ParallelDSC_i * par_compo, +Param_Double_Port_provides_i * +Param_Double_Port_provides_i::init_port(Engines_ParallelDSC_i * par_compo, std::string port_name, CORBA::ORB_ptr orb) { @@ -112,7 +112,7 @@ param_double_port_provides_i::init_port(Engines_ParallelDSC_i * par_compo, pfm->register_distribution("pdp_GaBro", new GaBro_fab()); pfm->register_distribution("pdp_BasicBC", new BasicBC_fab()); - param_double_port_provides_i * port = NULL; + Param_Double_Port_provides_i * port = NULL; Ports::Param_Double_Port_proxy_impl * proxy_node = NULL; std::cerr << "Creating Proxy" << std::endl; @@ -147,7 +147,7 @@ param_double_port_provides_i::init_port(Engines_ParallelDSC_i * par_compo, char * proxy_ior = (char * ) par_compo->get_proxy(port_name.c_str()); std::cerr << "Proxy ior is : " << proxy_ior << std::endl; - port = new param_double_port_provides_i(CORBA::ORB::_duplicate(orb), proxy_ior, rank); + port = new Param_Double_Port_provides_i(CORBA::ORB::_duplicate(orb), proxy_ior, rank); port->copyGlobalContext(par_compo); // Il faut maintenant configurer les bibliothèques @@ -188,7 +188,7 @@ param_double_port_provides_i::init_port(Engines_ParallelDSC_i * par_compo, } void -param_double_port_provides_i::put(const Ports::Param_Double_Port::seq_double & param_data) +Param_Double_Port_provides_i::put(const Ports::Param_Double_Port::seq_double & param_data) { // On attend que le get soit fait @@ -214,7 +214,7 @@ param_double_port_provides_i::put(const Ports::Param_Double_Port::seq_double & p } void -param_double_port_provides_i::get_results(Ports::Param_Double_Port::seq_double_out param_results) +Param_Double_Port_provides_i::get_results(Ports::Param_Double_Port::seq_double_out param_results) { pthread_mutex_lock(seq_results_mutex); while (seq_results_termine == false) @@ -240,7 +240,7 @@ param_double_port_provides_i::get_results(Ports::Param_Double_Port::seq_double_o } Ports::Param_Double_Port::seq_double * -param_double_port_provides_i::get_data() +Param_Double_Port_provides_i::get_data() { Ports::Param_Double_Port::seq_double * result = NULL; @@ -269,7 +269,7 @@ param_double_port_provides_i::get_data() } void -param_double_port_provides_i::set_data(Ports::Param_Double_Port::seq_double * results) +Param_Double_Port_provides_i::set_data(Ports::Param_Double_Port::seq_double * results) { // On attend que le get soit fait // Au départ seq_results_termine_cp = TRUE @@ -293,7 +293,7 @@ param_double_port_provides_i::set_data(Ports::Param_Double_Port::seq_double * re } void -param_double_port_provides_i::configure_set_data(int data_length, int totalNbElt, int BeginEltPos) +Param_Double_Port_provides_i::configure_set_data(int data_length, int totalNbElt, int BeginEltPos) { // Configuration de la biblothèque de redistribution // pour les données actuelles diff --git a/src/DSC/ParallelDSC/param_double_port_provides.hxx b/src/DSC/ParallelDSC/Param_Double_Port_provides_i.hxx similarity index 92% rename from src/DSC/ParallelDSC/param_double_port_provides.hxx rename to src/DSC/ParallelDSC/Param_Double_Port_provides_i.hxx index 4d0552de3..8d638e296 100644 --- a/src/DSC/ParallelDSC/param_double_port_provides.hxx +++ b/src/DSC/ParallelDSC/Param_Double_Port_provides_i.hxx @@ -28,12 +28,12 @@ #include "ParallelDSC_i.hxx" #include "PortProperties_i.hxx" -class param_double_port_provides_i : +class Param_Double_Port_provides_i : public virtual Ports::Param_Double_Port_serv { public : - param_double_port_provides_i(CORBA::ORB_ptr orb, char * ior, int rank); - virtual ~param_double_port_provides_i(); + Param_Double_Port_provides_i(CORBA::ORB_ptr orb, char * ior, int rank); + virtual ~Param_Double_Port_provides_i(); void put(const Ports::Param_Double_Port::seq_double & param_data); void get_results(Ports::Param_Double_Port::seq_double_out param_results); @@ -46,7 +46,7 @@ class param_double_port_provides_i : int BeginEltPos); // Aide à la création du port - static param_double_port_provides_i * init_port(Engines_ParallelDSC_i * par_compo, + static Param_Double_Port_provides_i * init_port(Engines_ParallelDSC_i * par_compo, std::string port_name, CORBA::ORB_ptr orb); diff --git a/src/DSC/ParallelDSC/param_double_port_uses.cxx b/src/DSC/ParallelDSC/Param_Double_Port_uses_i.cxx similarity index 75% rename from src/DSC/ParallelDSC/param_double_port_uses.cxx rename to src/DSC/ParallelDSC/Param_Double_Port_uses_i.cxx index fa203a6be..e4f2b72f1 100644 --- a/src/DSC/ParallelDSC/param_double_port_uses.cxx +++ b/src/DSC/ParallelDSC/Param_Double_Port_uses_i.cxx @@ -14,15 +14,15 @@ // 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 : webparam_double_port_uses_i.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : param_double_port_uses.cxx // Author : André RIBES (EDF) // Module : KERNEL -#include "param_double_port_uses.hxx" +#include "Param_Double_Port_uses_i.hxx" -param_double_port_uses_i::param_double_port_uses_i(Engines_ParallelDSC_i * par_compo, +Param_Double_Port_uses_i::Param_Double_Port_uses_i(Engines_ParallelDSC_i * par_compo, std::string port_name, CORBA::ORB_ptr orb) { @@ -33,12 +33,12 @@ param_double_port_uses_i::param_double_port_uses_i(Engines_ParallelDSC_i * par_c _provides_port = NULL; paco_fabrique_manager * pfm = paco_getFabriqueManager(); - pfm->register_comScheduling("param_double_port_uses_i_direct", new paco_direct_fabrique()); - pfm->register_distribution("param_double_port_uses_i_GaBro", new GaBro_fab()); - pfm->register_distribution("param_double_port_uses_i_BasicBC", new BasicBC_fab()); + pfm->register_comScheduling("Param_Double_Port_uses_i_direct", new paco_direct_fabrique()); + pfm->register_distribution("Param_Double_Port_uses_i_GaBro", new GaBro_fab()); + pfm->register_distribution("Param_Double_Port_uses_i_BasicBC", new BasicBC_fab()); } -param_double_port_uses_i::~param_double_port_uses_i() +Param_Double_Port_uses_i::~Param_Double_Port_uses_i() { if (_fake_properties) delete _fake_properties; @@ -50,7 +50,7 @@ param_double_port_uses_i::~param_double_port_uses_i() } void -param_double_port_uses_i::add_port_to_component() +Param_Double_Port_uses_i::add_port_to_component() { _par_compo->add_uses_port("IDL:Ports/Param_Double_Port:1.0", _port_name.c_str(), @@ -58,7 +58,7 @@ param_double_port_uses_i::add_port_to_component() } void -param_double_port_uses_i::start_port() +Param_Double_Port_uses_i::start_port() { Engines::DSC::uses_port * uport = _par_compo->get_uses_port(_port_name.c_str()); _proxy_port = Ports::Param_Double_Port::_narrow((*uport)[0]); @@ -70,8 +70,8 @@ param_double_port_uses_i::start_port() // de redistributions de la fonction put ParallelMethodContext * method_ptr; method_ptr = _provides_port->getParallelMethodContext("put"); - method_ptr->setLibComScheduling("param_double_port_uses_i_direct"); - method_ptr->setDistLibArg("param_data", "param_double_port_uses_i_BasicBC", "in"); + method_ptr->setLibComScheduling("Param_Double_Port_uses_i_direct"); + method_ptr->setDistLibArg("param_data", "Param_Double_Port_uses_i_BasicBC", "in"); BasicBC * dislib = (BasicBC *) method_ptr->getDistLibArg("param_data", "in"); dislib->setEltSize(sizeof(CORBA::Double)); dislib->setBlocSize(0); // BLOC @@ -80,8 +80,8 @@ param_double_port_uses_i::start_port() // Il faut maintenant configurer les bibliothèques // de redistributions de la fonction get_results method_ptr = _provides_port->getParallelMethodContext("get_results"); - method_ptr->setLibComScheduling("param_double_port_uses_i_direct"); - method_ptr->setDistLibArg("param_results", "param_double_port_uses_i_GaBro", "out"); + method_ptr->setLibComScheduling("Param_Double_Port_uses_i_direct"); + method_ptr->setDistLibArg("param_results", "Param_Double_Port_uses_i_GaBro", "out"); GaBro * dislib_gabro = (GaBro *) method_ptr->getDistLibArg("param_results", "out"); dislib_gabro->setEltSize(sizeof(CORBA::Double)); @@ -89,7 +89,7 @@ param_double_port_uses_i::start_port() } void -param_double_port_uses_i::configure_port_method_put(int totalNbElt) +Param_Double_Port_uses_i::configure_port_method_put(int totalNbElt) { ParallelMethodContext * method_ptr; method_ptr = _provides_port->getParallelMethodContext("put"); @@ -98,13 +98,13 @@ param_double_port_uses_i::configure_port_method_put(int totalNbElt) } void -param_double_port_uses_i::put(const Ports::Param_Double_Port::seq_double & param_data) +Param_Double_Port_uses_i::put(const Ports::Param_Double_Port::seq_double & param_data) { _provides_port->put(param_data); } void -param_double_port_uses_i::get_results(Ports::Param_Double_Port::seq_double_out param_results) +Param_Double_Port_uses_i::get_results(Ports::Param_Double_Port::seq_double_out param_results) { _provides_port->get_results(param_results); } diff --git a/src/DSC/ParallelDSC/param_double_port_uses.hxx b/src/DSC/ParallelDSC/Param_Double_Port_uses_i.hxx similarity index 93% rename from src/DSC/ParallelDSC/param_double_port_uses.hxx rename to src/DSC/ParallelDSC/Param_Double_Port_uses_i.hxx index 914e68705..745063489 100644 --- a/src/DSC/ParallelDSC/param_double_port_uses.hxx +++ b/src/DSC/ParallelDSC/Param_Double_Port_uses_i.hxx @@ -32,13 +32,13 @@ #include #include -class param_double_port_uses_i +class Param_Double_Port_uses_i { public : - param_double_port_uses_i(Engines_ParallelDSC_i * par_compo, + Param_Double_Port_uses_i(Engines_ParallelDSC_i * par_compo, std::string port_name, CORBA::ORB_ptr orb); - virtual ~param_double_port_uses_i(); + virtual ~Param_Double_Port_uses_i(); // Port local init methods virtual void add_port_to_component(); -- 2.39.2