Salome HOME
typo-fix by Kunda
[modules/yacs.git] / bin / killSalomeWithPort.py
index bce9b70be5161a54b5419c475653f9956c669d41..01d1eb39a2b9546e22a56162ec5c96d4e8e8de5a 100755 (executable)
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2017  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
 #
 
 import os, sys, pickle, signal, commands,glob
+import subprocess
+import shlex
 from salome_utils import verbose
-import salome_utils
+
 
 def getPiDict(port,appname='salome',full=True,hidden=True,hostname=None):
     """
@@ -59,7 +61,7 @@ def getPiDict(port,appname='salome',full=True,hidden=True,hostname=None):
     except:
         pass
 
-    from salome_utils import generateFileName, getTmpDir
+    from salome_utils import generateFileName, getLogDir
     dir = ""
     if not hostname:
         hostname = os.getenv("NSHOST")
@@ -70,7 +72,7 @@ def getPiDict(port,appname='salome',full=True,hidden=True,hostname=None):
         if hidden:
             # new-style dot-prefixed pidict files
             # are in the system-dependant temporary diretory
-            dir = getTmpDir()
+            dir = getLogDir()
         else:
             # old-style non-dot-prefixed pidict files
             # are in the user's home directory
@@ -199,7 +201,8 @@ def shutdownMyPort(port, cleanup=True):
         from LifeCycleCORBA import LifeCycleCORBA
         # shutdown all
         orb = CORBA.ORB_init([''], CORBA.ORB_ID)
-        lcc = LifeCycleCORBA(orb)
+        lcc = LifeCycleCORBA(orb) # see (1)
+        print "Terminating SALOME on port %s..."%(port)
         lcc.shutdownServers()
         # give some time to shutdown to complete
         time.sleep(1)
@@ -211,7 +214,13 @@ def shutdownMyPort(port, cleanup=True):
         pass
     except:
         pass
+    sys.exit(0) # see (1)
     pass
+# (1) If --shutdown-servers option is set to 1, session close procedure is
+# called twice: first explicitly by salome command, second by automatic
+# atexit to handle Ctrl-C. During second call, LCC does not exist anymore and
+# a RuntimeError is raised; we explicitly exit this function with code 0 to
+# prevent parent thread from crashing.
 
 def __killMyPort(port, filedict):
     # bug fix: ensure port is an integer
@@ -220,108 +229,24 @@ def __killMyPort(port, filedict):
 
     try:
         with open(filedict, 'r') as fpid:
-            #
-            from salome_utils import generateFileName
-            if sys.platform == "win32":
-                username = os.getenv( "USERNAME" )
-            else:
-                username = os.getenv('USER')
-            path = os.path.join('/tmp/logs', username)
-            fpidomniNames = generateFileName(path,
-                                             prefix="",
-                                             suffix="Pid_omniNames",
-                                             extension="log",
-                                             with_port=port)
-            if not sys.platform == 'win32':
-                cmd = 'pid=`ps -eo pid,command | egrep "[0-9] omniNames -start %s"` ; echo $pid > %s' % ( str(port), fpidomniNames )
-                a = os.system(cmd)
-                pass
-            try:
-                with open(fpidomniNames) as fpidomniNamesFile:
-                    lines = fpidomniNamesFile.readlines()
-
-                os.remove(fpidomniNames)
-                for l in lines:
+            process_ids=pickle.load(fpid)
+            for process_id in process_ids:
+                for pid, cmd in process_id.items():
+                    if verbose(): print "stop process %s : %s"% (pid, cmd[0])
                     try:
-                        pidfield = l.split()[0] # pid should be at the first position
-                        if sys.platform == "win32":
-                            import win32pm
-                            if verbose(): print 'stop process '+pidfield+' : omniNames'
-                            win32pm.killpid(int(pidfield),0)
-                        else:
-                            if verbose(): print 'stop process '+pidfield+' : omniNames'
-                            os.kill(int(pidfield),signal.SIGKILL)
-                            pass
-                        pass
+                        from salome_utils import killpid
+                        killpid(int(pid))
                     except:
+                        if verbose(): print "  ------------------ process %s : %s not found"% (pid, cmd[0])
                         pass
-                    pass
-                pass
-            except:
-                pass
-            #
-            try:
-                process_ids=pickle.load(fpid)
-                for process_id in process_ids:
-                    for pid, cmd in process_id.items():
-                        if verbose(): print "stop process %s : %s"% (pid, cmd[0])
-                        if cmd[0] == "omniNames":
-                            if not sys.platform == 'win32':
-                                import subprocess
-                                import shlex
-                                proc1 = subprocess.Popen(shlex.split('ps -eo pid,command'),stdout=subprocess.PIPE)
-                                proc2 = subprocess.Popen(shlex.split('egrep "[0-9] omniNames -start"'),stdin=proc1.stdout, stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-                                proc1.stdout.close() # Allow proc1 to receive a SIGPIPE if proc2 exits.
-                                out,err=proc2.communicate()
-                                # out looks like: PID omniNames -start PORT <other args>
-
-                                # extract omninames pid and port number
-                                try:
-                                    import re
-                                    omniNamesPid, omniNamesPort = re.search('(.+?) omniNames -start (.+?) ', out).group(1, 2)
-                                    if verbose():
-                                        print "stop omniNames [pid=%s] on port %s"%(omniNamesPid, omniNamesPort)
-                                    appliCleanOmniOrbConfig(omniNamesPort)
-                                    from PortManager import releasePort
-                                    releasePort(omniNamesPort)
-                                    os.kill(int(omniNamesPid),signal.SIGKILL)
-                                except (ImportError, AttributeError, OSError) as e:
-                                    pass
-                                except:
-                                    import traceback
-                                    traceback.print_exc()
-
-                        try:
-                            if sys.platform == "win32":
-                                import win32pm
-                                win32pm.killpid(int(pid),0)
-                            else:
-                                os.kill(int(pid),signal.SIGKILL)
-                                pass
-                            pass
-                        except:
-                            if verbose(): print "  ------------------ process %s : %s not found"% (pid, cmd[0])
-                            pass
-                        pass # for pid, cmd ...
-                    pass # for process_id ...
-                pass # try...
-            except:
-                pass
-        # end with
-        #
-        os.remove(filedict)
-        cmd='ps -eo pid,command | egrep "[0-9] omniNames -start '+str(port)+'" | sed -e "s%[^0-9]*\([0-9]*\) .*%\\1%g"'
-        pid = commands.getoutput(cmd)
-        a = ""
-        while pid and len(a.split()) < 2:
-            a = commands.getoutput("kill -9 " + pid)
-            pid = commands.getoutput(cmd)
-            pass
-        pass
+                    pass # for pid ...
+                pass # for process_id ...
+            # end with
     except:
         print "Cannot find or open SALOME PIDs file for port", port
         pass
-    #
+    os.remove(filedict)
+    pass
 #
 
 def __guessPiDictFilename(port):
@@ -362,19 +287,35 @@ def killMyPort(port):
     Parameters:
     - port - port number
     """
