From 901e4ed982b4f05c891d2935af942ce0a1b06107 Mon Sep 17 00:00:00 2001 From: jfa Date: Tue, 27 Dec 2005 14:59:01 +0000 Subject: [PATCH] Join modifications from branch BR_3_1_0deb --- Makefile.in | 2 +- bin/VERSION | 4 +- bin/myrunSalome.py | 33 +++ bin/runAppli.in | 36 ++- bin/runSalome.py | 506 ------------------------------------- resources/HELLOCatalog.xml | 2 +- 6 files changed, 71 insertions(+), 512 deletions(-) create mode 100755 bin/myrunSalome.py delete mode 100755 bin/runSalome.py diff --git a/Makefile.in b/Makefile.in index 27d362f..503dcc7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ SUBDIRS = idl src RESOURCES_FILES = HELLOCatalog.xml HELLO.png ExecHELLO.png -BIN_SCRIPT= VERSION runAppli runSalome.py +BIN_SCRIPT= VERSION runAppli myrunSalome.py # copy header files in common directory ifeq ($(HAVE_SSTREAM),yes) diff --git a/bin/VERSION b/bin/VERSION index 95cfa3d..7836728 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1,2 +1,2 @@ -SALOME 2 EXEMPLE MODULE C++ : HELLO : 3.1.0b1 -This module works with KERNEL 3.1.0b1, SALOMEGUI 3.1.0b1 +SALOME 2 EXEMPLE MODULE C++ : HELLO : 3.1.0 +This module works with KERNEL 3.1.0, SALOMEGUI 3.1.0 diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py new file mode 100755 index 0000000..f61e8cc --- /dev/null +++ b/bin/myrunSalome.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python + +def test(clt): + """ + Test function that creates an instance of HELLO component + usage : hello=test(clt) + """ + # create an LifeCycleCORBA instance + import LifeCycleCORBA + lcc = LifeCycleCORBA.LifeCycleCORBA(clt.orb) + import HELLO_ORB + hello = lcc.FindOrLoadComponent("FactoryServer", "HELLO") + return hello + +# + +if __name__ == "__main__": + import user + from runSalome import * + clt,args = main() + + # + # Impression arborescence Naming Service + # + + if clt != None: + print + print " --- registered objects tree in Naming Service ---" + clt.showNS() + session=clt.waitNS("/Kernel/Session") + catalog=clt.waitNS("/Kernel/ModulCatalog") + import socket + container = clt.waitNS("/Containers/" + socket.gethostname().split('.')[0] + "/FactoryServer") diff --git a/bin/runAppli.in b/bin/runAppli.in index 9a47b00..7df43c0 100755 --- a/bin/runAppli.in +++ b/bin/runAppli.in @@ -1,8 +1,40 @@ #!/bin/sh export KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ -export PYHELLO_ROOT_DIR=@prefix@ +export HELLO_ROOT_DIR=@prefix@ -python -i $PYHELLO_ROOT_DIR/bin/salome/runSalome.py --modules=PYHELLO --xterm --containers=cpp,python --killall +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}/.omniORB_${myhost}_${NSPORT}.cfg + local initref="NameService=corbaname::"`hostname`":$NSPORT" + if [[ `python -c "import CORBA; print CORBA.ORB_ID"` = "omniORB4" ]]; then + echo "InitRef = $initref" > $OMNIORB_CONFIG + else + echo "ORBInitRef $initref" > $OMNIORB_CONFIG + fi + 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 +} +searchFreePort + +${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $HELLO_ROOT_DIR/bin/salome/myrunSalome.py --modules=HELLO --containers=cpp,python --killall diff --git a/bin/runSalome.py b/bin/runSalome.py deleted file mode 100755 index c7eb2e7..0000000 --- a/bin/runSalome.py +++ /dev/null @@ -1,506 +0,0 @@ -#!/usr/bin/env python - -usage="""USAGE: runSalome.py [options] - -[command line options] : ---help : affichage de l'aide ---gui : lancement du GUI ---logger : redirection des messages dans un fichier ---xterm : les serveurs ouvrent une fenêtre xterm et les messages sont affichés dans cette fenêtre ---modules=module1,module2,... : où modulen est le nom d'un module Salome à charger dans le catalogue ---containers=cpp,python,superv: lancement des containers cpp, python et de supervision ---killall : arrêt des serveurs de salome - - La variable d'environnement _ROOT_DIR doit etre préalablement - positionnée (modulen doit etre en majuscule). - KERNEL_ROOT_DIR est obligatoire. -""" - -# ----------------------------------------------------------------------------- -# -# Fonction d'arrêt de salome -# - -def killSalome(): - print "arret des serveurs SALOME" - for pid, cmd in process_id.items(): - print "arret du process %s : %s"% (pid, cmd[0]) - try: - os.kill(pid,signal.SIGKILL) - except: - print " ------------------ process %s : %s inexistant"% (pid, cmd[0]) - print "arret du naming service" - os.system("killall -9 omniNames") - -# ----------------------------------------------------------------------------- -# -# Fonction message -# - -def message(code, msg=''): - if msg: print msg - sys.exit(code) - -import sys,os,string,glob,time,signal,pickle,getopt - -init_time=os.times() -opts, args=getopt.getopt(sys.argv[1:], 'hmglxck:', ['help','modules=','gui','logger','xterm','containers=','killall']) -modules_root_dir={} -process_id={} -liste_modules={} -liste_containers={} -with_gui=0 -with_logger=0 -with_xterm=0 - -with_container_cpp=0 -with_container_python=0 -with_container_superv=0 - -try: - for o, a in opts: - if o in ('-h', '--help'): - print usage - sys.exit(1) - elif o in ('-g', '--gui'): - with_gui=1 - elif o in ('-l', '--logger'): - with_logger=1 - elif o in ('-x', '--xterm'): - with_xterm=1 - elif o in ('-m', '--modules'): - liste_modules = [x.upper() for x in a.split(',')] - elif o in ('-c', '--containers'): - liste_containers = [x.lower() for x in a.split(',')] - for r in liste_containers: - if r not in ('cpp', 'python', 'superv'): - message(1, 'Invalid -c/--containers option: %s' % a) - if 'cpp' in liste_containers: - with_container_cpp=1 - else: - with_container_cpp=0 - if 'python' in liste_containers: - with_container_python=1 - else: - with_container_python=0 - if 'superv' in liste_containers: - with_container_superv=1 - else: - with_container_superv=0 - elif o in ('-k', '--killall'): - filedict='/tmp/'+os.getenv('USER')+'_SALOME_pidict' - #filedict='/tmp/'+os.getlogin()+'_SALOME_pidict' - found = 0 - try: - fpid=open(filedict, 'r') - found = 1 - except: - print "le fichier %s des process SALOME n'est pas accessible"% filedict - - if found: - process_id=pickle.load(fpid) - fpid.close() - killSalome() - process_id={} - os.remove(filedict) - -except getopt.error, msg: - print usage - sys.exit(1) - -# ----------------------------------------------------------------------------- -# -# Vérification des variables d'environnement -# -try: - kernel_root_dir=os.environ["KERNEL_ROOT_DIR"] - modules_root_dir["KERNEL"]=kernel_root_dir -except: - print usage - sys.exit(1) - -for module in liste_modules : - try: - module=module.upper() - module_root_dir=os.environ[module +"_ROOT_DIR"] - modules_root_dir[module]=module_root_dir - except: - print usage - sys.exit(1) - -# il faut KERNEL en premier dans la liste des modules -# - l'ordre des modules dans le catalogue sera identique -# - la liste des modules presents dans le catalogue est exploitée pour charger les modules CORBA python, -# il faut charger les modules python du KERNEL en premier - -if "KERNEL" in liste_modules:liste_modules.remove("KERNEL") -liste_modules[:0]=["KERNEL"] -#print liste_modules -#print modules_root_dir - -os.environ["SALOMEPATH"]=":".join(modules_root_dir.values()) -if "SUPERV" in liste_modules:with_container_superv=1 - - -# ----------------------------------------------------------------------------- -# -# Définition des classes d'objets pour le lancement des Server CORBA -# - -class Server: - CMD=[] - if with_xterm: - ARGS=['xterm', '-iconic', '-sb', '-sl', '500', '-e'] - else: - ARGS=[] - - def run(self): - args = self.ARGS+self.CMD - #print "args = ", args - pid = os.spawnvp(os.P_NOWAIT, args[0], args) - process_id[pid]=self.CMD - -class CatalogServer(Server): - SCMD1=['SALOME_ModuleCatalog_Server','-common'] - SCMD2=['-personal','${HOME}/Salome/resources/CatalogModulePersonnel.xml'] - - def setpath(self,liste_modules): - cata_path=[] - for module in liste_modules: - module_root_dir=modules_root_dir[module] - module_cata=module+"Catalog.xml" - print " ", module_cata - cata_path.extend(glob.glob(os.path.join(module_root_dir,"share","salome","resources",module_cata))) - self.CMD=self.SCMD1 + [string.join(cata_path,':')] + self.SCMD2 - -class SalomeDSServer(Server): - CMD=['SALOMEDS_Server'] - -class RegistryServer(Server): - CMD=['SALOME_Registry_Server', '--salome_session','theSession'] - -class ContainerCPPServer(Server): - CMD=['SALOME_Container','FactoryServer','-ORBInitRef','NameService=corbaname::localhost'] - -class ContainerPYServer(Server): - CMD=['SALOME_ContainerPy.py','FactoryServerPy','-ORBInitRef','NameService=corbaname::localhost'] - -class ContainerSUPERVServer(Server): - CMD=['SALOME_Container','SuperVisionContainer','-ORBInitRef','NameService=corbaname::localhost'] - -class LoggerServer(Server): - CMD=['SALOME_Logger_Server', 'logger.log'] - -class SessionLoader(Server): - CMD=['SALOME_Session_Loader'] - if with_container_cpp: - CMD=CMD+['CPP'] - if with_container_python: - CMD=CMD+['PY'] - if with_container_superv: - CMD=CMD+['SUPERV'] - if with_gui: - CMD=CMD+['GUI'] - -class SessionServer(Server): - CMD=['SALOME_Session_Server'] - -class NotifyServer(Server): - CMD=['notifd','-c','${KERNEL_ROOT_DIR}/share/salome/resources/channel.cfg -DFactoryIORFileName=/tmp/${LOGNAME}_rdifact.ior -DChannelIORFileName=/tmp/${LOGNAME}_rdichan.ior'] - -# ----------------------------------------------------------------------------- -# -# Fonction de test -# - -def test(clt): - """ - Test function that creates an instance of PYHELLO component - usage : pyhello=test(clt) - """ - # create an LifeCycleCORBA instance - import LifeCycleCORBA - lcc = LifeCycleCORBA.LifeCycleCORBA(clt.orb) - import PYHELLO_ORB - pyhello = lcc.FindOrLoadComponent("FactoryServerPy", "PYHELLO") - return pyhello - -# ----------------------------------------------------------------------------- -# -# Fonctions helper pour ajouter des variables d'environnement -# - -def add_path(directory): - os.environ["PATH"]=directory + ":" + os.environ["PATH"] - -def add_ld_library_path(directory): - os.environ["LD_LIBRARY_PATH"]=directory + ":" + os.environ["LD_LIBRARY_PATH"] - -def add_python_path(directory): - os.environ["PYTHONPATH"]=directory + ":" + os.environ["PYTHONPATH"] - sys.path[:0]=[directory] - -# ----------------------------------------------------------------------------- -# -# initialisation des variables d'environnement -# - -python_version="python%d.%d" % sys.version_info[0:2] - -# -# Ajout du chemin d'acces aux executables de KERNEL dans le PATH -# - -add_path(os.path.join(kernel_root_dir,"bin","salome")) -#print "PATH=",os.environ["PATH"] - -# -# Ajout des modules dans le LD_LIBRARY_PATH -# -for module in liste_modules: - module_root_dir=modules_root_dir[module] - add_ld_library_path(os.path.join(module_root_dir,"lib","salome")) -#print "LD_LIBRARY_PATH=",os.environ["LD_LIBRARY_PATH"] - -# -# Ajout des modules dans le PYTHONPATH (KERNEL prioritaire, donc en dernier) -# - -liste_modules_reverse=liste_modules[:] -liste_modules_reverse.reverse() -#print liste_modules -#print liste_modules_reverse -for module in liste_modules_reverse: - module_root_dir=modules_root_dir[module] - add_python_path(os.path.join(module_root_dir,"bin","salome")) - add_python_path(os.path.join(module_root_dir,"lib",python_version,"site-packages","salome")) - add_python_path(os.path.join(module_root_dir,"lib","salome")) - add_python_path(os.path.join(module_root_dir,"lib",python_version,"site-packages","salome","shared_modules")) - -#print "PYTHONPATH=",sys.path - -import orbmodule - -# -# ----------------------------------------------------------------------------- -# - -def startGUI(): - import SALOME - session=clt.waitNS("/Kernel/Session",SALOME.Session) - - # - # Activation du GUI de Session Server - # - - session.GetInterface() - -# -# ----------------------------------------------------------------------------- -# - -def startSalome(): - - # - # Lancement Session Loader - # - SessionLoader().run() - - # - # Initialisation ORB et Naming Service - # - clt=orbmodule.client() - - # (non obligatoire) Lancement Logger Server et attente de sa - # disponibilite dans le naming service - # - if with_logger: - LoggerServer().run() - clt.waitLogger("Logger") - - # - # Lancement Registry Server - # - RegistryServer().run() - - # - # Attente de la disponibilité du Registry dans le Naming Service - # - clt.waitNS("/Registry") - - # - # Lancement Catalog Server - # - cataServer=CatalogServer() - cataServer.setpath(liste_modules) - cataServer.run() - - # - # Attente de la disponibilité du Catalog Server dans le Naming Service - # - import SALOME_ModuleCatalog - clt.waitNS("/Kernel/ModulCatalog",SALOME_ModuleCatalog.ModuleCatalog) - - # - # Lancement SalomeDS Server - # - os.environ["CSF_PluginDefaults"]=os.path.join(kernel_root_dir,"share","salome","resources") - os.environ["CSF_SALOMEDS_ResourcesDefaults"]=os.path.join(kernel_root_dir,"share","salome","resources") - SalomeDSServer().run() - - if "GEOM" in liste_modules: - print "GEOM OCAF Resources" - os.environ["CSF_GEOMDS_ResourcesDefaults"]=os.path.join(modules_root_dir["GEOM"],"share","salome","resources") - - - # - # Attente de la disponibilité du SalomeDS dans le Naming Service - # - clt.waitNS("/myStudyManager") - - # - # Lancement Session Server - # - SessionServer().run() - - # - # Attente de la disponibilité du Session Server dans le Naming Service - # - import SALOME - session=clt.waitNS("/Kernel/Session",SALOME.Session) - - # - # Lancement containers - # - theComputer = os.getenv("HOSTNAME") - theComputer = theComputer.split('.')[0] - - # - # Lancement Container C++ local - # - if with_container_cpp: - ContainerCPPServer().run() - # - # Attente de la disponibilité du Container C++ local - # dans le Naming Service - # - clt.waitNS("/Containers/" + theComputer + "/FactoryServer") - # - # Lancement Container Python local - # - if with_container_python: - ContainerPYServer().run() - # - # Attente de la disponibilité du Container Python local - # dans le Naming Service - # - clt.waitNS("/Containers/" + theComputer + "/FactoryServerPy") - - if with_container_superv: - # - # Lancement Container Supervision local - # - ContainerSUPERVServer().run() - # - # Attente de la disponibilité du Container Supervision local - # dans le Naming Service - # - clt.waitNS("/Containers/" + theComputer + "/SuperVisionContainer") - # - # Activation du GUI de Session Server - # - #session.GetInterface() - - end_time = os.times() - print - print "Start SALOME, elpased time : %5.1f seconds"% (end_time[4] - init_time[4]) - - return clt - -# -# ----------------------------------------------------------------------------- -# - -if __name__ == "__main__": - clt=None - try: - clt = startSalome() - except: - print - print - print "--- erreur au lancement Salome ---" - - #print process_id - - - filedict='/tmp/'+os.getenv('USER')+'_SALOME_pidict' - #filedict='/tmp/'+os.getlogin()+'_SALOME_pidict' - - fpid=open(filedict, 'w') - pickle.dump(process_id,fpid) - fpid.close() - - print """ - -Sauvegarde du dictionnaire des process dans , %s -Pour tuer les process SALOME, executer : python killSalome.py depuis -une console, ou bien killSalome() depuis le present interpreteur, -s'il n'est pas fermé. - -runSalome, avec l'option --killall, commence par tuer les process restants -d'une execution précédente. - -Pour lancer uniquement le GUI, executer startGUI() depuis le present interpreteur, -s'il n'est pas fermé. - -""" % filedict - - # - # Impression arborescence Naming Service - # - - if clt != None: - print - print " --- registered objects tree in Naming Service ---" - clt.showNS() - session=clt.waitNS("/Kernel/Session") - catalog=clt.waitNS("/Kernel/ModulCatalog") - import socket - container = clt.waitNS("/Containers/" + socket.gethostname().split('.')[0] + "/FactoryServerPy") - - if os.path.isfile("~/.salome/pystartup"): - f=open(os.path.expanduser("~/.salome/pystartup"),'w') - PYTHONSTARTUP=f.read() - f.close() - else: - PYTHONSTARTUP=""" -# Add auto-completion and a stored history file of commands to your Python -# interactive interpreter. Requires Python 2.0+, readline. Autocomplete is -# bound to the TAB key by default (you can change it - see readline docs). -# -# Store the history in ~/.salome/pyhistory, -# -import atexit -import os -import readline -import rlcompleter -readline.parse_and_bind('tab: complete') - -historyPath = os.path.expanduser("~/.salome/pyhistory") - -def save_history(historyPath=historyPath): - import readline - readline.write_history_file(historyPath) - -if os.path.exists(historyPath): - readline.read_history_file(historyPath) - -atexit.register(save_history) -del os, atexit, readline, rlcompleter, save_history, historyPath -""" - f=open(os.path.expanduser("~/.salome/pystartup"),'w') - f.write(PYTHONSTARTUP) - f.close() - - exec PYTHONSTARTUP in {} - diff --git a/resources/HELLOCatalog.xml b/resources/HELLOCatalog.xml index b650cb6..1cd2867 100644 --- a/resources/HELLOCatalog.xml +++ b/resources/HELLOCatalog.xml @@ -16,7 +16,7 @@ HELLO GUI Data C. Caremoli - 3.1.0b1 + 3.1.0 EDF - RD 1 HELLO.png -- 2.30.2