From 8d460095eb020326e642fd2021c1f613e785b744 Mon Sep 17 00:00:00 2001 From: prascle Date: Mon, 5 Dec 2005 08:03:19 +0000 Subject: [PATCH] PR: merge from branch BR_UT_V310a3 tag mergeto_trunk_05dec05 --- INSTALL | 2 +- Makefile.in | 3 +- bin/NSparam.py | 69 +++++++++ bin/VERSION | 2 +- bin/appliskel/README | 131 ++++++++++++++---- bin/appliskel/envd | 2 +- bin/appliskel/killCurrentPort | 35 +++++ bin/appliskel/runAppli | 58 +------- bin/appliskel/runConsole | 18 +-- bin/appliskel/runParam | 5 +- bin/appliskel/runRemote.sh | 18 +-- bin/appliskel/runSession | 31 ++--- bin/appliskel/runTests | 18 +-- bin/appliskel/searchFreePort.sh | 37 +++++ bin/appliskel/setAppliPath.sh | 17 +++ bin/killSalomeWithPort.py | 14 +- bin/runSalome.py | 6 + doc/SALOME_Application.txt | 12 +- salome_adm/unix/config_files/check_lam.m4 | 46 +++++- salome_adm/unix/config_files/check_qt.m4 | 4 +- salome_adm/unix/config_files/check_qwt.m4 | 4 +- src/Communication/ReceiverFactory.cxx | 3 + src/Communication/Receivers.hxx | 4 +- src/Communication/SALOME_Comm_i.cxx | 2 +- src/Communication/SALOME_Comm_i.hxx | 6 +- src/Communication/SenderFactory.cxx | 2 +- src/Communication_SWIG/libSALOME_Comm.i | 3 + src/Container/SALOME_Container.cxx | 8 +- src/Container/SALOME_ContainerManager.cxx | 48 ++++++- src/Container/SALOME_ContainerManager.hxx | 3 + src/MPIContainer/MPIContainer_i.cxx | 37 ++++- src/MPIContainer/MPIObject_i.cxx | 2 +- src/MPIContainer/SALOME_MPIContainer.cxx | 2 +- src/NamingService/SALOME_NamingService.cxx | 30 ++-- src/NamingService/SALOME_NamingServicePy.py | 4 +- src/NamingService/Test/NamingServiceTest.cxx | 9 ++ .../SALOME_ResourcesManager.cxx | 47 ++++++- .../SALOME_ResourcesManager.hxx | 4 +- src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx | 5 +- src/SALOMEDS/SALOME_DriverPy.py | 9 +- src/SALOMELocalTrace/LocalTraceBufferPool.cxx | 4 +- 41 files changed, 545 insertions(+), 219 deletions(-) create mode 100755 bin/NSparam.py create mode 100755 bin/appliskel/killCurrentPort create mode 100755 bin/appliskel/searchFreePort.sh create mode 100755 bin/appliskel/setAppliPath.sh diff --git a/INSTALL b/INSTALL index bf7c941f0..526e28e9f 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -This is the version 3.1.0a2 of KERNEL +This is the version 3.1.0b1 of KERNEL Previous versions : - 3.0.0 - 2.2.4 diff --git a/Makefile.in b/Makefile.in index 85ffaf022..42dedf940 100644 --- a/Makefile.in +++ b/Makefile.in @@ -41,7 +41,8 @@ salome.launch \ envSalome.py \ salomeConsole.py \ showNS.py \ -addToKillList.py +addToKillList.py \ +NSparam.py # copy header files in common directory OWN_CONFIG_H=@OWN_CONFIG_H@ diff --git a/bin/NSparam.py b/bin/NSparam.py new file mode 100755 index 000000000..721c6a0f9 --- /dev/null +++ b/bin/NSparam.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python + +import sys,os +import string + +def getNSparams(info=""): + """ + check environment for omniORB configuration file. + parse the file to find the line defining naming service host and port, + set environment variables NSPORT and NSHOST, + get host and port, + if info==host print host + elif info==port print host + else print 2 strings on stdout on one line: host port + """ + my_port="" + my_host="" + if os.environ.has_key("OMNIORB_CONFIG"): + file = open(os.environ["OMNIORB_CONFIG"], "r") + s = file.read() + while len(s): + l = string.split(s, ":") + if string.split(l[0], " ")[0] == "ORBInitRef" or \ + string.split(l[0], " ")[0] == "InitRef" : + my_port = l[len(l)-1] + if my_port[-1] == '\n': + my_port = my_port[:-1] + pass + my_host = l[len(l)-2] + break; + pass + s = file.read() + pass + pass + if info=='host': + # keep print, stdout used in shell + print my_host + os.environ['NSHOST']=my_host + return my_host + pass + elif info=='port': + # keep print, stdout used in shell + print my_port + os.environ['NSPORT']=my_port + return my_port + pass + else: + # keep print, stdout used in shell + print my_host, my_port + return my_host, my_port + pass + +# ------------------------------------------------------------------------ + +if __name__ == "__main__": + if len(sys.argv) >1: + if sys.argv[1]=='host': + getNSparams('host') + pass + elif sys.argv[1]=='port': + getNSparams('port') + pass + else: + getNSparams('') + pass + pass + else: + getNSparams('') + pass diff --git a/bin/VERSION b/bin/VERSION index 509227443..377576937 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - KERNEL VERSION: 3.1.0a2 +THIS IS SALOME - KERNEL VERSION: 3.1.0b1 diff --git a/bin/appliskel/README b/bin/appliskel/README index 264b879bc..f3f283cb8 100644 --- a/bin/appliskel/README +++ b/bin/appliskel/README @@ -1,42 +1,117 @@ +======================================= Set of scripts for a SALOME application ======================================= +*html version of this document is produced with docutils*:: + + rest2html < doc.txt > doc.html + +This document corresponds to SALOME2 3.1. (alpha version) + ++-------------------------------------------+ +| **WORK in PROGRESS, INCOMPLETE DOCUMENT** | ++-------------------------------------------+ + +SALOME Application concept +-------------------------- + +See SALOME_Application_ to define your own configuration of SALOME and run it +on one or several computers. This is the recommended way of configuration. + +.. _SALOME_Application: ../../doc/SALOME_Application.html + + +User run scripts +---------------- + +The SALOME user can use the following scripts: + +runAppli + Launches a SALOME Session + (similar to ${KERNEL_ROOT_DIR}/bin/salome/runSalome but with a different + name to avoid confusions). + +runSession + Launches a shell script in the SALOME application environment, with access + to the current SALOME session (naming service), if any. + Without arguments, the script is interactive. With arguments, the script + executes the command in the SALOME application environment. + +runConsole + Gives a python console connected to the current SALOME Session. + It is also possible to use runSession, then python. + +runTests + Similar to runSession, used for unit testing. runTests defines a new + configuration for naming service (new port number) to avoid interferences + with a running SALOME session. runSession tries to use an already existing + naming service definition from a running session (hostname & port number). + +killCurrentPort + Kills the last SALOME session corresponding to this application, and + intially launched from this computer. + Cleans associated config files. + +SALOME internal run scripts +--------------------------- + +envd + Sets SALOME application environment, envd is sourced by other scripts. + +setAppliPath.sh + Used by other scripts to define the Application Path. + +searchFreePort.sh + Used by other scripts to find a free port for naming service. + +For remote calls, SALOME uses one script. + +runRemote.sh + This script is mainly used to launch containers. The first 2 arguments + define the hostname and port userd for naming service, the remaining + arguments define the command to execute. + + +The following files must be adapted to your environment and SALOME Application +------------------------------------------------------------------------------ -# - A SALOME application distributed on several computers needs APPLI -# directories on the same path ($APPLI) relative to $HOME directory -# of the user, on each computer. +- CatalogResources.xml +- SalomeApp.xml +- env.d/atFirst.sh +- env.d/envProducts.sh +- env.d/envSalome.sh -user scripts: -------------- +CatalogRessources.xml + This files describes all the computer the application can use. The given + example is minimal and suppose ${APPLI} is the same relative path + to ${HOME}, on all the computers. A different directory can be set on a + particular computer with a line:: -runAppli : SALOME launch (idem runSalome but different name to avoid - confusion with ${KERNEL_ROOT_DIR}/bin/salome/runSalome + appliPath="my/specific/path/on/this/computer" -runConsole : a python console in the current SALOME session environment +SalomeApp.xml + This file is similar to the default given + in ${GUI_ROOT_DIR}/share/salome/resources -runSession : a shell in SALOME environment, either interactive (without args) - or used to run a program (defined by given args) -internal application scripts: ------------------------------ +Proposal for env.d scripts +~~~~~~~~~~~~~~~~~~~~~~~~~~ +Each user **must define** his own configuration for these scripts, following +the above rules. **The following is only an example not working as it is**. -runRemote.sh : called from remote computer, via ssh, rsh... - used for instance to create container +atFirst.sh + Sets the computer configuration not directly related to SALOME, + like useful tools, default PATH. -envd : sets SALOME application environment - sourced by other scripts +envProducts.sh + Sets the SALOME prerequisites. -The following files must be adapted to your environment and SALOME Application: -------------------------------------------------------------------------------- +envSALOME.sh + Sets all the MODULE_ROOT_DIR that can be used in the SALOME application. -SalomeApp.xml - list of modules, options on server launch and resources... -CatalogResources.xml - configuration of machines used in SALOME application - (no need of modules list and path here) + SalomeAppConfig is also defined by:: -env.d directory must contain the necessary files to source, to define -the SALOME Application environment : - ( envd script source these files in alphanumeric order ) + export SalomeAppConfig=${HOME}/${APPLI} -For instance, - atFirst.sh - general presets - envProducts.sh - prerequisite SALOME environment - envSalome.sh - list of MODULE_ROOT_DIR + where SalomeAppConfig designates the directory containing SalomeApp.xml. + Note that ${APPLI} is already defined by the calling scripts when + env.d/envSalome.sh is sourced. diff --git a/bin/appliskel/envd b/bin/appliskel/envd index 80261ada2..db31cbb1b 100644 --- a/bin/appliskel/envd +++ b/bin/appliskel/envd @@ -1,3 +1,3 @@ #!/bin/bash -for i in $1/env.d/*;do source ${i}; done +for i in $1/env.d/*.sh; do source ${i}; done diff --git a/bin/appliskel/killCurrentPort b/bin/appliskel/killCurrentPort new file mode 100755 index 000000000..bca506068 --- /dev/null +++ b/bin/appliskel/killCurrentPort @@ -0,0 +1,35 @@ +#!/bin/bash + +# --- retrieve APPLI path, relative to $HOME, set ${APPLI} + +. `dirname $0`/setAppliPath.sh + +# --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...) + +. ${HOME}/${APPLI}/envd ${HOME}/${APPLI} + +# --- find omniORB configuration relative to current session if any + +myhost=`hostname` +fileOmniConfig=${HOME}/${APPLI}/.omniORB_${myhost}_last.cfg + +if [ -f $fileOmniConfig ]; then + export OMNIORB_CONFIG=${HOME}/${APPLI}/.omniORB_${myhost}_last.cfg +fi + +currentPort=`${KERNEL_ROOT_DIR}/bin/salome/NSparam.py port` +echo $currentPort + +# --- kill current salome session + +${KERNEL_ROOT_DIR}/bin/salome/killSalomeWithPort.py $currentPort + +# --- delete config files + +if [ -s $fileOmniConfig ]; then + refConfig=`ls -l $fileOmniConfig | awk '{print \$NF}'` + if [ -f $refConfig ]; then + rm $refConfig + fi + rm $fileOmniConfig +fi diff --git a/bin/appliskel/runAppli b/bin/appliskel/runAppli index 700e669d4..1d86ad3d5 100755 --- a/bin/appliskel/runAppli +++ b/bin/appliskel/runAppli @@ -1,20 +1,8 @@ #!/bin/bash -# --- retrieve APPLI path, relative to $HOME -# on sarge, "which" gives not allways the absolute path... - -comName=`which $0` -aa=${comName:0:1} -if test x$aa == x\/; then - mycom=${comName} -elif test x$aa == x\.; then - mycom=${PWD}/${comName:2} -else - mycom=${PWD}/${comName} -fi -APPLI=`echo ${HOME} \`dirname $mycom\` | awk ' { print substr($2,length($1)+2) } '` -#echo $APPLI -export APPLI +# --- retrieve APPLI path, relative to $HOME, set ${APPLI} + +. `dirname $0`/setAppliPath.sh # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...) @@ -22,38 +10,8 @@ export APPLI # --- define port for CORBA naming service -searchFreePort() { - echo -n "Searching for a free port for naming service: " - export NSPORT=2810 - local limit=$NSPORT - let limit=limit+100 - while [ 1 ] - do - aRes=`netstat -ltn | grep -E :${NSPORT}` - if [ -z "$aRes" ]; then - echo ${NSPORT} - Ok - local myhost=`hostname` - export OMNIORB_CONFIG=${HOME}/${APPLI}/.omniORB_${myhost}_${NSPORT}.cfg - export NSPORT - export NSHOST=${myhost} - local initref="NameService=corbaname::"`hostname`":$NSPORT" - #echo "ORBInitRef $initref" > $OMNIORB_CONFIG - echo "InitRef = $initref" > $OMNIORB_CONFIG - export LAST_RUNNING_CONFIG=${HOME}/${APPLI}/.omniORB_${myhost}_last.cfg - rm ${LAST_RUNNING_CONFIG} - ln -s ${OMNIORB_CONFIG} ${LAST_RUNNING_CONFIG} - break - fi - echo -n "${NSPORT} " - if [[ $NSPORT -eq $limit ]] ; then - echo - echo "Can't find a free port to launch omniNames" - echo "Try to kill the running servers and then launch SALOME again." - exit - fi - let NSPORT=NSPORT+1 - done -} +. `dirname $0`/searchFreePort.sh +searchFreePort # --- if mpi lam, start lam (seems safe to be done several times) # arret manuel avec lamhalt @@ -66,13 +24,9 @@ fi # (default arguments defined in local salome.launch could be completed # by arguments to this command) -searchFreePort - if [ $# -ne 0 ] ; then ${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i ${KERNEL_ROOT_DIR}/bin/salome/runSalome.py $* - # --- todo delete omniORB config files in relation to the naming service kill - rm ${OMNIORB_CONFIG} - rm ${LAST_RUNNING_CONFIG} + else ${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python ${KERNEL_ROOT_DIR}/bin/salome/runSalome.py fi diff --git a/bin/appliskel/runConsole b/bin/appliskel/runConsole index e45f58611..caeabbdd6 100755 --- a/bin/appliskel/runConsole +++ b/bin/appliskel/runConsole @@ -1,20 +1,8 @@ #!/bin/bash -# --- retrieve APPLI path, relative to $HOME -# on sarge, "which" gives not allways the absolute path... - -comName=`which $0` -aa=${comName:0:1} -if test x$aa == x\/; then - mycom=${comName} -elif test x$aa == x\.; then - mycom=${PWD}/${comName:2} -else - mycom=${PWD}/${comName} -fi -APPLI=`echo ${HOME} \`dirname $mycom\` | awk ' { print substr($2,length($1)+2) } '` -#echo $APPLI -export APPLI +# --- retrieve APPLI path, relative to $HOME, set ${APPLI} + +. `dirname $0`/setAppliPath.sh # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...) diff --git a/bin/appliskel/runParam b/bin/appliskel/runParam index 17bbd618b..c858c670f 100755 --- a/bin/appliskel/runParam +++ b/bin/appliskel/runParam @@ -1,5 +1,6 @@ #!/bin/bash -./runAppli --killall +./KillCurrentPort + +./runAppli --logger -#./runSession killSalome.py diff --git a/bin/appliskel/runRemote.sh b/bin/appliskel/runRemote.sh index d3297a6c5..594616a07 100755 --- a/bin/appliskel/runRemote.sh +++ b/bin/appliskel/runRemote.sh @@ -21,21 +21,9 @@ # $3 and following : local command to execute, with args # -# --- retrieve APPLI path, relative to $HOME -# on sarge, "which" gives not allways the absolute path... - -comName=`which $0` -aa=${comName:0:1} -if test x$aa == x\/; then - mycom=${comName} -elif test x$aa == x\.; then - mycom=${PWD}/${comName:2} -else - mycom=${PWD}/${comName} -fi -APPLI=`echo ${HOME} \`dirname $mycom\` | awk ' { print substr($2,length($1)+2) } '` -#echo $APPLI -export APPLI +# --- retrieve APPLI path, relative to $HOME, set ${APPLI} + +. `dirname $0`/setAppliPath.sh # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...) diff --git a/bin/appliskel/runSession b/bin/appliskel/runSession index 2ab579ce6..22d3fdd0f 100755 --- a/bin/appliskel/runSession +++ b/bin/appliskel/runSession @@ -5,28 +5,27 @@ # Use it without args to run an interactive shell under Salome env # -# --- retrieve APPLI path, relative to $HOME -# on sarge, "which" gives not allways the absolute path... - -comName=`which $0` -aa=${comName:0:1} -if test x$aa == x\/; then - mycom=${comName} -elif test x$aa == x\.; then - mycom=${PWD}/${comName:2} -else - mycom=${PWD}/${comName} -fi -APPLI=`echo ${HOME} \`dirname $mycom\` | awk ' { print substr($2,length($1)+2) } '` -echo $APPLI -export APPLI +# --- retrieve APPLI path, relative to $HOME, set ${APPLI} + +. `dirname $0`/setAppliPath.sh # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...) . ${HOME}/${APPLI}/envd ${HOME}/${APPLI} +# --- set omniORB configuration to current session if any + myhost=`hostname` -export OMNIORB_CONFIG=${HOME}/${APPLI}/.omniORB_${myhost}_last.cfg +fileOmniConfig=${HOME}/${APPLI}/.omniORB_${myhost}_last.cfg + +if [ -f $fileOmniConfig ]; then + export OMNIORB_CONFIG=${HOME}/${APPLI}/.omniORB_${myhost}_last.cfg + + # --- set environment variables for port and hostname of NamingService + + export NSHOST=`${KERNEL_ROOT_DIR}/bin/salome/NSparam.py host` + export NSPORT=`${KERNEL_ROOT_DIR}/bin/salome/NSparam.py port` +fi # --- invoque shell with or without args diff --git a/bin/appliskel/runTests b/bin/appliskel/runTests index 6e625f0a0..755825d79 100755 --- a/bin/appliskel/runTests +++ b/bin/appliskel/runTests @@ -1,20 +1,8 @@ #!/bin/bash -# --- retrieve APPLI path, relative to $HOME -# on sarge, "which" gives not allways the absolute path... - -comName=`which $0` -aa=${comName:0:1} -if test x$aa == x\/; then - mycom=${comName} -elif test x$aa == x\.; then - mycom=${PWD}/${comName:2} -else - mycom=${PWD}/${comName} -fi -APPLI=`echo ${HOME} \`dirname $mycom\` | awk ' { print substr($2,length($1)+2) } '` -#echo $APPLI -export APPLI +# --- retrieve APPLI path, relative to $HOME, set ${APPLI} + +. `dirname $0`/setAppliPath.sh # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...) diff --git a/bin/appliskel/searchFreePort.sh b/bin/appliskel/searchFreePort.sh new file mode 100755 index 000000000..8108a93dc --- /dev/null +++ b/bin/appliskel/searchFreePort.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +# --- define port for CORBA naming service + +searchFreePort() { + echo -n "Searching for a free port for naming service: " + export NSPORT=2810 + local limit=$NSPORT + let limit=limit+100 + while [ 1 ] + do + aRes=`netstat -ltn | grep -E :${NSPORT}` + if [ -z "$aRes" ]; then + echo ${NSPORT} - Ok + local myhost=`hostname` + export OMNIORB_CONFIG=${HOME}/${APPLI}/.omniORB_${myhost}_${NSPORT}.cfg + export NSPORT + export NSHOST=${myhost} + local initref="NameService=corbaname::"`hostname`":$NSPORT" + #echo "ORBInitRef $initref" > $OMNIORB_CONFIG + echo "InitRef = $initref" > $OMNIORB_CONFIG + export LAST_RUNNING_CONFIG=${HOME}/${APPLI}/.omniORB_${myhost}_last.cfg + rm ${LAST_RUNNING_CONFIG} + ln -s ${OMNIORB_CONFIG} ${LAST_RUNNING_CONFIG} + break + fi + echo -n "${NSPORT} " + if [[ $NSPORT -eq $limit ]] ; then + echo + echo "Can't find a free port to launch omniNames" + echo "Try to kill the running servers and then launch SALOME again." + exit + fi + let NSPORT=NSPORT+1 + done +} + diff --git a/bin/appliskel/setAppliPath.sh b/bin/appliskel/setAppliPath.sh new file mode 100755 index 000000000..d9361ae52 --- /dev/null +++ b/bin/appliskel/setAppliPath.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# --- retrieve APPLI path, relative to $HOME, set ${APPLI} +# on sarge, "which" gives not allways the absolute path... + +comName=`which $0` +aa=${comName:0:1} +if test x$aa == x\/; then + mycom=${comName} +elif test x$aa == x\.; then + mycom=${PWD}/${comName:2} +else + mycom=${PWD}/${comName} +fi +APPLI=`echo ${HOME} \`dirname $mycom\` | awk ' { print substr($2,length($1)+2) } '` +#echo $APPLI +export APPLI diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py index 404c9ef8f..e52a25f88 100755 --- a/bin/killSalomeWithPort.py +++ b/bin/killSalomeWithPort.py @@ -3,16 +3,16 @@ import os, sys, pickle, signal, commands def getPiDict(port,appname='salome',full=True): from Utils_Identity import getShortHostName - - if os.getenv("HOSTNAME") == None: - if os.getenv("HOST") == None: - os.environ["HOSTNAME"]=getShortHostName() - else: - os.environ["HOSTNAME"]=os.getenv("HOST") + + host = os.getenv("HOSTNAME") + if not host: + host = os.getenv("HOST") + if not host: + host = getShortHostName() filedict = [] filedict.append( os.getenv('USER') ) # user name - filedict.append( os.getenv('HOSTNAME') ) # host name + filedict.append( host ) # host name filedict.append( str(port) ) # port number filedict.append( appname.upper() ) # application name filedict.append( 'pidict' ) # constant part diff --git a/bin/runSalome.py b/bin/runSalome.py index 94e17db92..c4773d189 100755 --- a/bin/runSalome.py +++ b/bin/runSalome.py @@ -408,6 +408,11 @@ class SessionServer(Server): self.SCMD2+=['GUI'] if self.args['splash']: self.SCMD2+=['SPLASH'] + if self.args.has_key('modules'): + self.SCMD2+=['--modules ('] + for mod in self.args['modules']: + self.SCMD2+=[mod + ':'] + self.SCMD2+=[')'] def setpath(self,modules_list,modules_root_dir): cata_path=[] @@ -610,6 +615,7 @@ def startSalome(args, modules_list, modules_root_dir): # # Lancement Session Server # + mySessionServ = SessionServer(args) mySessionServ.setpath(modules_list,modules_root_dir) mySessionServ.run() diff --git a/doc/SALOME_Application.txt b/doc/SALOME_Application.txt index ef4205242..590bf2c8f 100644 --- a/doc/SALOME_Application.txt +++ b/doc/SALOME_Application.txt @@ -115,7 +115,7 @@ envSALOME.sh where SalomeAppConfig designates the directory containing SalomeApp.xml. Note that ${APPLI} is already defined by the calling scripts when - envSALOME.sh is sourced. + env.d/envSalome.sh is sourced. 2.2 User run scripts ~~~~~~~~~~~~~~~~~~~~ @@ -143,8 +143,11 @@ runTests and port number), runTests defines a new configuration for naming service (new port number). -2.3 SALOME internal run script -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +2.3 SALOME internal run scripts +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +envd + Sets SALOME application environment, envd is sourced by other scripts. For remote calls, SALOME uses one script. @@ -157,7 +160,8 @@ runRemote.sh ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SalomeApp.xml - This file is similar to the default given in $GUI_ROOT_DIR + This file is similar to the default given + in ${GUI_ROOT_DIR}/share/salome/resources CatalogRessources.xml This files describes all the computer the application can use. The given diff --git a/salome_adm/unix/config_files/check_lam.m4 b/salome_adm/unix/config_files/check_lam.m4 index bde79d7e6..ae21b56fe 100644 --- a/salome_adm/unix/config_files/check_lam.m4 +++ b/salome_adm/unix/config_files/check_lam.m4 @@ -59,17 +59,51 @@ if test "$WITHLAM" = yes; then LIBS_old="$LIBS" LDFLAGS_old="$LDFLAGS" LDFLAGS="$MPI_LIBS $LDFLAGS" - AC_CHECK_LIB(lam,lam_mp_init,,WITHLAM="no") - AC_CHECK_LIB(mpi,MPI_Init,WITHLAM="yes",WITHLAM="no") - AC_CHECK_LIB(mpi,MPI_Publish_name,WITHMPI2="yes",WITHMPI2="no") - LDFLAGS="$LDFLAGS_old" - LIBS="$LIBS_old" + fi + + if test "$WITHLAM" = "yes";then + WITHLAM="no" + + if test "$WITHLAM" = "no";then + CPPFLAGS="$MPI_INCLUDES $CPPFLAGS" + LIBS="$LIBS -lmpi++" + AC_TRY_LINK([ + #include + ], [int argc=0; char **argv=0; MPI_Init(&argc,&argv);], + WITHLAM="yes",WITHLAM="no") + if test "$WITHLAM" = "yes";then + MPI_LIBS="$MPI_LIBS -lmpi++" + fi + LIBS="$LIBS_old" + CPPFLAGS="$CPPFLAGS_old" + + AC_CHECK_LIB(mpi++,MPI_Publish_name,WITHMPI2="yes",WITHMPI2="no") + LDFLAGS="$LDFLAGS_old" + LIBS="$LIBS_old" + fi + + if test "$WITHLAM" = "no";then + AC_CHECK_LIB(lam,lam_mp_init,WITHLAM="yes",WITHLAM="no") + if test "$WITHLAM" = "yes";then + MPI_LIBS="$MPI_LIBS -llam" + LIBS="$LIBS -llam" + fi + + AC_CHECK_LIB(mpi,MPI_Init,WITHLAM="yes",WITHLAM="no") + if test "$WITHLAM" = "yes";then + MPI_LIBS="$MPI_LIBS -lmpi" + fi + + AC_CHECK_LIB(mpi,MPI_Publish_name,WITHMPI2="yes",WITHMPI2="no") + LDFLAGS="$LDFLAGS_old" + LIBS="$LIBS_old" + fi fi if test "$WITHLAM" = "yes";then WITHMPI="yes" mpi_ok=yes - MPI_LIBS="$MPI_LIBS -llammpi++" + CPPFLAGS="-DWITHLAM $CPPFLAGS" else mpi_ok=no fi diff --git a/salome_adm/unix/config_files/check_qt.m4 b/salome_adm/unix/config_files/check_qt.m4 index 3faa1e990..ab2869c21 100644 --- a/salome_adm/unix/config_files/check_qt.m4 +++ b/salome_adm/unix/config_files/check_qt.m4 @@ -104,8 +104,8 @@ then AC_MSG_RESULT(QTDIR environment variable may be wrong) else AC_MSG_RESULT(yes) - QT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT" - QT_MT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT" + QT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE" + QT_MT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE" fi fi diff --git a/salome_adm/unix/config_files/check_qwt.m4 b/salome_adm/unix/config_files/check_qwt.m4 index f1b456dda..5803c5e92 100644 --- a/salome_adm/unix/config_files/check_qwt.m4 +++ b/salome_adm/unix/config_files/check_qwt.m4 @@ -90,7 +90,7 @@ then else LIBS="$LIBS -L$QTDIR/lib -lqt-mt" fi - if test "x$QWTHOME" = "x/usr/lib" + if test "x$QWTHOME" = "x/usr" then LIBS="$LIBS -lqwt" else @@ -120,7 +120,7 @@ then AC_MSG_RESULT(QWTHOME environment variable may be wrong) else QWT_INCLUDES="-I$QWT_INCLUDES" - if test "x$QWTHOME" = "x/usr/lib" + if test "x$QWTHOME" = "x/usr" then QWT_LIBS=" -lqwt" else diff --git a/src/Communication/ReceiverFactory.cxx b/src/Communication/ReceiverFactory.cxx index 1a2bd9125..94e52b256 100644 --- a/src/Communication/ReceiverFactory.cxx +++ b/src/Communication/ReceiverFactory.cxx @@ -1,3 +1,6 @@ +#ifdef HAVE_MPI2 +#include "mpi.h" +#endif #include "ReceiverFactory.hxx" #include "Receivers.hxx" using namespace std; diff --git a/src/Communication/Receivers.hxx b/src/Communication/Receivers.hxx index c4309b754..c02d9fffc 100644 --- a/src/Communication/Receivers.hxx +++ b/src/Communication/Receivers.hxx @@ -1,11 +1,11 @@ #ifndef _RECEIVERS_HXX_ #define _RECEIVERS_HXX_ -#include "SALOME_Comm_i.hxx" -#include "Receiver.hxx" #ifdef HAVE_MPI2 #include "mpi.h" #endif +#include "SALOME_Comm_i.hxx" +#include "Receiver.hxx" /*! Receiver used for transfert with CORBA when no copy is required remotely and locally. diff --git a/src/Communication/SALOME_Comm_i.cxx b/src/Communication/SALOME_Comm_i.cxx index 71fbdadf8..7eb8513f7 100644 --- a/src/Communication/SALOME_Comm_i.cxx +++ b/src/Communication/SALOME_Comm_i.cxx @@ -1,7 +1,7 @@ +#include "SALOME_Comm_i.hxx" #ifndef WNT #include #endif -#include "SALOME_Comm_i.hxx" #include "poa.h" #include "omnithread.h" #include "Utils_SINGLETON.hxx" diff --git a/src/Communication/SALOME_Comm_i.hxx b/src/Communication/SALOME_Comm_i.hxx index f7f196c62..1a8507ab0 100644 --- a/src/Communication/SALOME_Comm_i.hxx +++ b/src/Communication/SALOME_Comm_i.hxx @@ -1,12 +1,12 @@ #ifndef _SALOME_COMM_I_HXX_ #define _SALOME_COMM_I_HXX_ -#include -#include -#include CORBA_SERVER_HEADER(SALOME_Comm) #ifdef HAVE_MPI2 #include "mpi.h" #endif +#include +#include +#include CORBA_SERVER_HEADER(SALOME_Comm) #define TIMEOUT 20 diff --git a/src/Communication/SenderFactory.cxx b/src/Communication/SenderFactory.cxx index 04f8056d0..ef1e956e0 100644 --- a/src/Communication/SenderFactory.cxx +++ b/src/Communication/SenderFactory.cxx @@ -1,7 +1,7 @@ +#include "SALOME_Comm_i.hxx" #include "SenderFactory.hxx" #include "utilities.h" #include "SALOMEMultiComm.hxx" -#include "SALOME_Comm_i.hxx" using namespace std; #ifdef COMP_CORBA_DOUBLE diff --git a/src/Communication_SWIG/libSALOME_Comm.i b/src/Communication_SWIG/libSALOME_Comm.i index 42d4d5a3e..e96cc3eb0 100644 --- a/src/Communication_SWIG/libSALOME_Comm.i +++ b/src/Communication_SWIG/libSALOME_Comm.i @@ -2,6 +2,9 @@ %{ #include "ReceiverFactory.hxx" + #undef SEEK_SET + #undef SEEK_CUR + #undef SEEK_END #include "SALOME_Comm_i.hxx" %} diff --git a/src/Container/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx index f6f1884ff..a97bb39dc 100644 --- a/src/Container/SALOME_Container.cxx +++ b/src/Container/SALOME_Container.cxx @@ -26,6 +26,10 @@ // Module : SALOME // $Header$ +#ifdef HAVE_MPI2 +#include +#endif + #include #include #include @@ -46,10 +50,6 @@ #include #endif -#ifdef HAVE_MPI2 -#include -#endif - #include "Container_init_python.hxx" using namespace std; diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx index b7a3c708e..7e19bed50 100644 --- a/src/Container/SALOME_ContainerManager.cxx +++ b/src/Container/SALOME_ContainerManager.cxx @@ -29,6 +29,7 @@ SALOME_ContainerManager::SALOME_ContainerManager(CORBA::ORB_ptr orb) MESSAGE("constructor"); _NS = new SALOME_NamingService(orb); _ResManager = new SALOME_ResourcesManager(orb); + _id=0; PortableServer::POA_var root_poa = PortableServer::POA::_the_root_poa(); PortableServer::POAManager_var pman = root_poa->the_POAManager(); PortableServer::POA_var my_poa; @@ -118,6 +119,10 @@ SALOME_ContainerManager:: FindOrStartContainer(const Engines::MachineParameters& params, const Engines::MachineList& possibleComputers) { + long id; + string containerNameInNS; + char idc[3*sizeof(long)]; + Engines::Container_ptr ret = FindContainer(params,possibleComputers); if(!CORBA::is_nil(ret)) return ret; @@ -128,6 +133,15 @@ FindOrStartContainer(const Engines::MachineParameters& params, string theMachine=_ResManager->FindBest(possibleComputers); MESSAGE("try to launch it on " << theMachine); + // Get Id for container: a parallel container registers in Naming Service + // on the machine where is process 0. ContainerManager does'nt know the name + // of this machine before the launch of the parallel container. So to get + // the IOR of the parallel container in Naming Service, ContainerManager + // gives a unique Id. The parallel container registers his name under + // /ContainerManager/Id directory in NamingService + + id = GetIdForContainer(); + string command; if(theMachine=="") { @@ -137,11 +151,11 @@ FindOrStartContainer(const Engines::MachineParameters& params, } else if(theMachine==GetHostname()) { - command=_ResManager->BuildCommandToLaunchLocalContainer(params); + command=_ResManager->BuildCommandToLaunchLocalContainer(params,id); } else command = - _ResManager->BuildCommandToLaunchRemoteContainer(theMachine,params); + _ResManager->BuildCommandToLaunchRemoteContainer(theMachine,params,id); _ResManager->RmTmpFile(); int status=system(command.c_str()); @@ -170,8 +184,15 @@ FindOrStartContainer(const Engines::MachineParameters& params, count-- ; if ( count != 10 ) MESSAGE( count << ". Waiting for FactoryServer on " << theMachine); - string containerNameInNS = - _NS->BuildContainerNameForNS(params,theMachine.c_str()); + if(params.isMPI) + { + containerNameInNS = "/ContainerManager/id"; + sprintf(idc,"%ld",id); + containerNameInNS += idc; + } + else + containerNameInNS = + _NS->BuildContainerNameForNS(params,theMachine.c_str()); SCRUTE(containerNameInNS); CORBA::Object_var obj = _NS->Resolve(containerNameInNS.c_str()); ret=Engines::Container::_narrow(obj); @@ -273,3 +294,22 @@ FindContainer(const Engines::MachineParameters& params, MESSAGE("FindContainer: not found"); return Engines::Container::_nil(); } + +//============================================================================= +/*! + * Get Id for container: a parallel container registers in Naming Service + * on the machine where is process 0. ContainerManager does'nt know the name + * of this machine before the launch of the parallel container. So to get + * the IOR of the parallel container in Naming Service, ContainerManager + * gives a unique Id. The parallel container registers his name under + * /ContainerManager/Id directory in NamingService + */ +//============================================================================= + + +long SALOME_ContainerManager::GetIdForContainer(void) +{ + _id++; + return _id; +} + diff --git a/src/Container/SALOME_ContainerManager.hxx b/src/Container/SALOME_ContainerManager.hxx index f8311e9f7..1217db07b 100644 --- a/src/Container/SALOME_ContainerManager.hxx +++ b/src/Container/SALOME_ContainerManager.hxx @@ -58,6 +58,9 @@ private: FindContainer(const Engines::MachineParameters& params, const char *theMachine); + long GetIdForContainer(void); + long _id; + SALOME_ResourcesManager *_ResManager; SALOME_NamingService *_NS; }; diff --git a/src/MPIContainer/MPIContainer_i.cxx b/src/MPIContainer/MPIContainer_i.cxx index 3b97ad793..872c32d95 100644 --- a/src/MPIContainer/MPIContainer_i.cxx +++ b/src/MPIContainer/MPIContainer_i.cxx @@ -45,25 +45,52 @@ Engines_MPIContainer_i::Engines_MPIContainer_i(int nbproc, int numproc, int argc, char *argv[]) : Engines_Container_i(orb,poa,containerName,argc,argv,false), MPIObject_i(nbproc,numproc) { + long id=0; + string IdContainerinNS; + char idc[3*sizeof(long)]; + MESSAGE("[" << numproc << "] activate object"); _id = _poa->activate_object(this); -// this->_add_ref(); + + if(argc>1) + { + for(int i=0;i::Instance() ; -// ASSERT(SINGLETON_::IsAlreadyExisting()) ; _NS->init_orb( CORBA::ORB::_duplicate(_orb) ) ; -// Engines::Container_ptr pCont -// = Engines::Container::_narrow(POA_Engines::MPIContainer::_this()); CORBA::Object_var obj=_poa->id_to_reference(*_id); Engines::Container_var pCont = Engines::Container::_narrow(obj); + string hostname = GetHostname(); _containerName = _NS->BuildContainerNameForNS(containerName,hostname.c_str()); SCRUTE(_containerName); _NS->Register(pCont, _containerName.c_str()); + + // A parallel container registers in Naming Service + // on the machine where is process 0. ContainerManager does'nt know the name + // of this machine before the launch of the parallel container. So to get + // the IOR of the parallel container in Naming Service, ContainerManager + // gives a unique Id. The parallel container registers his name under + // /ContainerManager/Id directory in NamingService + + IdContainerinNS = "/ContainerManager/id"; + sprintf(idc,"%ld",id); + IdContainerinNS += idc; + SCRUTE(IdContainerinNS); + _NS->Register(pCont, IdContainerinNS.c_str()); + } // Root recupere les ior des container des autre process diff --git a/src/MPIContainer/MPIObject_i.cxx b/src/MPIContainer/MPIObject_i.cxx index 0da19e33c..ab6e1a386 100644 --- a/src/MPIContainer/MPIObject_i.cxx +++ b/src/MPIContainer/MPIObject_i.cxx @@ -24,9 +24,9 @@ // File : MPIObject_i.cxx // Module : SALOME +#include #include "MPIObject_i.hxx" #include "utilities.h" -#include using namespace std; MPIObject_i::MPIObject_i() diff --git a/src/MPIContainer/SALOME_MPIContainer.cxx b/src/MPIContainer/SALOME_MPIContainer.cxx index bf2322190..3932ff3d4 100644 --- a/src/MPIContainer/SALOME_MPIContainer.cxx +++ b/src/MPIContainer/SALOME_MPIContainer.cxx @@ -1,9 +1,9 @@ +#include #include #include "MPIContainer_i.hxx" #include "Utils_ORB_INIT.hxx" #include "Utils_SINGLETON.hxx" #include "utilities.h" -#include #include "SALOMETraceCollector.hxx" using namespace std; diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx index a13dd52d4..e0ad5fcd5 100644 --- a/src/NamingService/SALOME_NamingService.cxx +++ b/src/NamingService/SALOME_NamingService.cxx @@ -543,6 +543,16 @@ SALOME_NamingService::ResolveComponent(const char* hostname, for (unsigned int ind = 0; ind < contList.size(); ind++) { name = contList[ind].c_str(); + + if ( nbproc >= 1 ) + { + char *str_nbproc = new char[8]; + sprintf(str_nbproc, "_%d", nbproc); + if( strstr(name.c_str(),str_nbproc) == NULL) + continue; // check only containers with _%d in name + delete [] str_nbproc; + } + name += "/"; name += componentName; SCRUTE(name); @@ -1458,15 +1468,17 @@ throw(ServiceUnreachable) void SALOME_NamingService::Destroy_FullDirectory(const char* Path) throw(ServiceUnreachable) { - Change_Directory(Path); - vector contList = list_directory(); - - for (unsigned int ind = 0; ind < contList.size(); ind++) - Destroy_Name(contList[ind].c_str()); - - Destroy_Directory(Path); + if( Change_Directory(Path) ) + { + vector contList = list_directory(); - Destroy_Name(Path); + for (unsigned int ind = 0; ind < contList.size(); ind++) + Destroy_Name(contList[ind].c_str()); + + Destroy_Directory(Path); + + Destroy_Name(Path); + } } // ============================================================================ @@ -1543,7 +1555,7 @@ SALOME_NamingService::_createContextNameDir(string path, if (endIdx == string::npos) endIdx = path.length(); int lsub = endIdx - begIdx; - if (lsub > 1) + if (lsub >= 1) splitPath.push_back(path.substr(begIdx, lsub)); begIdx = path.find_first_not_of(delims, endIdx); } diff --git a/src/NamingService/SALOME_NamingServicePy.py b/src/NamingService/SALOME_NamingServicePy.py index ab7f2050d..8c36cf018 100644 --- a/src/NamingService/SALOME_NamingServicePy.py +++ b/src/NamingService/SALOME_NamingServicePy.py @@ -50,7 +50,7 @@ class SALOME_NamingServicePy_i: self._orb = orb # initialize root context and current context ok = 0 - steps = 40 + steps = 240 while steps > 0 and ok == 0: try: obj =self._orb.resolve_initial_references("NameService") @@ -68,7 +68,7 @@ class SALOME_NamingServicePy_i: MESSAGE(" Name service not found") time.sleep(0.25) steps = steps - 1 - if steps == 0: + if steps == 0 and self._root_context is None: MESSAGE ( "Name Service Reference is invalid" ) sys.exit(1) #------------------------------------------------------------------------- diff --git a/src/NamingService/Test/NamingServiceTest.cxx b/src/NamingService/Test/NamingServiceTest.cxx index 2d4d5d948..deedb2b61 100644 --- a/src/NamingService/Test/NamingServiceTest.cxx +++ b/src/NamingService/Test/NamingServiceTest.cxx @@ -273,6 +273,15 @@ NamingServiceTest::testRegisterResolveAbsWithPath() NSTEST::echo_var anEchoRef1a = NSTEST::echo::_narrow(obj); CPPUNIT_ASSERT(!CORBA::is_nil(anEchoRef1a)); CPPUNIT_ASSERT(anEchoRef1->getId() == anEchoRef1a->getId()); + + NSTEST::echo_var anEchoRef2 = myFactory->createInstance(); + _NS.Register(anEchoRef2,"/nstest2/1/2/3/4/echo_1"); + + obj = _NS.Resolve("/nstest2/1/2/3/4/echo_1"); + CPPUNIT_ASSERT(!CORBA::is_nil(obj)); + NSTEST::echo_var anEchoRef2a = NSTEST::echo::_narrow(obj); + CPPUNIT_ASSERT(!CORBA::is_nil(anEchoRef2a)); + CPPUNIT_ASSERT(anEchoRef2->getId() == anEchoRef2a->getId()); } // ============================================================================ diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx index 26f9d2de7..3e4ffc748 100644 --- a/src/ResourcesManager/SALOME_ResourcesManager.cxx +++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx @@ -357,10 +357,12 @@ bool isPythonContainer(const char* ContainerName) string SALOME_ResourcesManager::BuildCommandToLaunchRemoteContainer (const string& machine, - const Engines::MachineParameters& params) + const Engines::MachineParameters& params, const long id) { string command; - + int nbproc; + char idc[3*sizeof(long)]; + if ( ! _isAppliSalomeDefined ) command = BuildTempFileToLaunchRemoteContainer(machine, params); @@ -370,8 +372,6 @@ SALOME_ResourcesManager::BuildCommandToLaunchRemoteContainer if (params.isMPI) { - int nbproc; - if ( (params.nb_node <= 0) && (params.nb_proc_per_node <= 0) ) nbproc = 1; else if ( params.nb_node == 0 ) @@ -418,9 +418,33 @@ SALOME_ResourcesManager::BuildCommandToLaunchRemoteContainer ASSERT(getenv("NSPORT")); command += getenv("NSPORT"); // port of CORBA name server - command += " SALOME_Container "; + if(params.isMPI) + { + command += " mpirun -np "; + std::ostringstream o; + o << nbproc << " "; + command += o.str(); +#ifdef WITHLAM + command += "-x PATH,LD_LIBRARY_PATH,OMNIORB_CONFIG,SALOME_trace "; +#endif + command += " SALOME_MPIContainer "; + } + else + command += " SALOME_Container "; + + command += _NS->ContainerName(params); + command += " -id "; + sprintf(idc,"%ld",id); + command += idc; + command += " -"; + AddOmninamesParams(command); + command += " > /tmp/"; command += _NS->ContainerName(params); - command += "&"; + command += "_"; + command += GetHostname(); + command += "_"; + command += getenv( "USER" ) ; + command += ".log 2>&1 &" ; MESSAGE("command =" << command); } @@ -437,11 +461,12 @@ SALOME_ResourcesManager::BuildCommandToLaunchRemoteContainer string SALOME_ResourcesManager::BuildCommandToLaunchLocalContainer -(const Engines::MachineParameters& params) +(const Engines::MachineParameters& params, const long id) { _TmpFileName = ""; string command; int nbproc = 0; + char idc[3*sizeof(long)]; if (params.isMPI) { @@ -461,7 +486,9 @@ SALOME_ResourcesManager::BuildCommandToLaunchLocalContainer o << nbproc << " "; command += o.str(); +#ifdef WITHLAM command += "-x PATH,LD_LIBRARY_PATH,OMNIORB_CONFIG,SALOME_trace "; +#endif if (isPythonContainer(params.container_name)) command += "pyMPI SALOME_ContainerPy.py "; @@ -478,6 +505,9 @@ SALOME_ResourcesManager::BuildCommandToLaunchLocalContainer } command += _NS->ContainerName(params); + command += " -id "; + sprintf(idc,"%ld",id); + command += idc; command += " -"; AddOmninamesParams(command); command += " > /tmp/"; @@ -771,6 +801,9 @@ SALOME_ResourcesManager::BuildTempFileToLaunchRemoteContainer std::ostringstream o; tempOutputFile << nbproc << " "; +#ifdef WITHLAM + tempOutputFile << "-x PATH,LD_LIBRARY_PATH,OMNIORB_CONFIG,SALOME_trace "; +#endif } tempOutputFile << (*(resInfo.ModulesPath.find("KERNEL"))).second diff --git a/src/ResourcesManager/SALOME_ResourcesManager.hxx b/src/ResourcesManager/SALOME_ResourcesManager.hxx index 029c9fa9e..b41e0d24a 100644 --- a/src/ResourcesManager/SALOME_ResourcesManager.hxx +++ b/src/ResourcesManager/SALOME_ResourcesManager.hxx @@ -53,10 +53,10 @@ class RESOURCESMANAGER_EXPORT SALOME_ResourcesManager std::string BuildCommandToLaunchRemoteContainer (const std::string& machine, - const Engines::MachineParameters& params); + const Engines::MachineParameters& params, const long id); std::string BuildCommandToLaunchLocalContainer - (const Engines::MachineParameters& params); + (const Engines::MachineParameters& params, const long id); void RmTmpFile(); diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx index a020990f5..8e916a7f5 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx @@ -206,9 +206,8 @@ SALOMEDS::GenericAttribute_ptr SALOMEDS_StudyBuilder_i::FindOrCreateAttribute(SA { SALOMEDS::Locker lock; Handle(SALOMEDSImpl_SObject) aSO; - char* anID = anObject->GetID(); - aSO = Handle(SALOMEDSImpl_Study)::DownCast(_impl->GetOwner())->GetSObject(anID); - delete [] anID; + CORBA::String_var anID = anObject->GetID(); + aSO = Handle(SALOMEDSImpl_Study)::DownCast(_impl->GetOwner())->GetSObject(anID.inout()); Handle(TDF_Attribute) anAttr; try { anAttr = _impl->FindOrCreateAttribute(aSO, TCollection_AsciiString((char*)aTypeOfAttribute)); diff --git a/src/SALOMEDS/SALOME_DriverPy.py b/src/SALOMEDS/SALOME_DriverPy.py index 8728ffae8..d1f1c4e27 100644 --- a/src/SALOMEDS/SALOME_DriverPy.py +++ b/src/SALOMEDS/SALOME_DriverPy.py @@ -2,12 +2,13 @@ import SALOMEDS__POA class SALOME_DriverPy_i(SALOMEDS__POA.Driver): """ + Python implementation of generic SALOMEDS driver. + Should be inherited by any Python module's engine + to provide persistence mechanism. """ - _ComponentDataType = None - def __init__ (self, componentDataType): print "SALOME_DriverPy.__init__: ",componentDataType - _ComponentDataType = componentDataType + self._ComponentDataType = componentDataType def IORToLocalPersistentID(self, theSObject, IORString, isMultiFile, isASCII): return theSObject.GetID() @@ -16,7 +17,7 @@ class SALOME_DriverPy_i(SALOMEDS__POA.Driver): return "" def ComponentDataType(self): - return _ComponentDataType + return self._ComponentDataType def Save(self, theComponent, theURL, isMultiFile): return NULL diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx index 8fd4c5bf2..4523a897d 100644 --- a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx +++ b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx @@ -312,8 +312,8 @@ unsigned long LocalTraceBufferPool::lockedIncrement(unsigned long& pos) { int ret; ret = pthread_mutex_lock(&_incrementMutex); // lock access to counters - pos++; + unsigned long mypos = ++pos; ret = pthread_mutex_unlock(&_incrementMutex); // release lock - return pos; + return mypos; } -- 2.39.2