-    print "Terminating SALOME on port %s..."%(port)
-
     # bug fix: ensure port is an integer
     if port:
         port = int(port)
 
+    try:
+        import PortManager # do not remove! Test for PortManager availability!
+        filedict = getPiDict(port)
+        if not os.path.isfile(filedict): # removed by previous call, see (1)
+            if verbose():
+                print "SALOME on port %s: already removed by previous call"%port
+            # Remove port from PortManager config file
+            try:
+                from PortManager import releasePort
+                if verbose():
+                    print "Removing port from PortManager configuration file"
+                releasePort(port)
+            except ImportError:
+                pass
+            return
+    except:
+        pass
+
     # try to shutdown session normally
     import threading, time
-    threading.Thread(target=shutdownMyPort, args=(port,False)).start()
+    threading.Thread(target=shutdownMyPort, args=(port,True)).start()
     time.sleep(3) # wait a little, then kill processes (should be done if shutdown procedure hangs up)
 
     try:
-        import PortManager
+        import PortManager # do not remove! Test for PortManager availability!
         filedict = getPiDict(port)
         #filedict = __guessPiDictFilename(port)
         import glob
@@ -408,23 +349,17 @@ def cleanApplication(port):
       pass
 
     appliCleanOmniOrbConfig(port)
+    pass
 
 def killMyPortSpy(pid, port):
     dt = 1.0
     while 1:
-        if sys.platform == "win32":
-            from win32pm import killpid
-            if killpid(int(pid), 0) != 0:
-                return
-        else:
-            from os import kill
-            try:
-                kill(int(pid), 0)
-            except OSError, e:
-                if e.errno != 3:
-                    return
-                break
-            pass
+        from salome_utils import killpid
+        ret = killpid(int(pid), 0)
+        if ret == 0:
+            break
+        elif ret < 0:
+            return
         from time import sleep
         sleep(dt)
         pass
@@ -436,7 +371,7 @@ def killMyPortSpy(pid, port):
         orb = omniORB.CORBA.ORB_init(sys.argv, omniORB.CORBA.ORB_ID)
         import SALOME_NamingServicePy
         ns = SALOME_NamingServicePy.SALOME_NamingServicePy_i(orb)
-        import SALOME
+        import SALOME #@UnresolvedImport @UnusedImport
         session = ns.Resolve("/Kernel/Session")
         assert session
     except:
@@ -471,7 +406,7 @@ if __name__ == "__main__":
         sys.exit(0)
         pass
     try:
-        from salomeContextUtils import setOmniOrbUserPath
+        from salomeContextUtils import setOmniOrbUserPath #@UnresolvedImport
         setOmniOrbUserPath()
     except Exception, e:
         print e