From c43a3e922d3b186697c6d72c675014e6a2ca9379 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 22 Mar 2004 07:28:15 +0000 Subject: [PATCH] This commit was generated by cvs2git to create tag 'V1_4_0'. Sprout from master 2004-03-22 07:28:14 UTC prascle 'PR: with gcc 2.95.4 (DEBIAN Woody) use "" instead of <> for dependancies' Cherrypick from IMPORT 2003-10-13 16:48:48 UTC prascle 'import SalomePro v1.2c': idl/SALOME_DataTypeCatalog.idl idl/SALOME_Registry.idl idl/SALOME_RessourcesCatalog.idl idl/SALOME_TestComponent.idl idl/TestNotif.idl resources/CatalogDataType.xml resources/CatalogModulePersonnel.xml_skel resources/CatalogRessources.xml resources/Plugin resources/Tools_en.xml resources/Tools_fr.xml resources/back.xpm resources/cascade.png resources/channel.cfg resources/close.png resources/config resources/copy.png resources/default.png resources/dl_delete.png resources/dl_insert.png resources/dl_movedown.png resources/dl_moveup.png resources/forward.xpm resources/help.png resources/home.xpm resources/new.png resources/open.png resources/paste.png resources/plot2d_dump.png resources/plot2d_fitall.png resources/plot2d_fitarea.png resources/plot2d_legend.png resources/plot2d_linear.png resources/plot2d_linear_y.png resources/plot2d_lines.png resources/plot2d_log.png resources/plot2d_log_y.png resources/plot2d_pan.png resources/plot2d_points.png resources/plot2d_settings.png resources/plot2d_splines.png resources/plot2d_zoom.png resources/print.png resources/redo.png resources/reset.png resources/salomeCommonModel.spml resources/save.png resources/select1.png resources/tile.png resources/uc_add.png resources/uc_clear.png resources/uc_current.png resources/uc_del.png resources/uc_new.png resources/undo.png resources/view_back.png resources/view_bottom.png resources/view_camera_dump.png resources/view_fitall.png resources/view_fitarea.png resources/view_front.png resources/view_glpan.png resources/view_left.png resources/view_pan.png resources/view_reset.png resources/view_right.png resources/view_rotate.png resources/view_top.png resources/view_triedre.png resources/view_zoom.png salome_adm/unix/Doxyfile salome_adm/unix/F77config.h.in salome_adm/unix/SALOMEconfig.h.in salome_adm/unix/config_files/ac_cc_warnings.m4 salome_adm/unix/config_files/ac_cxx_bool.m4 salome_adm/unix/config_files/ac_cxx_have_sstream.m4 salome_adm/unix/config_files/ac_cxx_mutable.m4 salome_adm/unix/config_files/ac_cxx_namespaces.m4 salome_adm/unix/config_files/ac_cxx_partial_specialization.m4 salome_adm/unix/config_files/ac_cxx_typename.m4 salome_adm/unix/config_files/check_Salome.m4 salome_adm/unix/config_files/check_corba.m4 salome_adm/unix/config_files/check_f77.m4 salome_adm/unix/config_files/check_hdf5.m4 salome_adm/unix/config_files/check_java.m4 salome_adm/unix/config_files/check_med2.m4 salome_adm/unix/config_files/check_mico.m4 salome_adm/unix/config_files/check_opengl.m4 salome_adm/unix/config_files/check_qwt.m4 salome_adm/unix/config_files/check_swig.m4 salome_adm/unix/config_files/config.guess salome_adm/unix/config_files/config.sub salome_adm/unix/config_files/enable_pthreads.m4 salome_adm/unix/config_files/install-sh salome_adm/unix/config_files/libtool.m4 salome_adm/unix/config_files/ltconfig salome_adm/unix/config_files/ltmain.sh salome_adm/unix/config_files/missing salome_adm/unix/config_files/mkinstalldirs salome_adm/unix/config_files/pyembed.m4 salome_adm/unix/envScript.in salome_adm/unix/sstream.in src/A_LIRE_SALOME src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.hxx src/DataTypeCatalog/SALOME_DataTypeCatalog_Parser.hxx src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.hxx src/HDFPersist/HDFOI.hxx src/HDFPersist/HDFascii.hxx src/HDFPersist/HDFattrClose.c src/HDFPersist/HDFattrGetSize.c src/HDFPersist/HDFattrGetType.c src/HDFPersist/HDFattrOpen.c src/HDFPersist/HDFattribute.hxx src/HDFPersist/HDFcontainerObject.hxx src/HDFPersist/HDFdataset.hxx src/HDFPersist/HDFdatasetClose.c src/HDFPersist/HDFdatasetGetDim.c src/HDFPersist/HDFdatasetGetSize.c src/HDFPersist/HDFdatasetGetnDim.c src/HDFPersist/HDFdatasetOpen.c src/HDFPersist/HDFerrorModeLock.c src/HDFPersist/HDFexplorer.hxx src/HDFPersist/HDFfile.hxx src/HDFPersist/HDFfileClose.c src/HDFPersist/HDFfileCreate.c src/HDFPersist/HDFfileMount.c src/HDFPersist/HDFfileOpen.c src/HDFPersist/HDFfileUmount.c src/HDFPersist/HDFgroup.hxx src/HDFPersist/HDFgroupClose.c src/HDFPersist/HDFgroupCreate.c src/HDFPersist/HDFgroupOpen.c src/HDFPersist/HDFinternalObject.hxx src/HDFPersist/HDFnObjects.c src/HDFPersist/HDFobject.hxx src/HDFPersist/HDFobjectIdentify.c src/HDFPersist/HDFobjectType.c src/HDFPersist/HDFtypes.h src/HDFPersist/hdfi.h src/HDFPersist/test1.c src/HDFPersist/test2.c src/HDFPersist/test3.cxx src/HDFPersist/test4.cxx src/HDFPersist/test5.cxx src/HDFPersist/test6.cxx src/HDFPersist/test7.cxx src/HDFPersist/test8.cxx src/HDFPersist/test9.cxx src/ModuleCatalog/PathPrefix.hxx src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx src/ModuleGenerator/README src/ModuleGenerator/testIDLparser.in src/ModuleGenerator/tests/Truc2Component.idl src/ModuleGenerator/tests/TrucComponent.idl src/ModuleGenerator/tests/test1.sh src/ModuleGenerator/tests/test1b.sh src/ModuleGenerator/tests/test2.sh src/ModuleGenerator/tests/test3.sh src/ModuleGenerator/tests/test4.sh src/ModuleGenerator/tests/test5.sh src/NOTIFICATION_SWIG/NOTIFICATION.i src/NamingService/SALOME_NamingService.i src/NamingService/ServiceUnreachable.hxx src/Notification/CosNotifyShorthands.h src/Notification/NOTIFICATION.hxx src/Notification/NOTIFICATION_Consumer.hxx src/Notification/NOTIFICATION_Supplier.hxx src/OBJECT/Handle_SALOME_AISObject.hxx src/OBJECT/Handle_SALOME_AISShape.hxx src/OBJECT/Handle_SALOME_InteractiveObject.hxx src/OBJECT/SALOME_AISObject.hxx src/OBJECT/SALOME_AISObject.ixx src/OBJECT/SALOME_AISObject.jxx src/OBJECT/SALOME_AISShape.hxx src/OBJECT/SALOME_AISShape.ixx src/OBJECT/SALOME_AISShape.jxx src/OBJECT/SALOME_InteractiveObject.hxx src/OBJECT/SALOME_InteractiveObject.ixx src/OBJECT/SALOME_InteractiveObject.jxx src/OBJECT/VTKViewer_Common.h src/OCCViewer/OCCViewer.h src/OCCViewer/OCCViewer_AISSelector.h src/OCCViewer/OCCViewer_Selector.h src/OCCViewer/OCCViewer_VService.h src/OCCViewer/OCCViewer_ViewPort.h src/OCCViewer/OCCViewer_ViewPort3d.h src/OCCViewer/OCCViewer_Viewer3d.h src/PatchQt/qactionP.cxx src/PatchQt/qactionP.h src/PatchQt/qsplitterP.h src/PatchQt/qworkspaceP.h src/Plot2d/Plot2d.cxx src/Plot2d/Plot2d.h src/Plot2d/Plot2d_Curve.h src/Plot2d/Plot2d_CurveContainer.h src/Plot2d/Plot2d_FitDataDlg.cxx src/Plot2d/Plot2d_FitDataDlg.h src/Plot2d/Plot2d_SetupPlot2dDlg.cxx src/Plot2d/Plot2d_SetupPlot2dDlg.h src/Plot2d/Plot2d_SetupViewDlg.cxx src/Plot2d/Plot2d_SetupViewDlg.h src/Registry/RegistryConnexion.hxx src/RegistryDisplay/HelpWindow.hxx src/RegistryDisplay/IntervalWindow.cxx src/RegistryDisplay/IntervalWindow.hxx src/RegistryDisplay/RegWidget.hxx src/RessourcesCatalog/SALOME_RessourcesCatalog_Handler.hxx src/RessourcesCatalog/SALOME_RessourcesCatalog_Parser.hxx src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.hxx src/SALOMEDS/Handle_SALOMEDS_DataMapNodeOfDataMapOfIntegerString.hxx src/SALOMEDS/Handle_SALOMEDS_DataMapNodeOfDataMapStringLabel.hxx src/SALOMEDS/Handle_SALOMEDS_DrawableAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_ExpandableAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_IORAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_LocalIDAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_OCAFApplication.hxx src/SALOMEDS/Handle_SALOMEDS_OpenedAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_PersRefAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_PixMapAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_PythonObjectAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_SelectableAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_SequenceOfIntegerAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_SequenceOfRealAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_StudyPropertiesAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_TableOfIntegerAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_TableOfRealAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_TableOfStringAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_TargetAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_TextColorAttribute.hxx src/SALOMEDS/Handle_SALOMEDS_TextHighlightColorAttribute.hxx src/SALOMEDS/SALOMEDS.cdl src/SALOMEDS/SALOMEDS_AttLong_i.cxx src/SALOMEDS/SALOMEDS_AttLong_i.hxx src/SALOMEDS/SALOMEDS_AttReal_i.cxx src/SALOMEDS/SALOMEDS_AttReal_i.hxx src/SALOMEDS/SALOMEDS_AttributeComment_i.hxx src/SALOMEDS/SALOMEDS_AttributeDrawable_i.hxx src/SALOMEDS/SALOMEDS_AttributeExpandable_i.hxx src/SALOMEDS/SALOMEDS_AttributeIOR_i.hxx src/SALOMEDS/SALOMEDS_AttributeInteger_i.hxx src/SALOMEDS/SALOMEDS_AttributeLocalID_i.hxx src/SALOMEDS/SALOMEDS_AttributeName_i.hxx src/SALOMEDS/SALOMEDS_AttributeOpened_i.hxx src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.hxx src/SALOMEDS/SALOMEDS_AttributePixMap_i.hxx src/SALOMEDS/SALOMEDS_AttributePythonObject_i.hxx src/SALOMEDS/SALOMEDS_AttributeReal_i.hxx src/SALOMEDS/SALOMEDS_AttributeSelectable_i.hxx src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.hxx src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.hxx src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.hxx src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.hxx src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.hxx src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.hxx src/SALOMEDS/SALOMEDS_AttributeTarget_i.hxx src/SALOMEDS/SALOMEDS_AttributeTextColor_i.hxx src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.hxx src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.hxx src/SALOMEDS/SALOMEDS_AttributeUserID_i.hxx src/SALOMEDS/SALOMEDS_BasicAttributeFactory.cxx src/SALOMEDS/SALOMEDS_BasicAttributeFactory.hxx src/SALOMEDS/SALOMEDS_BasicAttribute_i.cxx src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx src/SALOMEDS/SALOMEDS_Callback_i.hxx src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapOfIntegerString.hxx src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapOfIntegerString_0.cxx src/SALOMEDS/SALOMEDS_DataMapIteratorOfDataMapStringLabel.hxx src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapOfIntegerString.hxx src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapOfIntegerString_0.cxx src/SALOMEDS/SALOMEDS_DataMapNodeOfDataMapStringLabel.hxx src/SALOMEDS/SALOMEDS_DataMapOfIntegerString.hxx src/SALOMEDS/SALOMEDS_DataMapOfIntegerString_0.cxx src/SALOMEDS/SALOMEDS_DataMapStringLabel.hxx src/SALOMEDS/SALOMEDS_DrawableAttribute.cdl src/SALOMEDS/SALOMEDS_DrawableAttribute.hxx src/SALOMEDS/SALOMEDS_DrawableAttribute.ixx src/SALOMEDS/SALOMEDS_DrawableAttribute.jxx src/SALOMEDS/SALOMEDS_ExpandableAttribute.cdl src/SALOMEDS/SALOMEDS_ExpandableAttribute.hxx src/SALOMEDS/SALOMEDS_ExpandableAttribute.ixx src/SALOMEDS/SALOMEDS_ExpandableAttribute.jxx src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx src/SALOMEDS/SALOMEDS_IORAttribute.cdl src/SALOMEDS/SALOMEDS_IORAttribute.hxx src/SALOMEDS/SALOMEDS_IORAttribute.ixx src/SALOMEDS/SALOMEDS_IORAttribute.jxx src/SALOMEDS/SALOMEDS_LocalIDAttribute.cdl src/SALOMEDS/SALOMEDS_LocalIDAttribute.hxx src/SALOMEDS/SALOMEDS_LocalIDAttribute.ixx src/SALOMEDS/SALOMEDS_LocalIDAttribute.jxx src/SALOMEDS/SALOMEDS_OCAFApplication.cdl src/SALOMEDS/SALOMEDS_OCAFApplication.hxx src/SALOMEDS/SALOMEDS_OCAFApplication.ixx src/SALOMEDS/SALOMEDS_OCAFApplication.jxx src/SALOMEDS/SALOMEDS_OpenedAttribute.cdl src/SALOMEDS/SALOMEDS_OpenedAttribute.hxx src/SALOMEDS/SALOMEDS_OpenedAttribute.ixx src/SALOMEDS/SALOMEDS_OpenedAttribute.jxx src/SALOMEDS/SALOMEDS_PersRefAttribute.cdl src/SALOMEDS/SALOMEDS_PersRefAttribute.hxx src/SALOMEDS/SALOMEDS_PersRefAttribute.ixx src/SALOMEDS/SALOMEDS_PersRefAttribute.jxx src/SALOMEDS/SALOMEDS_PixMapAttribute.cdl src/SALOMEDS/SALOMEDS_PixMapAttribute.hxx src/SALOMEDS/SALOMEDS_PixMapAttribute.ixx src/SALOMEDS/SALOMEDS_PixMapAttribute.jxx src/SALOMEDS/SALOMEDS_PythonObjectAttribute.cdl src/SALOMEDS/SALOMEDS_PythonObjectAttribute.hxx src/SALOMEDS/SALOMEDS_PythonObjectAttribute.ixx src/SALOMEDS/SALOMEDS_PythonObjectAttribute.jxx src/SALOMEDS/SALOMEDS_SAttribute_i.hxx src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx src/SALOMEDS/SALOMEDS_SComponent_i.hxx src/SALOMEDS/SALOMEDS_SelectableAttribute.cdl src/SALOMEDS/SALOMEDS_SelectableAttribute.hxx src/SALOMEDS/SALOMEDS_SelectableAttribute.ixx src/SALOMEDS/SALOMEDS_SelectableAttribute.jxx src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.cdl src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.hxx src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.ixx src/SALOMEDS/SALOMEDS_SequenceOfIntegerAttribute.jxx src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.cdl src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.hxx src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.ixx src/SALOMEDS/SALOMEDS_SequenceOfRealAttribute.jxx src/SALOMEDS/SALOMEDS_StudyManager_i.hxx src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.cdl src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.hxx src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.ixx src/SALOMEDS/SALOMEDS_StudyPropertiesAttribute.jxx src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.ixx src/SALOMEDS/SALOMEDS_TableOfIntegerAttribute.jxx src/SALOMEDS/SALOMEDS_TableOfRealAttribute.ixx src/SALOMEDS/SALOMEDS_TableOfRealAttribute.jxx src/SALOMEDS/SALOMEDS_TableOfStringAttribute.hxx src/SALOMEDS/SALOMEDS_TableOfStringAttribute.ixx src/SALOMEDS/SALOMEDS_TableOfStringAttribute.jxx src/SALOMEDS/SALOMEDS_TargetAttribute.cdl src/SALOMEDS/SALOMEDS_TargetAttribute.hxx src/SALOMEDS/SALOMEDS_TargetAttribute.ixx src/SALOMEDS/SALOMEDS_TargetAttribute.jxx src/SALOMEDS/SALOMEDS_TextColorAttribute.cdl src/SALOMEDS/SALOMEDS_TextColorAttribute.hxx src/SALOMEDS/SALOMEDS_TextColorAttribute.ixx src/SALOMEDS/SALOMEDS_TextColorAttribute.jxx src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.cdl src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.hxx src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.ixx src/SALOMEDS/SALOMEDS_TextHighlightColorAttribute.jxx src/SALOMEDS/SALOMEDS_Tool.cxx src/SALOMEDS/SALOMEDS_Tool.hxx src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx src/SALOMEGUI/CLIENT_icons.po src/SALOMEGUI/Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx src/SALOMEGUI/Handle_SALOME_Filter.hxx src/SALOMEGUI/Handle_SALOME_ListNodeOfListIO.hxx src/SALOMEGUI/Handle_SALOME_ListNodeOfListOfFilter.hxx src/SALOMEGUI/Handle_SALOME_NumberFilter.hxx src/SALOMEGUI/Handle_SALOME_TypeFilter.hxx src/SALOMEGUI/PyInterp_PyQt.h src/SALOMEGUI/QAD.h src/SALOMEGUI/QAD_Action.h src/SALOMEGUI/QAD_Application.h src/SALOMEGUI/QAD_Config.h src/SALOMEGUI/QAD_DirListDlg.h src/SALOMEGUI/QAD_FileDlg.h src/SALOMEGUI/QAD_FileValidator.h src/SALOMEGUI/QAD_Help.h src/SALOMEGUI/QAD_HelpWindow.h src/SALOMEGUI/QAD_LeftFrame.h src/SALOMEGUI/QAD_ListMenuIdAction.h src/SALOMEGUI/QAD_ListPopupMenu.h src/SALOMEGUI/QAD_ListView.h src/SALOMEGUI/QAD_Menus.h src/SALOMEGUI/QAD_Message.h src/SALOMEGUI/QAD_MessageBox.h src/SALOMEGUI/QAD_NameBrowser.cxx src/SALOMEGUI/QAD_NameBrowser.h src/SALOMEGUI/QAD_ObjectBrowserItem.h src/SALOMEGUI/QAD_Operation.h src/SALOMEGUI/QAD_OperatorMenus.h src/SALOMEGUI/QAD_ParserSettings.h src/SALOMEGUI/QAD_Popup.h src/SALOMEGUI/QAD_PyEditor.h src/SALOMEGUI/QAD_PyInterp.h src/SALOMEGUI/QAD_PyInterp_mono.h src/SALOMEGUI/QAD_Resource.h src/SALOMEGUI/QAD_ResourceMgr.h src/SALOMEGUI/QAD_RightFrame.h src/SALOMEGUI/QAD_Settings.h src/SALOMEGUI/QAD_SpinBoxDbl.h src/SALOMEGUI/QAD_Splitter.h src/SALOMEGUI/QAD_Tools.h src/SALOMEGUI/QAD_WaitCursor.h src/SALOMEGUI/QAD_XmlHandler.h src/SALOMEGUI/SALOMEGUI.cxx src/SALOMEGUI/SALOMEGUI_AboutDlg.h src/SALOMEGUI/SALOMEGUI_Application.h src/SALOMEGUI/SALOMEGUI_CloseDlg.h src/SALOMEGUI/SALOMEGUI_Desktop.h src/SALOMEGUI/SALOMEGUI_ImportOperation.h src/SALOMEGUI/SALOMEGUI_LoadStudiesDlg.h src/SALOMEGUI/SALOMEGUI_NameDlg.h src/SALOMEGUI/SALOMEGUI_OpenWith.h src/SALOMEGUI/SALOMEGUI_QtCatchCorbaException.hxx src/SALOMEGUI/SALOMEGUI_SetupCurveDlg.h src/SALOMEGUI/SALOMEGUI_StudyPropertiesDlg.h src/SALOMEGUI/SALOMEGUI_TableDlg.h src/SALOMEGUI/SALOMEGUI_TrihedronSizeDlg.h src/SALOMEGUI/SALOMEGUI_ViewChoiceDlg.h src/SALOMEGUI/SALOMEGUI_icons.po src/SALOMEGUI/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx src/SALOMEGUI/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx src/SALOMEGUI/SALOME_DataMapOfIOMapOfInteger.hxx src/SALOMEGUI/SALOME_Filter.hxx src/SALOMEGUI/SALOME_Filter.ixx src/SALOMEGUI/SALOME_Filter.jxx src/SALOMEGUI/SALOME_ListIteratorOfListIO.hxx src/SALOMEGUI/SALOME_ListIteratorOfListOfFilter.hxx src/SALOMEGUI/SALOME_ListNodeOfListIO.hxx src/SALOMEGUI/SALOME_ListNodeOfListOfFilter.hxx src/SALOMEGUI/SALOME_NumberFilter.hxx src/SALOMEGUI/SALOME_NumberFilter.ixx src/SALOMEGUI/SALOME_NumberFilter.jxx src/SALOMEGUI/SALOME_Selection.h src/SALOMEGUI/SALOME_TypeFilter.hxx src/SALOMEGUI/SALOME_TypeFilter.ixx src/SALOMEGUI/SALOME_TypeFilter.jxx src/SALOME_SWIG/Help.py src/SALOME_SWIG/PyInterp.py src/SALOME_SWIG/examplevtk1.py src/SALOME_SWIG/libSALOME_Swig.i src/SALOME_SWIG/supervisionexample.py.in src/SALOME_SWIG/supervisiongeomexample.py.in src/SALOME_SWIG/test_big_table.py src/SALOME_SWIG/test_many_objects.py src/SALOME_SWIG/test_table.py src/SALOME_SWIG/testattr.py src/SUPERVGraph/SUPERVGraph.h src/SUPERVGraph/SUPERVGraph_Graph.cxx src/SUPERVGraph/SUPERVGraph_Graph.h src/Session/runSession src/TOOLSDS/SALOMEDS_Tool.hxx src/TOOLSGUI/ToolsGUI.h src/TOOLSGUI/ToolsGUI_icons.po src/TestContainer/SALOME_TestComponentPy.py src/TestContainer/SALOME_TestComponent_i.hxx src/TestContainer/TestComponentPy.py src/Utils/OpUtil.cxx src/Utils/OpUtil.hxx src/Utils/SalomeString.hxx src/Utils/Utils_CommException.hxx src/Utils/Utils_CorbaException.hxx src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx src/Utils/Utils_Identity.cxx src/Utils/Utils_Identity.hxx src/Utils/Utils_Identity.py src/Utils/Utils_ORB_INIT.hxx src/Utils/duplicate.cxx src/VTKFilter/SALOME_GeometryFilter.cxx src/VTKFilter/SALOME_GeometryFilter.h src/VTKFilter/SALOME_PassThroughFilter.cxx src/VTKFilter/SALOME_PassThroughFilter.h src/VTKFilter/SALOME_Transform.cxx src/VTKFilter/SALOME_Transform.h src/VTKFilter/SALOME_TransformFilter.cxx src/VTKFilter/SALOME_TransformFilter.h src/VTKViewer/VTKViewer.h src/VTKViewer/VTKViewer_RenderWindow.h Delete: src/MPILifeCycleCORBA/MPILifeCycleCORBA.py src/MPILifeCycleCORBA/MPIsalome.py src/MPILifeCycleCORBA/Makefile.in src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.hxx src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx src/TestMPIContainer/Makefile.in src/TestMPIContainer/TestMPIComponentEngine.cxx src/TestMPIContainer/TestMPIComponentEngine.hxx src/TestMPIContainer/TestMPIContainer.cxx --- src/MPILifeCycleCORBA/MPILifeCycleCORBA.py | 142 ------- src/MPILifeCycleCORBA/MPIsalome.py | 5 - src/MPILifeCycleCORBA/Makefile.in | 38 -- .../SALOME_MPILifeCycleCORBA.cxx | 357 ------------------ .../SALOME_MPILifeCycleCORBA.hxx | 45 --- .../TestMPILifeCycleCORBA.cxx | 69 ---- src/TestMPIContainer/Makefile.in | 37 -- .../TestMPIComponentEngine.cxx | 77 ---- .../TestMPIComponentEngine.hxx | 40 -- src/TestMPIContainer/TestMPIContainer.cxx | 134 ------- 10 files changed, 944 deletions(-) delete mode 100644 src/MPILifeCycleCORBA/MPILifeCycleCORBA.py delete mode 100644 src/MPILifeCycleCORBA/MPIsalome.py delete mode 100644 src/MPILifeCycleCORBA/Makefile.in delete mode 100644 src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx delete mode 100644 src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.hxx delete mode 100644 src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx delete mode 100644 src/TestMPIContainer/Makefile.in delete mode 100644 src/TestMPIContainer/TestMPIComponentEngine.cxx delete mode 100644 src/TestMPIContainer/TestMPIComponentEngine.hxx delete mode 100644 src/TestMPIContainer/TestMPIContainer.cxx diff --git a/src/MPILifeCycleCORBA/MPILifeCycleCORBA.py b/src/MPILifeCycleCORBA/MPILifeCycleCORBA.py deleted file mode 100644 index eb255d862..000000000 --- a/src/MPILifeCycleCORBA/MPILifeCycleCORBA.py +++ /dev/null @@ -1,142 +0,0 @@ -#============================================================================== -# File : MPILifeCycleCORBA.py -# Created : ven may 30 08:42:01 CEST 2003 -# Author : Bernard SECHER, CEA -# Project : SALOME -# Copyright : CEA 2003 -# $Header$ -#============================================================================== - -from LifeCycleCORBA import * - -class MPILifeCycleCORBA(LifeCycleCORBA): - #------------------------------------------------------------------------- - - def __init__(self, orb): - MESSAGE( "MPILifeCycleCORBA::__init__" ) - LifeCycleCORBA.__init__(self, orb) - - #------------------------------------------------------------------------- - - def FindOrStartMPIContainer(self, theComputer , theMPIContainerRoot, nbproc ): - theMPIContainer = theMPIContainerRoot + "_" + str(nbproc) - MESSAGE( "FindOrStartMPIContainer" + theComputer + theMPIContainer ) - aMPIContainer = self.FindContainer( theComputer + "/" + theMPIContainer ) - if aMPIContainer is None : - if (theMPIContainerRoot == "MPIFactoryServer") | (theMPIContainerRoot == "MPIFactoryServerPy") : - if theComputer == os.getenv("HOSTNAME") : - rshstr = "" - else : - rshstr = "rsh -n " + theComputer + " " - path = self.ComputerPath( theComputer ) -## if path != "" : -## rshstr = rshstr + path + "/../bin/salome/" -## else : -## rshstr = rshstr + os.getenv( "KERNEL_ROOT_DIR" ) + "/bin/" -# rshstr = rshstr + os.getenv( "PWD" ) + "/" - if theMPIContainerRoot == "MPIFactoryServer" : - rshstr = rshstr + "mpirun -np " + str(nbproc) + " " + path + "SALOME_MPIContainer " - else : - rshstr = rshstr + path + "SALOME_MPIContainerPy.py '" - rshstr = rshstr + theMPIContainer + " -" - omniORBcfg = os.getenv( "OMNIORB_CONFIG" ) -# omniORBcfg = os.getenv( "HOME" ) + "/.omniORB.cfg" - file = os.open( omniORBcfg , os.O_RDONLY ) - ORBInitRef = os.read(file,132) - if ORBInitRef[len(ORBInitRef)-1] == '\n' : - ORBInitRef,bsn = ORBInitRef.split('\n') - os.close( file ) - rshstr = rshstr + ORBInitRef - if theMPIContainerRoot == "MPIFactoryServerPy" : - rshstr = rshstr + "'" - rshstr = rshstr + " > /tmp/" + theMPIContainer + "_" - rshstr = rshstr + theComputer - rshstr = rshstr + ".log 2>&1 &" - os.system( rshstr ) - MESSAGE( "FindOrStartMPIContainer" + rshstr + " done" ) - else : - if theMPIContainer.find('Py') == -1 : - aMPIContainer = self.FindContainer( theComputer + "/" + "MPIFactoryServer_" + str(nbproc) ) - else : - aMPIContainer = self.FindContainer( theComputer + "/" + "MPIFactoryServerPy_" + str(nbproc) ) - aMPIContainer = aMPIContainer.start_impl( theMPIContainer ) - - count = 21 - while aMPIContainer is None : - time.sleep(1) - count = count - 1 - MESSAGE( str(count) + ". Waiting for " + theComputer + "/" + theMPIContainer ) - aMPIContainer = self.FindContainer( theComputer + "/" + theMPIContainer ) - if count == 0 : - return aMPIContainer - - return aMPIContainer - #os.system("rsh -n dm2s0017 /export/home/SALOME_ROOT/bin/runSession SALOME_Container -ORBInitRef NameService=corbaname::dm2s0017:1515") - - #------------------------------------------------------------------------- - - def FindOrLoadMPIComponent(self, MPIcontainerName, MPIcomponentName, nbproc): - - theComputer,theMPIContainerRoot = self.ContainerName( MPIcontainerName ) - theMPIContainer = theMPIContainerRoot + "_" + str(nbproc) - name = [CosNaming.NameComponent(theComputer,"dir"), - CosNaming.NameComponent(theMPIContainer,"dir"), - CosNaming.NameComponent(MPIcomponentName,"object")] - try: - obj = self._containerRootContext.resolve(name) - except CosNaming.NamingContext.NotFound, ex: - MESSAGE( "component " + MPIcomponentName + " not found, trying to load" ) - MPIcontainer = self.FindContainer(theComputer + "/" + theMPIContainer) - if MPIcontainer is None: - MESSAGE( "MPIcontainer " + theComputer + "/" + theMPIContainer + " not found in Naming Service, trying to start" ) - if (theMPIContainerRoot != "MPIFactoryServer") & (theMPIContainerRoot != "MPIFactoryServerPy") : - if theMPIContainer.find('Py') == -1 : - theMPIFactorycontainerRoot = "MPIFactoryServer" - theMPIFactorycontainer = theMPIFactorycontainerRoot + "_" + str(nbproc) - else : - theMPIFactorycontainerRoot = "MPIFactoryServerPy" - theMPIFactorycontainer = theMPIFactorycontainerRoot + "_" + str(nbproc) - MPIFactorycontainer = self.FindContainer(theComputer + "/" + theMPIFactorycontainer) - if MPIFactorycontainer is None: - MESSAGE( "MPIcontainer " + theComputer + "/" + theMPIFactorycontainer + " not found in Naming Service, trying to start" ) - MPIFactorycontainer = self.FindOrStartMPIContainer(theComputer,theMPIFactorycontainerRoot,nbproc) - else: - MPIFactorycontainer = self.FindOrStartMPIContainer(theComputer,theMPIContainerRoot,nbproc) - if MPIFactorycontainer != None : - MPIcontainer = self.FindOrStartMPIContainer(theComputer,theMPIContainerRoot,nbproc) - - if MPIcontainer != None: - compoinfo = self._catalog.GetComponent(MPIcomponentName) - if compoinfo is None: - MESSAGE( "MPIcomponent " + MPIcomponentName + " not found in Module Catalog" ) - else: - try: - machineName = theComputer - path = compoinfo.GetPathPrefix(machineName) + "/" - except SALOME_ModuleCatalog.NotFound, ex: - MESSAGE( "machine " + machineName + " not found in Module Catalog" ) - MESSAGE( "trying localhost" ) - try: - path = compoinfo.GetPathPrefix("localhost") + "/" - except SALOME_ModuleCatalog.NotFound, ex: - path = "" - implementation = path + "lib" + MPIcomponentName + "Engine.so" - MESSAGE( "Trying to load " + implementation ) - try: - MPIcomponent = MPIcontainer.load_impl(MPIcomponentName, implementation) - MESSAGE( "component " + MPIcomponent._get_instanceName() + " launched !" ) - return MPIcomponent - except: - MESSAGE( "component " + MPIcomponentName + " NOT launched !" ) - - else: - try: - MPIcomponent = obj._narrow(Engines.Component) - if MPIcomponent is None: - MESSAGE( MPIcomponentName + " is not a component !" ) - else: - MESSAGE( "MPIcomponent " + MPIcomponent._get_instanceName() + " found !" ) - return MPIcomponent - except: - MESSAGE( MPIcomponentName + " failure" ) - return None diff --git a/src/MPILifeCycleCORBA/MPIsalome.py b/src/MPILifeCycleCORBA/MPIsalome.py deleted file mode 100644 index 789641fd1..000000000 --- a/src/MPILifeCycleCORBA/MPIsalome.py +++ /dev/null @@ -1,5 +0,0 @@ -import salome -from MPILifeCycleCORBA import * - -# create an LifeCycleCORBA instance -lcc = MPILifeCycleCORBA(salome.orb) diff --git a/src/MPILifeCycleCORBA/Makefile.in b/src/MPILifeCycleCORBA/Makefile.in deleted file mode 100644 index ab76b0360..000000000 --- a/src/MPILifeCycleCORBA/Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ -#============================================================================== -# File : Makefile.in -# Created : lun jui 2 20:32:24 CEST 2001 -# Author : Paul RASCLE, EDF - Marc Tajchman, CEA -# Project : SALOME -# Copyright : EDF 2001 -# $Header$ -#============================================================================== - -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_HEADERS = SALOME_MPILifeCycleCORBA.hxx - -EXPORT_PYSCRIPTS = MPIsalome.py MPILifeCycleCORBA.py - -# Libraries targets - -LIB = libSalomeMPILifeCycleCORBA.la -LIB_SRC = SALOME_MPILifeCycleCORBA.cxx -LIB_CLIENT_IDL = SALOME_MPIObject.idl SALOME_MPIContainer.idl \ - SALOME_Component.idl SALOME_ModuleCatalog.idl - -# Executables targets -BIN = TestMPILifeCycleCORBA -BIN_SRC = -BIN_CLIENT_IDL = Logger.idl SALOME_MPIObject.idl SALOME_MPIContainer.idl SALOME_TestMPIComponent.idl - -LDFLAGS += -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace - -@CONCLUDE@ - diff --git a/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx b/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx deleted file mode 100644 index cfa9f4c77..000000000 --- a/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx +++ /dev/null @@ -1,357 +0,0 @@ -//============================================================================= -// File : SALOME_MPILifeCycleCORBA.cxx -// Created : mar jui 03 14:55:50 CEST 2003 -// Author : Bernard SECHER CEA -// Project : SALOME -// Copyright : CEA 2003 -// $Header$ -//============================================================================= - -#include -#include -#include -#include -#include -#include - -#include "OpUtil.hxx" -#include "utilities.h" - -#include - -#include "SALOME_MPILifeCycleCORBA.hxx" -#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog) -#include "SALOME_NamingService.hxx" -using namespace std; - -SALOME_MPILifeCycleCORBA::SALOME_MPILifeCycleCORBA() : - SALOME_LifeCycleCORBA() -{ - _MPIFactoryServer = NULL; -} - -SALOME_MPILifeCycleCORBA::SALOME_MPILifeCycleCORBA(SALOME_NamingService *ns) : - SALOME_LifeCycleCORBA(ns) -{ - _MPIFactoryServer = NULL; -} - -SALOME_MPILifeCycleCORBA::~SALOME_MPILifeCycleCORBA() -{ -} - -Engines::MPIContainer_var SALOME_MPILifeCycleCORBA::FindOrStartMPIContainer( - const string theComputer , - const string theMPIContainerRoot, - const int nbproc) -{ - char nbp[1024]; - - sprintf(nbp,"_%d",nbproc); - string theMPIContainer = theMPIContainerRoot + nbp; - string aComputerContainer = theComputer + "/" + theMPIContainer; - - SCRUTE( aComputerContainer ) ; - SCRUTE( theComputer ) ; - SCRUTE( theMPIContainer ) ; - - // On recherche si le containe rest deja lance - Engines::MPIContainer_var aMPIContainer = Engines::MPIContainer::_narrow(FindContainer(aComputerContainer.c_str())); - - //On a trouve le container: on renvoie une poigne dessus - if ( !CORBA::is_nil( aMPIContainer ) ) { - MESSAGE("MPIContainer " << aComputerContainer << " found!!!"); - return aMPIContainer ; - } - // On a pas trouve le container - else { - MESSAGE("MPIContainer " << aComputerContainer << " not found!!!"); - // On recherche un container generique - bool pyCont = false ; - int len = theMPIContainer.length() ; - if ( !strcmp( &theMPIContainerRoot.c_str()[len-2] , "Py" ) ) { - pyCont = true ; - } - string MPIFactoryServer = theComputer ; - if ( pyCont ) { - MPIFactoryServer += "/MPIFactoryServerPy" ; - } - else { - MPIFactoryServer += "/MPIFactoryServer" ; - } - MPIFactoryServer += nbp; - Engines::MPIContainer_var aMPIFactoryServer = Engines::MPIContainer::_narrow(FindContainer( MPIFactoryServer.c_str())); - - // On n'a pas trouve le container generique: on lance le container demande - if ( CORBA::is_nil( aMPIFactoryServer ) ) { -// rsh -n ikkyo /export/home/rahuel/SALOME_ROOT/bin/runSession SALOME_Container -ORBInitRef NameService=corbaname::dm2s0017:1515 & - string rsh( "" ) ; - if ( theComputer!= GetHostname() ) { - rsh += "rsh -n " ; - rsh += theComputer ; - rsh += " " ; - } - string path = ComputerPath( theComputer.c_str() ) ; - SCRUTE( path ) ; - // rsh += "runSession " ; - if ( pyCont ) { - MESSAGE("MPI python container not implemented"); - return Engines::MPIContainer::_nil(); -// rsh += "SALOME_MPIContainerPy.py " ; -// rsh += "MPIFactoryServerPy -" ; - } - else { - sprintf(nbp,"mpirun -np %d %sSALOME_MPIContainer ",nbproc,path.c_str()); - rsh += nbp; - rsh += theMPIContainer +" -" ; - } - string omniORBcfg( getenv( "OMNIORB_CONFIG" ) ) ; - ifstream omniORBfile( omniORBcfg.c_str() ) ; - char ORBInitRef[12] ; - char nameservice[132] ; - omniORBfile >> ORBInitRef ; - rsh += ORBInitRef ; - rsh += " " ; - omniORBfile >> nameservice ; - omniORBfile.close() ; - char * bsn = strchr( nameservice , '\n' ) ; - if ( bsn ) { - bsn[ 0 ] = '\0' ; - } - rsh += nameservice ; - if ( pyCont ) { - rsh += " > /tmp/MPIFactoryServerPy_" ; - } - else { - rsh += " > /tmp/MPIFactoryServer_" ; - } - sprintf(nbp,"%d_",nbproc); - rsh += nbp; - rsh += theComputer ; - rsh += ".log 2>&1 &" ; - SCRUTE( rsh ); - int status = system( rsh.c_str() ) ; - if (status == -1) { - INFOS("SALOME_MPILifeCycleCORBA::FindOrStartMPIContainer rsh failed (system command status -1)") ; - } - else if (status == 217) { - INFOS("SALOME_MPILifeCycleCORBA::FindOrStartContainer rsh failed (system command status 217)") ; - } - else { - int count = 21 ; - while ( CORBA::is_nil( aMPIFactoryServer ) && count ) { - sleep( 1 ) ; - count-- ; - if ( count != 10 ) - MESSAGE( count << ". Waiting for FactoryServer on " << theComputer) - aMPIFactoryServer = Engines::MPIContainer::_narrow(FindContainer( MPIFactoryServer.c_str())); - } - if ( CORBA::is_nil( aMPIFactoryServer ) ) { - INFOS("SALOME_MPILifeCycleCORBA::FindOrStartMPIContainer rsh failed") ; - } - else if ( strcmp( theComputer.c_str() , GetHostname().c_str() ) ) { - _MPIFactoryServer = aMPIFactoryServer ; - } - } - } - // On a trouve le container generique distant: on se sert de lui - // pour lancer un nouveau container MPI - // a revoir... - if ( !CORBA::is_nil( aMPIFactoryServer ) ) { - if ( strcmp( theMPIContainer.c_str() , "MPIFactoryServer" ) || - strcmp( theMPIContainer.c_str() , "MPIFactoryServerPy" ) ) { - MESSAGE("MPI Container not found ! trying to start " << aComputerContainer); - Engines::MPIContainer_var myMPIContainer = aMPIFactoryServer->start_MPIimpl( theMPIContainer.c_str(), nbproc ) ; - if ( !CORBA::is_nil( myMPIContainer ) ) { - MESSAGE("MPIContainer " << aComputerContainer << " started"); - return myMPIContainer ; - } - else { - MESSAGE("MPIContainer " << aComputerContainer << " NOT started"); - } - } - else { - MESSAGE("MPIContainer " << aComputerContainer << " started"); - return aMPIFactoryServer ; - } - } - } - return Engines::MPIContainer::_nil(); -} - -// Engines::Component_var SALOME_MPILifeCycleCORBA::FindOrLoad_MPIComponent -// (const char *MPIcontainerName, -// const char *MPIcomponentName, -// const char *implementation, -// const int nbproc) -// { -// BEGIN_OF("FindOrLoad_MPIComponent(1)"); -// ASSERT(_NS != NULL); -// string theComputer ; -// string theMPIContainer ; -// string theComputerContainer = ContainerName( MPIcontainerName , -// &theComputer , -// &theMPIContainer ) ; -// Engines::MPIContainer_var cont = FindOrStartMPIContainer( theComputerContainer , -// theComputer , -// theMPIContainer, -// nbproc) ; -// // ASSERT(!CORBA::is_nil(cont)); - -// string path( theComputerContainer ); -// path = path + "/"; -// path = path + MPIcomponentName; -// SCRUTE(path); -// try -// { -// CORBA::Object_var obj = _NS->Resolve(path.c_str()); -// if (CORBA::is_nil(obj)) -// { -// MESSAGE("MPIComponent not found ! trying to load " << path); -// Engines::Component_var compo -// = cont->load_impl(MPIcomponentName, implementation); -// // ASSERT(!CORBA::is_nil(compo)); -// MESSAGE("MPIComponent launched !" << path); -// return compo; -// } -// else -// { -// MESSAGE("MPIComponent found !" << path); -// Engines::Component_var compo = Engines::Component::_narrow(obj); -// // ASSERT(!CORBA::is_nil(compo)); -// try -// { -// compo->ping(); -// } -// catch (CORBA::COMM_FAILURE&) -// { -// INFOS("Caught CORBA::SystemException CommFailure. Engine " -// << path << "does not respond" ); -// } -// return compo; -// } -// } -// catch (ServiceUnreachable&) -// { -// INFOS("Caught exception: Naming Service Unreachable"); -// } -// catch (...) -// { -// INFOS("Caught unknown exception."); -// } -// return Engines::Component::_nil(); -// } - -Engines::Component_var SALOME_MPILifeCycleCORBA::FindOrLoad_MPIComponent - (const char *MPIcontainerName, - const char *MPIcomponentName, - const int nbproc) -{ - - char nbp[1024]; - - sprintf(nbp,"_%d",nbproc); -// BEGIN_OF("FindOrLoad_Component(2)"); - ASSERT(_NS != NULL); - string theComputer ; - string theMPIContainerRoot ; - string theMPIContainer; - string theComputerContainer = ContainerName( MPIcontainerName , - &theComputer , - &theMPIContainerRoot ) ; - theMPIContainer = theMPIContainerRoot + nbp; - Engines::MPIContainer_var cont = FindOrStartMPIContainer( theComputer , - theMPIContainerRoot, - nbproc ) ; - - if ( CORBA::is_nil( cont ) ) { - MESSAGE("MPIContainer not found ! " << theComputerContainer ); - return Engines::Component::_nil(); - } - -// char * machine = cont->machineName() ; - const char * machine = theComputer.c_str() ; - - string path( theComputerContainer ); - path += nbp; - path += "/"; - path += MPIcomponentName; - SCRUTE(path); - - try { - CORBA::Object_var obj = _NS->Resolve(path.c_str()); - if ( CORBA::is_nil( obj ) ) { - MESSAGE("MPIComponent not found ! trying to load " << path); - CORBA::Object_var obj2 = _NS->Resolve("/Kernel/ModulCatalog"); - SALOME_ModuleCatalog::ModuleCatalog_var Catalog = - SALOME_ModuleCatalog::ModuleCatalog::_narrow(obj2); - - SALOME_ModuleCatalog::Acomponent_ptr compoInfo = - Catalog->GetComponent(MPIcomponentName); - if (CORBA::is_nil (compoInfo)) - { - INFOS("Catalog Error : Component not found in the catalog") - return Engines::Component::_nil(); -// exit (-1); - } - - string path; - try - { - path = compoInfo->GetPathPrefix( machine ) ; - path += "/" ; - } - catch (SALOME_ModuleCatalog::NotFound&) - { - MESSAGE("GetPathPrefix(" << machine << ") not found!" - << "trying localhost"); - try { - path = compoInfo->GetPathPrefix("localhost") ; - path += "/" ; - } - catch (SALOME_ModuleCatalog::NotFound&) { - MESSAGE("GetPathPrefix(localhost) not found!") ; - path = "" ; - } - } - - SCRUTE(path); - string implementation(path); - implementation += "lib"; - implementation += MPIcomponentName; - implementation += "Engine.so"; - - Engines::Component_var compo - = cont->load_impl(MPIcomponentName, implementation.c_str()); - -// ASSERT(!CORBA::is_nil(compo)); -// MESSAGE("Component launched !" << path); - return compo; - } - else - { - MESSAGE("MPIComponent found !" << path); - Engines::Component_var compo = Engines::Component::_narrow(obj); - // ASSERT(!CORBA::is_nil(compo)); - try - { - string instanceName = compo->instanceName(); - } - catch (CORBA::COMM_FAILURE&) - { - INFOS("Caught CORBA::SystemException CommFailure. Engine " - << path << "does not respond" ); - } - return compo; - } - } - catch (ServiceUnreachable&) - { - INFOS("Caught exception: Naming Service Unreachable"); - } - catch (...) - { - INFOS("Caught unknown exception."); - } - return Engines::Component::_nil(); -} diff --git a/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.hxx b/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.hxx deleted file mode 100644 index dfac11034..000000000 --- a/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.hxx +++ /dev/null @@ -1,45 +0,0 @@ -//============================================================================= -// File : SALOME_MPILifeCycleCORBA.hxx -// Created : mar jui 03 14:55:45 CEST 2003 -// Author : Bernard SECHER, CEA -// Project : SALOME -// Copyright : CEA 2003 -// $Header$ -//============================================================================= - -#ifndef _SALOME_MPILIFECYCLECORBA_HXX_ -#define _SALOME_MPILIFECYCLECORBA_HXX_ - -#include -#include -#include - -#include -#include CORBA_CLIENT_HEADER(SALOME_MPIContainer) -#include "SALOME_LifeCycleCORBA.hxx" - -class SALOME_MPILifeCycleCORBA : public SALOME_LifeCycleCORBA -{ -public: - SALOME_MPILifeCycleCORBA(); - SALOME_MPILifeCycleCORBA(SALOME_NamingService *ns); - virtual ~SALOME_MPILifeCycleCORBA(); - -// Engines::Component_var FindOrLoad_MPIComponent(const char *MPIcontainerName, -// const char *MPIcomponentName, -// const char *implementationPath, -// const int nbproc); - Engines::Component_var FindOrLoad_MPIComponent(const char *MPIcontainerName, - const char *MPIcomponentName, - const int nbproc); -protected: - Engines::MPIContainer_var _MPIFactoryServer ; - -private: - Engines::MPIContainer_var FindOrStartMPIContainer(const string theComputer , - const string theMPIContainerRoot, - const int nbproc) ; - -} ; - -#endif diff --git a/src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx b/src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx deleted file mode 100644 index 9e2c5c160..000000000 --- a/src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx +++ /dev/null @@ -1,69 +0,0 @@ -// using namespace std; -//============================================================================= -// File : TestMPILifeCycleCORBA.cxx -// Created : mer jui 4 13:11:27 CEST 2003 -// Author : Bernard SECHER, 2003 -// Project : SALOME -// Copyright : CEA 2003 -// $Header$ -//============================================================================= - -#include "utilities.h" -#include -#include -#include -#include -#include CORBA_CLIENT_HEADER(SALOME_MPIContainer) -#include CORBA_CLIENT_HEADER(SALOME_TestMPIComponent) - -# include "Utils_ORB_INIT.hxx" -# include "Utils_SINGLETON.hxx" -#include "SALOME_NamingService.hxx" -#include "SALOME_MPILifeCycleCORBA.hxx" -#include "OpUtil.hxx" - -int main (int argc, char * argv[]) -{ - - try{ - // Initializing omniORB - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); - - // Obtain a reference to the root POA - CORBA::Object_var obj = orb->resolve_initial_references("RootPOA") ; - PortableServer::POA_var poa = PortableServer::POA::_narrow(obj) ; - - // Use Name Service to find container - SALOME_NamingService NS(orb); - - SALOME_MPILifeCycleCORBA LCC(&NS); - - Engines::Component_var comp = LCC.FindOrLoad_MPIComponent("MPIFactoryServer","TestMPIComponent",2); - - Engines::TestMPIComponent_var m1 = Engines::TestMPIComponent::_narrow(comp); - if(CORBA::is_nil(m1)){ - INFOS("echec recuperation poignee composant"); - } - else{ - - INFOS("Lancement de coucou"); - m1->Coucou(1L); - } - - orb->destroy(); - } - catch(CORBA::COMM_FAILURE& ex) { - INFOS("Caught system exception COMM_FAILURE -- unable to contact the object."); - } - catch(CORBA::SystemException&) { - INFOS("Caught a CORBA::SystemException."); - } - catch(CORBA::Exception&) { - INFOS("Caught CORBA::Exception."); - } - catch(...) { - INFOS("Caught unknown exception."); - } - - return 0; -} diff --git a/src/TestMPIContainer/Makefile.in b/src/TestMPIContainer/Makefile.in deleted file mode 100644 index 59ba1abad..000000000 --- a/src/TestMPIContainer/Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ -#============================================================================== -# File : Makefile.in -# Created : mer jui 04 12:58:13 CEST 2003 -# Author : Bernard SECHER, CEA -# Project : SALOME -# Copyright : CEA 2003 -# $Header$ -#============================================================================== - -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ - -EXPORT_PYSCRIPTS = - -EXPORT_HEADERS = TestMPIComponentEngine.hxx - -# Libraries targets - -LIB = libSalomeTestMPIComponentEngine.la -LIB_SRC = TestMPIComponentEngine.cxx -LIB_CLIENT_IDL = Logger.idl SALOME_MPIObject.idl SALOME_TestMPIComponent.idl - -# Executables targets -BIN = TestMPIContainer -BIN_SRC = -BIN_CLIENT_IDL = Logger.idl SALOME_MPIObject.idl SALOME_MPIContainer.idl SALOME_TestMPIComponent.idl -BIN_SERVER_IDL = - -LDFLAGS+= -lSalomeNotification -lSalomeNS -lSalomeMPILifeCycleCORBA -lSalomeLifeCycleCORBA -lSalomeMPIContainer -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace - - -@CONCLUDE@ diff --git a/src/TestMPIContainer/TestMPIComponentEngine.cxx b/src/TestMPIContainer/TestMPIComponentEngine.cxx deleted file mode 100644 index b0bf10b0c..000000000 --- a/src/TestMPIContainer/TestMPIComponentEngine.cxx +++ /dev/null @@ -1,77 +0,0 @@ -//============================================================================= -// File : TestMPIComponentEngine.cxx -// Created : mer jui 4 12:28:26 CEST 2003 -// Author : Bernard SECHER, 2003 -// Project : SALOME -// Copyright : CEA 2003 -// $Header$ -//============================================================================= - -#include "utilities.h" -#include "TestMPIComponentEngine.hxx" -using namespace std; - -TestMPIComponentEngine::TestMPIComponentEngine(int nbproc, int numproc, - CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - PortableServer::ObjectId * contId, - const char *instanceName, - const char *interfaceName, - bool regist) : - Engines_Component_i(orb, poa, contId, instanceName, interfaceName,true,regist), MPIObject_i(nbproc,numproc) -{ - MESSAGE("activate object") - _thisObj = this ; - _id = _poa->activate_object(_thisObj); -} - -TestMPIComponentEngine::TestMPIComponentEngine(): Engines_Component_i(), MPIObject_i() -{ -} - -TestMPIComponentEngine::~TestMPIComponentEngine() -{ -} - -void TestMPIComponentEngine::Coucou(CORBA::Long L) -{ - BEGIN_OF("[" << _numproc << "] TestMPIComponentEngine::Coucou()"); - if(_numproc==0) - for(int ip=1;ip<_nbproc;ip++) - Engines::TestMPIComponent::_narrow((*_tior)[ip])->SPCoucou(L); - MESSAGE("[" << _numproc << "] TestMPIComponentEngine : L = " << L); - END_OF("[" << _numproc << "] TestMPIComponentEngine::Coucou()"); -} - -void TestMPIComponentEngine::SPCoucou(CORBA::Long L) -{ - BEGIN_OF("[" << _numproc << "] TestMPIComponentEngine::SPCoucou()"); - MESSAGE("[" << _numproc << "] TestMPIComponentEngine : L = " << L); - END_OF("[" << _numproc << "] TestMPIComponentEngine::SPCoucou()"); -} - -extern "C" -{ - PortableServer::ObjectId * TestMPIComponentEngine_factory( - int nbproc, int numproc, - CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - PortableServer::ObjectId * contId, - const char *instanceName, - const char *interfaceName) - { - bool regist; - TestMPIComponentEngine * myTestMPIComponent; - MESSAGE("[" << numproc << "] PortableServer::ObjectId * TestMPIComponentEngine_factory()"); - SCRUTE(interfaceName); - if(numproc==0) - regist = true; - else - regist = false; - - myTestMPIComponent - = new TestMPIComponentEngine(nbproc,numproc,orb, poa, contId, instanceName, interfaceName,regist); - return myTestMPIComponent->getId() ; - } -} - diff --git a/src/TestMPIContainer/TestMPIComponentEngine.hxx b/src/TestMPIContainer/TestMPIComponentEngine.hxx deleted file mode 100644 index 4e520012a..000000000 --- a/src/TestMPIContainer/TestMPIComponentEngine.hxx +++ /dev/null @@ -1,40 +0,0 @@ -//============================================================================= -// File : TestMPIComponentEngine.hxx -// Created : mer jui 4 12:28:30 CEST 2003 -// Author : Bernard SECHER, CEA -// Project : SALOME -// Copyright : CEA 2003 -// $Header$ -//============================================================================= - -#ifndef _SALOME_TESTCOMPONENT_I_HXX_ -#define _SALOME_TESTCOMPONENT_I_HXX_ - -#include -#include -#include CORBA_SERVER_HEADER(SALOME_TestMPIComponent) -#include "SALOME_Component_i.hxx" -#include "MPIObject_i.hxx" - -class TestMPIComponentEngine: - public POA_Engines::TestMPIComponent, - public Engines_Component_i, public MPIObject_i -{ -public: - TestMPIComponentEngine(); - TestMPIComponentEngine(int nbproc, int numproc, - CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - PortableServer::ObjectId * contId, - const char *instanceName, - const char *interfaceName, - bool regist); - - virtual ~TestMPIComponentEngine(); - - void Coucou(CORBA::Long L); - void SPCoucou(CORBA::Long L); - -}; - -#endif diff --git a/src/TestMPIContainer/TestMPIContainer.cxx b/src/TestMPIContainer/TestMPIContainer.cxx deleted file mode 100644 index 3f753af5d..000000000 --- a/src/TestMPIContainer/TestMPIContainer.cxx +++ /dev/null @@ -1,134 +0,0 @@ -// using namespace std; -//============================================================================= -// File : TestMPIContainer.cxx -// Created : mer jui 4 13:11:27 CEST 2003 -// Author : Bernard SECHER, 2003 -// Project : SALOME -// Copyright : CEA 2003 -// $Header$ -//============================================================================= - -#include "utilities.h" -#include -#include -#include -#include -#include CORBA_CLIENT_HEADER(SALOME_MPIContainer) -#include CORBA_CLIENT_HEADER(SALOME_TestMPIComponent) - -# include "Utils_ORB_INIT.hxx" -# include "Utils_SINGLETON.hxx" -#include "SALOME_NamingService.hxx" -#include "OpUtil.hxx" - -int main (int argc, char * argv[]) -{ - - try{ - - int status; - - MESSAGE("COUCOU"); - if( argc != 3 || strcmp(argv[1],"-np") ){ - cout << "Usage: TestMPIContainer -np nbproc" << endl; - exit(0); - } - - // Initializing omniORB - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); - - // Obtain a reference to the root POA - CORBA::Object_var obj = orb->resolve_initial_references("RootPOA") ; - PortableServer::POA_var poa = PortableServer::POA::_narrow(obj) ; - - // Use Name Service to find container - SALOME_NamingService NS(orb) ; - string containerName = "/Containers/" ; - string hostName = GetHostname(); - containerName += hostName + "/MPIFactoryServer_" + argv[2]; - - MESSAGE(containerName); - - string dirn(getenv("KERNEL_ROOT_DIR")); - dirn += "/lib/salome/libSalomeTestMPIComponentEngine.so"; - MESSAGE(dirn.c_str()); - - // Try to resolve MPI Container - obj = NS.Resolve(containerName.c_str()) ; - Engines::Container_var iGenFact = Engines::Container::_narrow(obj); - - if(CORBA::is_nil(iGenFact)){ - - // Launch MPI Container - string cmd("mpirun -np "); - cmd += argv[2]; - cmd += " "; - cmd += getenv("KERNEL_ROOT_DIR"); - cmd += "/bin/salome/SALOME_MPIContainer MPIFactoryServer_"; - cmd += argv[2]; - cmd += " &"; - MESSAGE(cmd); - status = system(cmd.c_str()); - if (status == -1) { - INFOS("TestMPIContainer launch MPI Container failed (system command status -1)") ; - } - else if (status == 217) { - INFOS("TestMPIContainer launch MPI Container failed (system command status 217)") ; - } - - // Try to resolve MPI Container - int it = 0; - do{ - sleep(1); - obj = NS.Resolve(containerName.c_str()) ; - iGenFact = Engines::Container::_narrow(obj); - MESSAGE("Waiting for MPI Container " << containerName << " : it = " << it ); - }while( CORBA::is_nil(iGenFact) && (it++<15) ); - - } - - if(CORBA::is_nil(iGenFact)){ - MESSAGE("echec recuperation poignee container"); - exit(1); - } - - Engines::TestMPIComponent_var m1; - - for (int iter = 0; iter < 1 ; iter++){ - MESSAGE("----------------------------------------------------" << iter); - obj = iGenFact->load_impl("TestMPIComponent",dirn.c_str()); - - m1 = Engines::TestMPIComponent::_narrow(obj); - if(CORBA::is_nil(m1)){ - INFOS("echec recuperation poignee composant"); - } - else{ - - INFOS("recup m1"); - SCRUTE(m1->instanceName()); - INFOS("Lancement de coucou"); - m1->Coucou(1L); - INFOS("On remove le composant"); - iGenFact->remove_impl(m1) ; - sleep(5); - } - } - // Clean-up. - iGenFact->finalize_removal() ; - orb->destroy(); - } - catch(CORBA::COMM_FAILURE& ex) { - INFOS("Caught system exception COMM_FAILURE -- unable to contact the object."); - } - catch(CORBA::SystemException&) { - INFOS("Caught a CORBA::SystemException."); - } - catch(CORBA::Exception&) { - INFOS("Caught CORBA::Exception."); - } - catch(...) { - INFOS("Caught unknown exception."); - } - - return 0; -} -- 2.39.2