From: ribes Date: Fri, 29 Apr 2011 14:09:39 +0000 (+0000) Subject: PaCO++ update for V6.3 X-Git-Tag: V6_3_0b1~10 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e7f471ea72ce27bc3e32fadb190186f16fd6dea0;p=modules%2Fkernel.git PaCO++ update for V6.3 --- diff --git a/idl/Makefile.am b/idl/Makefile.am index e558e9234..1df44c6a7 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -71,7 +71,8 @@ OTHER_IDL_FILES = \ # all the idl files are needed for make dist EXTRA_DIST= $(BASEIDL_FILES) $(MPIIDL_FILES) $(OTHER_IDL_FILES) \ SALOME_Component.xml DSC_Engines.xml SALOME_Ports.xml \ - SALOME_PACOExtension.xml SALOME_ParamPorts.xml + SALOME_PACOExtension.xml SALOME_ParamPorts.xml \ + SALOME_GenericObj.xml # This variable defines the files to be installed salomeidl_DATA = $(IDL_FILES) @@ -146,19 +147,21 @@ PAR = SALOME_ComponentPaCO.hxx SALOME_ComponentPaCO.cxx \ SALOME_PortsPaCO.hxx SALOME_PortsPaCO.cxx \ DSC_EnginesPaCO.hxx DSC_EnginesPaCO.cxx \ SALOME_PACOExtensionPaCO.hxx SALOME_PACOExtensionPaCO.cxx \ - SALOME_ParamPortsPaCO.hxx SALOME_ParamPortsPaCO.cxx + SALOME_ParamPortsPaCO.hxx SALOME_ParamPortsPaCO.cxx \ + SALOME_GenericObjPaCO.hxx SALOME_GenericObjPaCO.cxx PAR_INCLUDES = SALOME_Exception.hxx SALOME_GenericObj.hxx SALOMEDS.hxx SALOME_PyNode.hxx PAR_LIB = libSalomeParallelIDLKernel.la IDL_PACO = SALOME_ComponentPaCO.idl SALOME_PortsPaCO.idl DSC_EnginesPaCO.idl \ - SALOME_ParamPortsPaCO.idl SALOME_PACOExtensionPaCO.idl + SALOME_ParamPortsPaCO.idl SALOME_PACOExtensionPaCO.idl \ + SALOME_GenericObjPaCO.idl GEN_PACO = SALOME_ComponentPaCO_Engines_Container_server.cxx \ SALOME_ComponentPaCO_Engines_Container_client.cxx \ - SALOME_ComponentPaCO_Engines_Component_server.cxx \ - SALOME_ComponentPaCO_Engines_Component_client.cxx \ + SALOME_ComponentPaCO_Engines_EngineComponent_server.cxx \ + SALOME_ComponentPaCO_Engines_EngineComponent_client.cxx \ SALOME_ComponentPaCO_Engines_fileTransfer_server.cxx \ SALOME_ComponentPaCO_Engines_fileTransfer_client.cxx \ SALOME_ComponentPaCO_Engines_Salome_file_server.cxx \ @@ -180,12 +183,14 @@ GEN_PACO = SALOME_ComponentPaCO_Engines_Container_server.cxx \ SALOME_PACOExtensionPaCO_Engines_Parallel_DSC_server.cxx \ SALOME_PACOExtensionPaCO_Engines_Parallel_DSC_client.cxx \ SALOME_ParamPortsPaCO_Ports_Param_Double_Port_server.cxx \ - SALOME_ParamPortsPaCO_Ports_Param_Double_Port_client.cxx + SALOME_ParamPortsPaCO_Ports_Param_Double_Port_client.cxx \ + SALOME_GenericObjPaCO_SALOME_GenericObj_server.cxx \ + SALOME_GenericObjPaCO_SALOME_GenericObj_client.cxx INCLUDES_PACO = SALOME_ComponentPaCO_Engines_Container_server.hxx \ SALOME_ComponentPaCO_Engines_Container_client.hxx \ - SALOME_ComponentPaCO_Engines_Component_server.hxx \ - SALOME_ComponentPaCO_Engines_Component_client.hxx \ + SALOME_ComponentPaCO_Engines_EngineComponent_server.hxx \ + SALOME_ComponentPaCO_Engines_EngineComponent_client.hxx \ SALOME_ComponentPaCO_Engines_fileTransfer_server.hxx \ SALOME_ComponentPaCO_Engines_fileTransfer_client.hxx \ SALOME_ComponentPaCO_Engines_Salome_file_server.hxx \ @@ -217,10 +222,15 @@ INCLUDES_PACO = SALOME_ComponentPaCO_Engines_Container_server.hxx \ SALOME_ParamPortsPaCO_Ports_Param_Double_Port_server.hxx \ SALOME_ParamPortsPaCO_Ports_Param_Double_Port_client.hxx \ SALOME_ParamPortsPaCO.hxx \ - SALOME_ParamPorts.hxx + SALOME_ParamPorts.hxx \ + SALOME_GenericObjPaCO_SALOME_GenericObj_server.hxx \ + SALOME_GenericObjPaCO_SALOME_GenericObj_client.hxx \ + SALOME_GenericObjPaCO.hxx \ + SALOME_GenericObj.hxx XML = SALOME_Component.xml DSC_Engines.xml SALOME_Ports.xml \ - SALOME_PACOExtension.xml SALOME_ParamPorts.xml + SALOME_PACOExtension.xml SALOME_ParamPorts.xml \ + SALOME_GenericObj.xml endif idldir = $(prefix)/idl/salome @@ -229,7 +239,8 @@ nodist_salomeinclude_HEADERS = ${INCLUDES_PACO} BUILT_SOURCES = $(IDL_SOURCES) $(PAR_INCLUDES) $(PAR) -SALOME_ComponentPaCO.idl SALOME_ComponentPaCO.hxx SALOME_ComponentPaCO.cxx : SALOME_Component.idl SALOME_Component.xml +SALOME_GenericObjPaCO.idl SALOME_GenericObjPaCO.hxx SALOME_GenericObjPaCO.cxx : SALOME_GenericObj.idl SALOME_GenericObj.xml +SALOME_ComponentPaCO.idl SALOME_ComponentPaCO.hxx SALOME_ComponentPaCO.cxx : SALOME_Component.idl SALOME_Component.xml SALOME_GenericObjPaCO.idl SALOME_PortsPaCO.idl SALOME_PortsPaCO.hxx SALOME_PortsPaCO.cxx : SALOME_Ports.idl SALOME_Ports.xml DSC_EnginesPaCO.idl DSC_EnginesPaCO.hxx DSC_EnginesPaCO.cxx : DSC_Engines.idl DSC_Engines.xml SALOME_PACOExtensionPaCO.idl SALOME_PACOExtensionPaCO.hxx SALOME_PACOExtensionPaCO.cxx : SALOME_PACOExtension.idl SALOME_PACOExtension.xml @@ -270,7 +281,7 @@ if WITH_PACO_PARALLEL $(IDL) -p@PACOPATH@/lib/python -bpaco -Wb$(top_srcdir)/idl/$*.xml,$(srcdir):@PACOPATH@/idl $(top_srcdir)/idl/$*.idl .idl.hxx: - $(IDL) $(IDLCXXFLAGS) -Wbh=.hxx -Wbs=.cxx $< + $(IDL) $(PACOIDLCXXFLAGS) -bcxx -Wbh=.hxx -Wbs=.cxx $< endif install-exec-local: $(IDL_FILES:%=$(top_srcdir)/idl/%) Calcium_Ports.idl diff --git a/idl/SALOME_GenericObj.xml b/idl/SALOME_GenericObj.xml new file mode 100644 index 000000000..b7354bada --- /dev/null +++ b/idl/SALOME_GenericObj.xml @@ -0,0 +1,35 @@ + + + + + SALOME + + GenericObj + + + + diff --git a/salome_adm/unix/config_files/check_corba.m4 b/salome_adm/unix/config_files/check_corba.m4 index 53f28b831..41c1e057e 100644 --- a/salome_adm/unix/config_files/check_corba.m4 +++ b/salome_adm/unix/config_files/check_corba.m4 @@ -37,6 +37,7 @@ then CORBA_CXXFLAGS=$OMNIORB_CXXFLAGS CORBA_LIBS=$OMNIORB_LIBS IDLCXXFLAGS=$OMNIORB_IDLCXXFLAGS + PACOIDLCXXFLAGS=$OMNIORB_PACOIDLCXXFLAGS IDLPYFLAGS=$OMNIORB_IDLPYFLAGS AC_SUBST(CORBA_ROOT) @@ -44,6 +45,7 @@ then AC_SUBST(CORBA_CXXFLAGS) AC_SUBST(CORBA_LIBS) AC_SUBST(IDLCXXFLAGS) + AC_SUBST(PACOIDLCXXFLAGS) AC_SUBST(IDLPYFLAGS) IDL_CLN_H=$OMNIORB_IDL_CLN_H diff --git a/salome_adm/unix/config_files/check_omniorb.m4 b/salome_adm/unix/config_files/check_omniorb.m4 index fd381029e..b69bad6cb 100644 --- a/salome_adm/unix/config_files/check_omniorb.m4 +++ b/salome_adm/unix/config_files/check_omniorb.m4 @@ -210,11 +210,13 @@ if test "x$omniORB_ok" = "xyes" then OMNIORB_IDLCXXFLAGS="-Wba -nf -I${OMNIORB_ROOT}/idl" + OMNIORB_PACOIDLCXXFLAGS="-nf -I${OMNIORB_ROOT}/idl" OMNIORB_IDLPYFLAGS_1='-bpython -nf ' OMNIORB_IDLPYFLAGS_2=" -I${OMNIORB_ROOT}/idl" OMNIORB_IDLPYFLAGS=${OMNIORB_IDLPYFLAGS_1}${OMNIORB_IDLPYFLAGS_2} AC_SUBST(OMNIORB_IDLCXXFLAGS) + AC_SUBST(OMNIORB_PACOIDLCXXFLAGS) AC_SUBST(OMNIORB_IDLPYFLAGS) OMNIORB_IDL_CLN_H=.hh diff --git a/src/DSC/ParallelDSC/Makefile.am b/src/DSC/ParallelDSC/Makefile.am index d4d0fbc8e..d70098352 100644 --- a/src/DSC/ParallelDSC/Makefile.am +++ b/src/DSC/ParallelDSC/Makefile.am @@ -48,6 +48,7 @@ COMMON_CPPFLAGS= -I$(top_srcdir)/src/Container \ -I$(top_srcdir)/src/NamingService \ -I$(top_srcdir)/src/Utils \ -I$(top_srcdir)/src/DSC/DSC_Basic \ + -I$(top_srcdir)/src/GenericObj \ -I$(top_builddir)/idl \ -I$(top_srcdir)/src/Registry \ -I$(top_srcdir)/src/Utils \ diff --git a/src/ParallelContainer/Makefile.am b/src/ParallelContainer/Makefile.am index 6635ab230..7462d12b3 100644 --- a/src/ParallelContainer/Makefile.am +++ b/src/ParallelContainer/Makefile.am @@ -52,6 +52,7 @@ COMMON_CPPFLAGS= -I$(top_srcdir)/src/Container \ -I$(top_srcdir)/src/NamingService \ -I$(top_srcdir)/src/Registry \ -I$(top_srcdir)/src/Utils \ + -I$(top_srcdir)/src/GenericObj \ -I$(srcdir)/../HDFPersist \ -I$(top_builddir)/idl \ -I$(top_srcdir)/src/SALOMETraceCollector \ @@ -63,6 +64,9 @@ COMMON_CPPFLAGS= -I$(top_srcdir)/src/Container \ # This local variable defines the list of dependant libraries common to all target in this package. COMMON_LIBS = $(top_builddir)/src/Container/libSalomeContainer.la \ + $(top_builddir)/src/NamingService/libSalomeNS.la \ + $(top_builddir)/src/SALOMELocalTrace/libSALOMELocalTrace.la \ + $(top_builddir)/src/Basics/libSALOMEBasics.la \ $(top_builddir)/src/HDFPersist/libSalomeHDFPersist.la \ $(top_builddir)/idl/libSalomeParallelIDLKernel.la \ $(top_builddir)/idl/libSalomeIDLKernel.la \ diff --git a/src/ParallelContainer/Parallel_Salome_file_i.cxx b/src/ParallelContainer/Parallel_Salome_file_i.cxx index f8c824614..e2497f9d7 100644 --- a/src/ParallelContainer/Parallel_Salome_file_i.cxx +++ b/src/ParallelContainer/Parallel_Salome_file_i.cxx @@ -37,6 +37,8 @@ Parallel_Salome_file_i::Parallel_Salome_file_i(CORBA::ORB_ptr orb, Engines::fileTransfer_serv(orb,ior,rank), Engines::Parallel_Salome_file_serv(orb,ior,rank), Engines::fileTransfer_base_serv(orb,ior,rank), + SALOME::GenericObj_serv(orb,ior,rank), + SALOME::GenericObj_base_serv(orb,ior,rank), Engines::Parallel_Salome_file_base_serv(orb,ior,rank) { CORBA::Object_ptr obj = _orb->string_to_object(ior); diff --git a/src/ParallelContainer/SALOME_ParallelContainer_i.cxx b/src/ParallelContainer/SALOME_ParallelContainer_i.cxx index 9903e65c4..b22f989af 100644 --- a/src/ParallelContainer/SALOME_ParallelContainer_i.cxx +++ b/src/ParallelContainer/SALOME_ParallelContainer_i.cxx @@ -923,7 +923,7 @@ Engines_Parallel_Container_i::create_paco_component_node_instance(const char* co { // Init de la méthode char * proxy_ior; - Engines::Component_PaCO_var work_node; + Engines::EngineComponent_PaCO_var work_node; std::string aCompName = componentName; std::string _proxy_containerName = proxy_containerName; @@ -986,7 +986,7 @@ Engines_Parallel_Container_i::create_paco_component_node_instance(const char* co // --- get reference & servant from id CORBA::Object_var obj = _poa->id_to_reference(*id); - work_node = Engines::Component_PaCO::_narrow(obj) ; + work_node = Engines::EngineComponent_PaCO::_narrow(obj) ; if (CORBA::is_nil(work_node)) { INFOS("work_node reference from factory is nil !"); @@ -1128,6 +1128,14 @@ Engines_Parallel_Container_i::createPyNode(const char* nodeName, const char* cod return node._retn(); } +Engines::PyScriptNode_ptr +Engines_Parallel_Container_i::createPyScriptNode(const char* nodeName, const char* cod) +{ + INFOS("Python script node not yet implemented"); + Engines::PyScriptNode_var node= Engines::PyScriptNode::_nil(); + return node._retn(); +} + //============================================================================= /*! * diff --git a/src/ParallelContainer/SALOME_ParallelContainer_i.hxx b/src/ParallelContainer/SALOME_ParallelContainer_i.hxx index 552590499..37ea89390 100644 --- a/src/ParallelContainer/SALOME_ParallelContainer_i.hxx +++ b/src/ParallelContainer/SALOME_ParallelContainer_i.hxx @@ -139,6 +139,7 @@ public: virtual Engines::Salome_file_ptr createSalome_file(const char* origFileName); void copyFile(Engines::Container_ptr container, const char* remoteFile, const char* localFile); Engines::PyNode_ptr createPyNode(const char* nodeName, const char* code); + Engines::PyScriptNode_ptr createPyScriptNode(const char* nodeName, const char* code); protected: