X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FrunSalome.py;h=73a8b0df2037ff8f122adaf16decccb4dac15a82;hb=7e6982e9ccf83f3ede551d990d5a80807dcf1a87;hp=1274e9a4530a388ba25c31ec90f2396f77698fb5;hpb=8d381f95c9df11c395291909012a9ee263810493;p=modules%2Fkernel.git diff --git a/bin/runSalome.py b/bin/runSalome.py index 1274e9a45..73a8b0df2 100755 --- a/bin/runSalome.py +++ b/bin/runSalome.py @@ -1,197 +1,74 @@ #!/usr/bin/env python +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# -import sys, os, string, glob, time, pickle -import orbmodule +## @package runSalome +# \brief Module that provides services to launch SALOME +# -process_id = {} +import sys, os, string, glob, time, pickle, re +import orbmodule +import setenv +from launchConfigureParser import verbose +from server import process_id, Server +import json +import subprocess +from salomeContextUtils import ScriptAndArgsObjectEncoder # ----------------------------------------------------------------------------- -def add_path(directory, variable_name): - """Function helper to add environment variables""" - if not os.environ.has_key(variable_name): - os.environ[variable_name] = "" - pass - if os.path.exists(directory): - newpath=[] - for _dir in os.environ[variable_name].split(":"): - if os.path.exists(_dir): - if not os.path.samefile(_dir, directory): - newpath.append(_dir) - else: - if os.path.abspath(_dir) != os.path.abspath(directory): - newpath.append(_dir) - pass - import string - newpath[:0] = [ directory ] - newpath = string.join(newpath,":") - os.environ[variable_name] = newpath - if variable_name == "PYTHONPATH": - sys.path[:0] = [directory] - -# ----------------------------------------------------------------------------- +from killSalome import killAllPorts -def get_config(): +def killLocalPort(): """ - Get list of modules, paths. - - Read args from launch configure xml file and command line options. - Check variables _ROOT_DIR and set list of used modules. - Return args, modules_list, modules_root_dir + kill servers from a previous SALOME exection, if needed, + on the CORBA port given in args of runSalome """ - - # read args from launch configure xml file and command line options - - import launchConfigureParser - args = launchConfigureParser.args - - # Check variables _ROOT_DIR - # and set list of used modules (without KERNEL) - - modules_list = [] - if args.has_key("modules"): - modules_list += args["modules"] - # KERNEL must be last in the list to locate it at the first place in PATH - modules_list[:0] = ["KERNEL"] - modules_list.reverse() - - modules_root_dir = {} - - to_remove_list=[] - for module in modules_list : - module_variable=module.upper()+"_ROOT_DIR" - if not os.environ.has_key(module_variable): - print "*******************************************************" - print "*" - print "* Environment variable",module_variable,"must be set" - print "* Module", module, "will be not available" - print "*" - print "********************************************************" - to_remove_list.append(module) - continue - pass - module_root_dir = os.environ[module_variable] - modules_root_dir[module]=module_root_dir - - for to_remove in to_remove_list: - modules_list.remove(to_remove) - - while "KERNEL" in modules_list: - modules_list.remove("KERNEL") - pass - - if "SUPERV" in modules_list and not 'superv' in args['standalone']: - args['standalone'].append("superv") - pass - - return args, modules_list, modules_root_dir - -# ----------------------------------------------------------------------------- -def set_env(args, modules_list, modules_root_dir): - """Add to the PATH-variables modules specific paths""" - - python_version="python%d.%d" % sys.version_info[0:2] - modules_root_dir_list = [] - modules_list = modules_list[:] + ["KERNEL"] - for module in modules_list : - module_root_dir = modules_root_dir[module] - modules_root_dir_list[:0] = [module_root_dir] - add_path(os.path.join(module_root_dir,"lib",args['appname']), - "LD_LIBRARY_PATH") - add_path(os.path.join(module_root_dir,"bin",args['appname']), - "PATH") - if os.path.exists(module_root_dir + "/examples") : - add_path(os.path.join(module_root_dir,"examples"), - "PYTHONPATH") - add_path(os.path.join(module_root_dir,"bin",args['appname']), - "PYTHONPATH") - add_path(os.path.join(module_root_dir,"lib", - python_version,"site-packages",args['appname']), - "PYTHONPATH") - add_path(os.path.join(module_root_dir,"lib",args['appname']), - "PYTHONPATH") - add_path(os.path.join(module_root_dir,"lib", - python_version,"site-packages",args['appname'], - "shared_modules"), - "PYTHONPATH") - - os.environ["SALOMEPATH"]=":".join(modules_root_dir_list) - - # special path for logger lib if needeed - - os.environ["SALOME_trace"]="local" - if args['logger']: - os.environ["SALOME_trace"]="with_logger" - locdir=os.environ['PWD'] - libtracedir=os.path.join(locdir,"libSalomeTrace") - libtrace = os.path.join(modules_root_dir["KERNEL"],"lib", - args['appname'], - "libSALOMELoggerClient.so.0.0.0") - libtraceln = os.path.join(libtracedir,"libSALOMELocalTrace.so") - aCommand = 'rm -rf ' + libtracedir + "; " - aCommand += 'mkdir ' + libtracedir + "; " - aCommand += 'ln -s ' + libtrace + " " + libtraceln + "; " - aCommand += 'ln -s ' + libtrace + " " + libtraceln + ".0; " - aCommand += 'ln -s ' + libtrace + " " + libtraceln + ".0.0.0; " - os.system(aCommand) - add_path(libtracedir, "LD_LIBRARY_PATH") - - # set environment for SMESH plugins - - if "SMESH" in modules_list: - os.environ["SMESH_MeshersList"]="StdMeshers" - if not os.environ.has_key("SALOME_StdMeshersResources"): - os.environ["SALOME_StdMeshersResources"] \ - = modules_root_dir["SMESH"]+"/share/"+args["appname"]+"/resources" - pass - if args.has_key("SMESH_plugins"): - for plugin in args["SMESH_plugins"]: - if os.environ.has_key(plugin.upper()+"_ROOT_DIR"): - os.environ["SMESH_MeshersList"] \ - = os.environ["SMESH_MeshersList"]+":"+plugin - plugin_root = os.environ[plugin.upper()+"_ROOT_DIR"] - if not os.environ.has_key("SALOME_"+plugin+"Resources"): - os.environ["SALOME_"+plugin+"Resources"] \ - = plugin_root+"/share/"+args["appname"]+"/resources" - add_path(os.path.join(plugin_root,"lib",python_version, - "site-packages",args['appname']), - "PYTHONPATH") - add_path(os.path.join(plugin_root,"lib",args['appname']), - "PYTHONPATH") - add_path(os.path.join(plugin_root,"lib",args['appname']), - "LD_LIBRARY_PATH") - add_path(os.path.join(plugin_root,"bin",args['appname']), - "PYTHONPATH") - add_path(os.path.join(plugin_root,"bin",args['appname']), - "PATH") - pass + from killSalomeWithPort import killMyPort + my_port=str(args['port']) + try: + killMyPort(my_port) + except: + print "problem in killLocalPort()" pass + pass - # set environment for SUPERV module - os.environ["ENABLE_MACRO_NODE"]="1" - - -# ----------------------------------------------------------------------------- - -from killSalome import killAllPorts - -def killLocalPort(): +def givenPortKill(port): """ kill servers from a previous SALOME exection, if needed, on the same CORBA port """ - + from killSalomeWithPort import killMyPort - my_port=str(args['port']) + my_port=port try: killMyPort(my_port) except: - print "problem in killLocalPort()" + print "problem in LocalPortKill(), killMyPort(%s)"%port pass pass - - + def kill_salome(args): """ Kill servers from previous SALOME executions, if needed; @@ -202,103 +79,143 @@ def kill_salome(args): if args['killall']: killAllPorts() elif args['portkill']: - killLocalPort() - + givenPortKill(str(args['port'])) + # ----------------------------------------------------------------------------- # -# Définition des classes d'objets pour le lancement des Server CORBA +# Class definitions to launch CORBA Servers # -class Server: - """Generic class for CORBA server launch""" - - def initArgs(self): - self.CMD=[] - self.ARGS=[] - if self.args['xterm']: - self.ARGS=['xterm', '-iconic', '-sb', '-sl', '500', '-hold'] - +class InterpServer(Server): def __init__(self,args): self.args=args - self.initArgs() - + if sys.platform != "win32": + env_ld_library_path=['env', 'LD_LIBRARY_PATH=' + os.getenv("LD_LIBRARY_PATH")] + self.CMD=['xterm', '-e']+ env_ld_library_path + ['python'] + else: + self.CMD=['cmd', '/c', 'start cmd.exe', '/K', 'python'] def run(self): global process_id - myargs=self.ARGS - if self.args['xterm']: - # (Debian) send LD_LIBRARY_PATH to children shells (xterm) - env_ld_library_path=['env', 'LD_LIBRARY_PATH=' - + os.getenv("LD_LIBRARY_PATH")] - myargs = myargs +['-T']+self.CMD[:1]+['-e'] + env_ld_library_path - command = myargs + self.CMD - # print "command = ", command - pid = os.spawnvp(os.P_NOWAIT, command[0], command) + command = self.CMD + print "INTERPSERVER::command = ", command + if sys.platform == "win32": + import win32pm + pid = win32pm.spawnpid( string.join(command, " "),'-nc' ) + else: + pid = os.spawnvp(os.P_NOWAIT, command[0], command) process_id[pid]=self.CMD + self.PID = pid # --- +def get_cata_path(list_modules,modules_root_dir): + """Build a list of catalog paths (cata_path) to initialize the ModuleCatalog server + """ + modules_cata={} + cata_path=[] + + for module in list_modules: + if modules_root_dir.has_key(module): + module_root_dir=modules_root_dir[module] + module_cata=module+"Catalog.xml" + cata_file=os.path.join(module_root_dir, "share",setenv.salome_subdir, "resources",module.lower(), module_cata) + + if os.path.exists(cata_file): + cata_path.append(cata_file) + modules_cata[module]=cata_file + else: + cata_file=os.path.join(module_root_dir, "share",setenv.salome_subdir, "resources", module_cata) + if os.path.exists(cata_file): + cata_path.append(cata_file) + modules_cata[module]=cata_file + + for path in os.getenv("SALOME_CATALOGS_PATH","").split(os.pathsep): + if os.path.exists(path): + for cata_file in glob.glob(os.path.join(path,"*Catalog.xml")): + module_name= os.path.basename(cata_file)[:-11] + if not modules_cata.has_key(module_name): + cata_path.append(cata_file) + modules_cata[module_name]=cata_file + + return cata_path + +_siman_name = None +def simanStudyName(args): + global _siman_name + if _siman_name is None: + # siman session paramenters and checkout processing + _siman_name = "" + if 'siman' in args: + siman_data = [] + for param in [ 'study', 'scenario', 'user']: + siman_param = "siman_%s"%param + if siman_param in args: + siman_data.append(args[siman_param]) + else: + print "SIMAN %s must be defined using parameter --siman-%s=XXX" % (siman_param, siman_param) + pass + pass + if len(siman_data) == 3: + _siman_name = "_".join(siman_data) + pass + pass + pass + return _siman_name + class CatalogServer(Server): def __init__(self,args): self.args=args self.initArgs() self.SCMD1=['SALOME_ModuleCatalog_Server','-common'] - self.SCMD2=['-personal', - '${HOME}/Salome/resources/CatalogModulePersonnel.xml'] + self.SCMD2=[] + home_dir=os.getenv('HOME') + if home_dir is not None: + self.SCMD2=['-personal',os.path.join(home_dir,'Salome/resources/CatalogModulePersonnel.xml')] - def setpath(self,modules_list): - cata_path=[] + def setpath(self,modules_list,modules_root_dir): list_modules = modules_list[:] list_modules.reverse() - for module in ["KERNEL"] + list_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",self.args['appname'], - "resources",module_cata))) - self.CMD=self.SCMD1 + [string.join(cata_path,':')] + self.SCMD2 + if self.args["gui"] : + list_modules = ["KERNEL", "GUI"] + list_modules + else : + list_modules = ["KERNEL"] + list_modules -# --- + cata_path=get_cata_path(list_modules,modules_root_dir) -class SalomeDSServer(Server): - def __init__(self,args): - self.args=args - self.initArgs() - self.CMD=['SALOMEDS_Server'] + self.CMD=self.SCMD1 + ['"' + string.join(cata_path,'"::"') + '"'] + self.SCMD2 # --- -class RegistryServer(Server): +class SalomeDSServer(Server): def __init__(self,args): self.args=args self.initArgs() - self.CMD=['SALOME_Registry_Server', '--salome_session','theSession'] + self.CMD=['SALOMEDS_Server'] # --- -class ContainerCPPServer(Server): +class ConnectionManagerServer(Server): def __init__(self,args): self.args=args self.initArgs() - self.CMD=['SALOME_Container','FactoryServer'] + self.CMD=['SALOME_ConnectionManagerServer'] # --- -class ContainerPYServer(Server): +class RegistryServer(Server): def __init__(self,args): self.args=args self.initArgs() - self.CMD=['SALOME_ContainerPy.py','FactoryServerPy'] + self.CMD=['SALOME_Registry_Server', '--salome_session','theSession'] # --- -class ContainerSUPERVServer(Server): +class ContainerCPPServer(Server): def __init__(self,args): self.args=args self.initArgs() - self.CMD=['SALOME_Container','SuperVisionContainer'] + self.CMD=['SALOME_Container','FactoryServer'] # --- @@ -306,33 +223,29 @@ class LoggerServer(Server): def __init__(self,args): self.args=args self.initArgs() - self.CMD=['SALOME_Logger_Server', 'logger.log'] - -# --- - -class SessionLoader(Server): - def __init__(self,args): - self.args=args - self.initArgs() - self.CMD=['SALOME_Session_Loader'] - if "cppContainer" in self.args['standalone'] \ - or "cppContainer" in self.args['embedded']: - self.CMD=self.CMD+['CPP'] - if "pyContainer" in self.args['standalone'] \ - or "pyContainer" in self.args['embedded']: - self.CMD=self.CMD+['PY'] - if "supervContainer" in self.args['containers'] \ - or "supervContainer" in self.args['standalone']: - self.CMD=self.CMD+['SUPERV'] - if self.args['gui']: - self.CMD=self.CMD+['GUI'] - print self.CMD + from salome_utils import generateFileName, getLogDir + logfile = generateFileName( getLogDir(), + prefix="logger", + extension="log", + with_username=True, + with_hostname=True, + with_port=True) + print "===========================================================" + print "Logger server: put log to the file:" + print logfile + print "===========================================================" + self.CMD=['SALOME_Logger_Server', logfile] + pass + pass # end of LoggerServer class # --- class SessionServer(Server): - def __init__(self,args): - self.args=args + def __init__(self,args,modules_list,modules_root_dir): + self.args = args.copy() + # Bug 11512 (Problems with runSalome --xterm on Mandrake and Debian Sarge) + #self.args['xterm']=0 + # self.initArgs() self.SCMD1=['SALOME_Session_Server'] self.SCMD2=[] @@ -341,88 +254,229 @@ class SessionServer(Server): '(','--salome_session','theSession',')'] if 'moduleCatalog' in self.args['embedded']: self.SCMD1+=['--with','ModuleCatalog','(','-common'] - self.SCMD2+=['-personal', - '${HOME}/Salome/resources/CatalogModulePersonnel.xml',')'] + home_dir=os.getenv('HOME') + if home_dir is not None: + self.SCMD2+=['-personal',os.path.join(home_dir,'Salome/resources/CatalogModulePersonnel.xml')] + self.SCMD2+=[')'] if 'study' in self.args['embedded']: self.SCMD2+=['--with','SALOMEDS','(',')'] if 'cppContainer' in self.args['embedded']: self.SCMD2+=['--with','Container','(','FactoryServer',')'] + if 'SalomeAppEngine' in self.args['embedded']: + self.SCMD2+=['--with','SalomeAppEngine','(',')'] + + if 'cppContainer' in self.args['standalone'] or 'cppContainer' in self.args['embedded']: + self.SCMD2+=['CPP'] + if 'pyContainer' in self.args['standalone'] or 'pyContainer' in self.args['embedded']: + raise Exception('Python containers no longer supported') + if self.args['gui']: + session_gui = True + if self.args.has_key('session_gui'): + session_gui = self.args['session_gui'] + if session_gui: + self.SCMD2+=['GUI'] + if self.args['splash']: + self.SCMD2+=['SPLASH'] + pass + if self.args['study_hdf'] is not None: + self.SCMD2+=['--study-hdf=%s'%self.args['study_hdf']] + pass + if simanStudyName(self.args): + self.SCMD2+=['--siman-study=%s'%simanStudyName(self.args)] + pass + pass + if self.args.has_key('pyscript') and len(self.args['pyscript']) > 0: + msg = json.dumps(self.args['pyscript'], cls=ScriptAndArgsObjectEncoder) + self.SCMD2+=['--pyscript=%s'%(msg)] + pass + pass + pass + if self.args['noexcepthandler']: + self.SCMD2+=['noexcepthandler'] + if self.args.has_key('user_config'): + self.SCMD2+=['--resources=%s'%self.args['user_config']] + if self.args.has_key('modules'): + list_modules = [] + #keep only modules with GUI + for m in modules_list: + if m not in modules_root_dir: + list_modules.insert(0,m) + else: + fr1 = os.path.join(modules_root_dir[m],"share","salome","resources",m.lower(),"SalomeApp.xml") + fr2 = os.path.join(modules_root_dir[m],"share","salome","resources","SalomeApp.xml") + if os.path.exists(fr1) or os.path.exists(fr2): + list_modules.insert(0,m) + list_modules.reverse() + self.SCMD2+=['--modules (%s)' % ":".join(list_modules)] + pass + pass def setpath(self,modules_list,modules_root_dir): - cata_path=[] list_modules = modules_list[:] list_modules.reverse() - for module in ["KERNEL"] + list_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", - self.args['appname'],"resources", - module_cata))) - if 'moduleCatalog' in self.args['embedded']: - self.CMD=self.SCMD1 + [string.join(cata_path,':')] + self.SCMD2 + if self.args["gui"] : + list_modules = ["KERNEL", "GUI"] + list_modules + else : + list_modules = ["KERNEL"] + list_modules + + cata_path=get_cata_path(list_modules,modules_root_dir) + + if (self.args["gui"]) & ('moduleCatalog' in self.args['embedded']): + #Use '::' instead ":" because drive path with "D:\" is invalid on windows platform + self.CMD=self.SCMD1 + ['"' + string.join(cata_path,'"::"') + '"'] + self.SCMD2 else: self.CMD=self.SCMD1 + self.SCMD2 + if self.args.has_key('test'): + self.CMD+=['-test'] + self.args['test'] + elif self.args.has_key('play'): + self.CMD+=['-play'] + self.args['play'] + + if self.args["gdb_session"] or self.args["ddd_session"]: + f = open(".gdbinit4salome", "w") + f.write("set args ") + args = " ".join(self.CMD[1:]) + args = args.replace("(", "\(") + args = args.replace(")", "\)") + f.write(args) + f.write("\n") + f.close() + if self.args["ddd_session"]: + self.CMD = ["ddd", "--command=.gdbinit4salome", self.CMD[0]] + elif self.args["gdb_session"]: + self.CMD = ["xterm", "-e", "gdb", "--command=.gdbinit4salome", self.CMD[0]] + pass + pass + + if self.args["valgrind_session"]: + l = ["valgrind"] + val = os.getenv("VALGRIND_OPTIONS") + if val: + l += val.split() + pass + self.CMD = l + self.CMD + pass -## # arguments SALOME_Session_Server pour ddd -## comm_ddd="" -## for mot in self.CMD: -## if mot == "(": -## comm_ddd+='"(" ' -## elif mot == ")": -## comm_ddd+='")" ' -## else: -## comm_ddd+=mot+" " -## print comm_ddd - # --- -class NotifyServer(Server): - def __init__(self,args,modules_root_dir): +class LauncherServer(Server): + def __init__(self,args): self.args=args self.initArgs() - self.modules_root_dir=modules_root_dir - myLogName = os.environ["LOGNAME"] - self.CMD=['notifd','-c', - self.modules_root_dir["KERNEL"] - +'/share/salome/resources/channel.cfg', - '-DFactoryIORFileName=/tmp/'+myLogName+'_rdifact.ior', - '-DChannelIORFileName=/tmp/'+myLogName+'_rdichan.ior'] + self.SCMD1=['SALOME_LauncherServer'] + self.SCMD2=[] + if args["gui"] : + if 'registry' in self.args['embedded']: + self.SCMD1+=['--with','Registry', + '(','--salome_session','theSession',')'] + if 'moduleCatalog' in self.args['embedded']: + self.SCMD1+=['--with','ModuleCatalog','(','-common'] + self.SCMD2+=['-personal', + '${HOME}/Salome/resources/CatalogModulePersonnel.xml',')'] + if 'study' in self.args['embedded']: + self.SCMD2+=['--with','SALOMEDS','(',')'] + if 'cppContainer' in self.args['embedded']: + self.SCMD2+=['--with','Container','(','FactoryServer',')'] + + def setpath(self,modules_list,modules_root_dir): + list_modules = modules_list[:] + list_modules.reverse() + if self.args["gui"] : + list_modules = ["KERNEL", "GUI"] + list_modules + else : + list_modules = ["KERNEL"] + list_modules + + cata_path=get_cata_path(list_modules,modules_root_dir) + if (self.args["gui"]) & ('moduleCatalog' in self.args['embedded']): + #Use '::' instead ":" because drive path with "D:\" is invalid on windows platform + self.CMD=self.SCMD1 + ['"' + string.join(cata_path,'"::"') + '"'] + self.SCMD2 + else: + self.CMD=self.SCMD1 + self.SCMD2 # # ----------------------------------------------------------------------------- -def startGUI(): +def startGUI(clt): """Salome Session Graphic User Interface activation""" + import Engines import SALOME + import SALOMEDS + import SALOME_ModuleCatalog + import SALOME_Session_idl session=clt.waitNS("/Kernel/Session",SALOME.Session) session.GetInterface() - + # ----------------------------------------------------------------------------- def startSalome(args, modules_list, modules_root_dir): """Launch all SALOME servers requested by args""" init_time = os.times() + if verbose(): print "startSalome ", args + # - # Lancement Session Loader + # Set server launch command # + if args.has_key('server_launch_mode'): + Server.set_server_launch_mode(args['server_launch_mode']) - print "startSalome ", args - - if args['gui']: - myServer=SessionLoader(args) - myServer.run() + # + # Wake up session option + # + if args['wake_up_session']: + if "OMNIORB_CONFIG" not in os.environ: + from salome_utils import generateFileName + omniorbUserPath = os.getenv("OMNIORB_USER_PATH") + kwargs={} + if omniorbUserPath is not None: + kwargs["with_username"]=True + + last_running_config = generateFileName(omniorbUserPath, prefix="omniORB", + suffix="last", + extension="cfg", + hidden=True, + **kwargs) + os.environ['OMNIORB_CONFIG'] = last_running_config + pass + pass # - # Initialisation ORB et Naming Service + # Initialisation ORB and Naming Service # - - clt=orbmodule.client() - # (non obligatoire) Lancement Logger Server - # et attente de sa disponibilite dans le naming service + clt=orbmodule.client(args) + + # + # Wake up session option + # + if args['wake_up_session']: + import Engines + import SALOME + import SALOMEDS + import SALOME_ModuleCatalog + import SALOME_Session_idl + session = clt.waitNS("/Kernel/Session",SALOME.Session) + status = session.GetStatSession() + if status.activeGUI: + from salome_utils import getPortNumber + port = getPortNumber() + msg = "Warning :" + msg += "\n" + msg += "Session GUI for port number %s is already active."%(port) + msg += "\n" + msg += "If you which to wake up another session," + msg += "\n" + msg += "please use variable OMNIORB_CONFIG" + msg += "\n" + msg += "to get the correct session object in naming service." + sys.stdout.write(msg+"\n") + sys.stdout.flush() + return clt + session.GetInterface() + args["session_object"] = session + return clt + + # Launch Logger Server (optional) + # and wait until it is registered in naming service # if args['logger']: @@ -430,125 +484,183 @@ def startSalome(args, modules_list, modules_root_dir): myServer.run() clt.waitLogger("Logger") - # Notify Server launch + # set siman python path before the session server launching to import scripts inside python console + if simanStudyName(args): + # MPV: use os.environ here because session server is launched in separated process and sys.path is missed in this case + from salome_utils import getTmpDir + ppath = os.path.join(getTmpDir, "SimanSalome", args['siman_study'], + args['siman_scenario'], args['siman_user']) + os.environ["PYTHONPATH"] = ppath + os.pathsep + os.environ["PYTHONPATH"] + + # Launch Session Server (to show splash ASAP) # - myServer=NotifyServer(args,modules_root_dir) - myServer.run() + if args["gui"]: + mySessionServ = SessionServer(args,args['modules'],modules_root_dir) + mySessionServ.setpath(modules_list,modules_root_dir) + mySessionServ.run() # - # Lancement Registry Server, - # attente de la disponibilité du Registry dans le Naming Service + # Launch Registry Server, + # and wait until it is registered in naming service # - if 'registry' not in args['embedded']: + if ('registry' not in args['embedded']) | (args["gui"] == 0) : myServer=RegistryServer(args) myServer.run() - clt.waitNS("/Registry") + if sys.platform == "win32": + clt.waitNS("/Registry") + else: + clt.waitNSPID("/Registry",myServer.PID) # - # Lancement Catalog Server, - # attente de la disponibilité du Catalog Server dans le Naming Service + # Launch Catalog Server, + # and wait until it is registered in naming service # - if 'moduleCatalog' not in args['embedded']: + if ('moduleCatalog' not in args['embedded']) | (args["gui"] == 0): cataServer=CatalogServer(args) - cataServer.setpath(modules_list) + cataServer.setpath(modules_list,modules_root_dir) cataServer.run() import SALOME_ModuleCatalog - clt.waitNS("/Kernel/ModulCatalog",SALOME_ModuleCatalog.ModuleCatalog) + if sys.platform == "win32": + clt.waitNS("/Kernel/ModulCatalog",SALOME_ModuleCatalog.ModuleCatalog) + else: + clt.waitNSPID("/Kernel/ModulCatalog",cataServer.PID,SALOME_ModuleCatalog.ModuleCatalog) # - # Lancement SalomeDS Server, - # attente de la disponibilité du SalomeDS dans le Naming Service + # Launch SalomeDS Server, + # and wait until it is registered in naming service # - os.environ["CSF_PluginDefaults"] \ - = os.path.join(modules_root_dir["KERNEL"],"share", - args['appname'],"resources") - os.environ["CSF_SALOMEDS_ResourcesDefaults"] \ - = os.path.join(modules_root_dir["KERNEL"],"share", - args['appname'],"resources") - - if "GEOM" in modules_list: - print "GEOM OCAF Resources" - os.environ["CSF_GEOMDS_ResourcesDefaults"] \ - = os.path.join(modules_root_dir["GEOM"],"share", - args['appname'],"resources") - print "GEOM Shape Healing Resources" - os.environ["CSF_ShHealingDefaults"] \ - = os.path.join(modules_root_dir["GEOM"],"share", - args['appname'],"resources") - - if 'study' not in args['embedded']: + #print "ARGS = ",args + if ('study' not in args['embedded']) | (args["gui"] == 0): + print "RunStudy" myServer=SalomeDSServer(args) myServer.run() - clt.waitNS("/myStudyManager") + if sys.platform == "win32": + clt.waitNS("/myStudyManager") + else: + clt.waitNSPID("/myStudyManager",myServer.PID) # - # Lancement Session Server + # Launch LauncherServer # - mySessionServ = SessionServer(args) - mySessionServ.setpath(modules_list,modules_root_dir) - mySessionServ.run() + myCmServer = LauncherServer(args) + myCmServer.setpath(modules_list,modules_root_dir) + myCmServer.run() - #macomm2=['ddd'] - #pid = os.spawnvp(os.P_NOWAIT, macomm2[0], macomm2) # - # Attente de la disponibilité du Session Server dans le Naming Service + # Launch ConnectionManagerServer # - import SALOME - session=clt.waitNS("/Kernel/Session",SALOME.Session) + myConnectionServer = ConnectionManagerServer(args) + myConnectionServer.run() + + + from Utils_Identity import getShortHostName if os.getenv("HOSTNAME") == None: if os.getenv("HOST") == None: - os.environ["HOSTNAME"]="localhost" + os.environ["HOSTNAME"]=getShortHostName() else: os.environ["HOSTNAME"]=os.getenv("HOST") - theComputer = os.getenv("HOSTNAME") - computerSplitName = theComputer.split('.') - theComputer = computerSplitName[0] - + theComputer = getShortHostName() + # - # Lancement Container C++ local, - # attente de la disponibilité du Container C++ local dans le Naming Service + # Launch local C++ Container (FactoryServer), + # and wait until it is registered in naming service # - if 'cppContainer' in args['standalone']: + if ('cppContainer' in args['standalone']) | (args["gui"] == 0) : myServer=ContainerCPPServer(args) myServer.run() - clt.waitNS("/Containers/" + theComputer + "/FactoryServer") - - # - # Lancement Container Python local, - # attente de la disponibilité du Container Python local - # dans le Naming Service - # + if sys.platform == "win32": + clt.waitNS("/Containers/" + theComputer + "/FactoryServer") + else: + clt.waitNSPID("/Containers/" + theComputer + "/FactoryServer",myServer.PID) if 'pyContainer' in args['standalone']: - myServer=ContainerPYServer(args) - myServer.run() - clt.waitNS("/Containers/" + theComputer + "/FactoryServerPy") + raise Exception('Python containers no longer supported') # - # Lancement Container Supervision local, - # attente de la disponibilité du Container Supervision local - # dans le Naming Service + # Wait until Session Server is registered in naming service # - if 'supervContainer' in args['standalone']: - myServer=ContainerSUPERVServer(args) - myServer.run() - clt.waitNS("/Containers/" + theComputer + "/SuperVisionContainer") - + if args["gui"]: +##---------------- + import Engines + import SALOME + import SALOMEDS + import SALOME_ModuleCatalog + import SALOME_Session_idl + if sys.platform == "win32": + session=clt.waitNS("/Kernel/Session",SALOME.Session) + else: + session=clt.waitNSPID("/Kernel/Session",mySessionServ.PID,SALOME.Session) + args["session_object"] = session end_time = os.times() - print + if verbose(): print print "Start SALOME, elapsed time : %5.1f seconds"% (end_time[4] - init_time[4]) + # ASV start GUI without Loader + #if args['gui']: + # session.GetInterface() + + # + # additionnal external python interpreters + # + nbaddi=0 + + try: + if 'interp' in args: + nbaddi = args['interp'] + except: + import traceback + traceback.print_exc() + print "-------------------------------------------------------------" + print "-- to get an external python interpreter:runSalome --interp=1" + print "-------------------------------------------------------------" + + if verbose(): print "additional external python interpreters: ", nbaddi + if nbaddi: + for i in range(nbaddi): + print "i=",i + anInterp=InterpServer(args) + anInterp.run() + + # set PYTHONINSPECT variable (python interpreter in interactive mode) + if args['pinter']: + os.environ["PYTHONINSPECT"]="1" + try: + import readline + except ImportError: + pass + + # siman session paramenters and checkout processing + if simanStudyName(args): + print '**********************************************' + print "Siman study name= '" + simanStudyName(args) + "'" + import SALOMEDS + obj = clt.Resolve('myStudyManager') + myStudyManager = obj._narrow(SALOMEDS.StudyManager) + aNewStudy = myStudyManager.NewStudy(simanStudyName(args)) + aSimS = myStudyManager.GetSimanStudy() + aSimS._set_StudyId(args['siman_study']) + aSimS._set_ScenarioId(args['siman_scenario']) + aSimS._set_UserId(args['siman_user']) + aSimS.CheckOut(aNewStudy) + # if session server is enabled, activate the created study + if args["gui"]: + print "Activate the SIMAN study in the SALOME GUI" + obj = clt.Resolve('/Kernel/Session') + mySession = obj._narrow(SALOME.Session) + mySession.emitMessage("simanCheckoutDone " + simanStudyName(args)) + print '**********************************************' + return clt # ----------------------------------------------------------------------------- @@ -559,56 +671,99 @@ def useSalome(args, modules_list, modules_root_dir): save list of process, give info to user, show registered objects in Naming Service. """ - + global process_id + clt=None try: clt = startSalome(args, modules_list, modules_root_dir) except: + import traceback + traceback.print_exc() print print - print "--- erreur au lancement Salome ---" - + print "--- Error during Salome launch ---" + #print process_id - - filedict = '/tmp/' + os.getenv('USER') + "_" + str(args['port']) \ - + '_' + args['appname'].upper() + '_pidict' - - process_ids = [] - try: - fpid=open(filedict, 'r') - process_ids=pickle.load(fpid) - fpid.close() - except: + + from addToKillList import addToKillList + from killSalomeWithPort import getPiDict + + filedict = getPiDict(args['port']) + for pid, cmd in process_id.items(): + addToKillList(pid, cmd, args['port']) pass - - fpid=open(filedict, 'w') - process_ids.append(process_id) - pickle.dump(process_ids,fpid) - fpid.close() - - print """ + + if verbose(): print """ Saving of the dictionary of Salome processes in %s To kill SALOME processes from a console (kill all sessions from all ports): - python killSalome.py + python killSalome.py To kill SALOME from the present interpreter, if it is not closed : - killLocalPort() --> kill this session - killAllPorts() --> kill all sessions - + killLocalPort() --> kill this session + (use CORBA port from args of runSalome) + givenPortKill(port) --> kill a specific session with given CORBA port + killAllPorts() --> kill all sessions + runSalome, with --killall option, starts with killing the processes resulting from the previous execution. """%filedict - + # - # Impression arborescence Naming Service + # Print Naming Service directory list # - + if clt != None: - print - print " --- registered objects tree in Naming Service ---" - clt.showNS() + if verbose(): + print + print " --- registered objects tree in Naming Service ---" + clt.showNS() + pass + + if not args['gui'] or not args['session_gui']: + if args['shutdown_servers']: + class __utils__(object): + def __init__(self, port): + self.port = port + import killSalomeWithPort + self.killSalomeWithPort = killSalomeWithPort + return + def __del__(self): + self.killSalomeWithPort.killMyPort(self.port) + return + pass + def func(s): + del s + import atexit + atexit.register(func, __utils__(args['port'])) + pass + pass + + # run python scripts, passed as command line arguments + toimport = [] + if args.has_key('gui') and args.has_key('session_gui'): + if not args['gui'] or not args['session_gui']: + if args.has_key('study_hdf'): + toopen = args['study_hdf'] + if toopen: + import salome + salome.salome_init(toopen) + if args.has_key('pyscript'): + toimport = args['pyscript'] + from salomeContextUtils import formatScriptsAndArgs + command = formatScriptsAndArgs(toimport) + if command: + proc = subprocess.Popen(command, shell=True) + addToKillList(proc.pid, command, args['port']) + res = proc.wait() + if res: sys.exit(1) # if there's an error when executing script, we should explicitly exit return clt +def execScript(script_path): + print 'executing', script_path + sys.path.insert(0, os.path.realpath(os.path.dirname(script_path))) + execfile(script_path,globals()) + del sys.path[0] + # ----------------------------------------------------------------------------- def registerEnv(args, modules_list, modules_root_dir): @@ -616,7 +771,9 @@ def registerEnv(args, modules_list, modules_root_dir): Register args, modules_list, modules_root_dir in a file for further use, when SALOME is launched embedded in an other application. """ - fileEnv = '/tmp/' + os.getenv('USER') + "_" + str(args['port']) \ + from salome_utils import getTmpDir + fileEnv = getTmpDir() + fileEnv += os.getenv('USER') + "_" + str(args['port']) \ + '_' + args['appname'].upper() + '_env' fenv=open(fileEnv,'w') pickle.dump((args, modules_list, modules_root_dir),fenv) @@ -632,6 +789,8 @@ def no_main(): args, modules_list, modules_root_dir = pickle.load(fenv) fenv.close() kill_salome(args) + from searchFreePort import searchFreePort + searchFreePort(args, 0) clt = useSalome(args, modules_list, modules_root_dir) return clt @@ -639,13 +798,132 @@ def no_main(): def main(): """Salome launch as a main application""" - args, modules_list, modules_root_dir = get_config() + + # define folder to store omniorb config (initially in virtual application folder) + try: + from salomeContextUtils import setOmniOrbUserPath + setOmniOrbUserPath() + except Exception, e: + print e + sys.exit(1) + + from salome_utils import getHostName + args, modules_list, modules_root_dir = setenv.get_config() + print "runSalome running on %s" % getHostName() + kill_salome(args) - set_env(args, modules_list, modules_root_dir) + save_config = True + if args.has_key('save_config'): + save_config = args['save_config'] + # -- + test = True + if args['wake_up_session']: + test = False + pass + if test: + from searchFreePort import searchFreePort + searchFreePort(args, save_config, args.get('useport')) + pass + # -- + #setenv.main() + setenv.set_env(args, modules_list, modules_root_dir) clt = useSalome(args, modules_list, modules_root_dir) return clt,args # ----------------------------------------------------------------------------- +def foreGround(clt, args): + # -- + if "session_object" not in args: + return + session = args["session_object"] + # -- + # Wait until gui is arrived + # tmax = nbtot * dt + # -- + gui_detected = False + dt = 0.1 + nbtot = 100 + nb = 0 + while 1: + try: + status = session.GetStatSession() + gui_detected = status.activeGUI + except: + pass + if gui_detected: + break + from time import sleep + sleep(dt) + nb += 1 + if nb == nbtot: + break + pass + # -- + if not gui_detected: + return + # -- + from salome_utils import getPortNumber + port = getPortNumber() + # -- + server = Server({}) + if sys.platform == "win32": + server.CMD = [os.getenv("PYTHONBIN"), "-m", "killSalomeWithPort", "--spy", "%s"%(os.getpid()), "%s"%(port)] + else: + server.CMD = ["killSalomeWithPort.py", "--spy", "%s"%(os.getpid()), "%s"%(port)] + server.run() + # os.system("killSalomeWithPort.py --spy %s %s &"%(os.getpid(), port)) + # -- + dt = 1.0 + try: + while 1: + try: + status = session.GetStatSession() + assert status.activeGUI + except: + break + from time import sleep + sleep(dt) + pass + pass + except KeyboardInterrupt: + from killSalomeWithPort import killMyPort + killMyPort(port) + pass + return +# + +def runSalome(): + import user + clt,args = main() + # -- + test = args['gui'] and args['session_gui'] + test = test or args['wake_up_session'] + # -- + # The next test covers the --pinter option or var PYTHONINSPECT setted + # -- + test = test and not os.environ.get('PYTHONINSPECT') + # -- + # The next test covers the python -i $KERNEL_ROOT_DIR/bin/salome/runSalome.py case + # -- + try: + from ctypes import POINTER, c_int, cast, pythonapi + iflag_ptr = cast(pythonapi.Py_InteractiveFlag, POINTER(c_int)) + test = test and not iflag_ptr.contents.value + except: + pass + # -- + test = test and os.getenv("SALOME_TEST_MODE", "0") != "1" + test = test and args['foreground'] + # -- + if test: + foreGround(clt, args) + pass + pass +# + +# ----------------------------------------------------------------------------- + if __name__ == "__main__": - clt,args = main() + runSalome() +#