X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FkillSalome.py;h=b7c384ea4c923a50ba22b2b52bad464cb9c6ff6a;hb=d8edd4804d9e6513a17c497c1a30326d4ba0d677;hp=2f1388182f522ed10621b47b36a38173a3d5359e;hpb=f14439749926cca959747bb79fda10529520bd0b;p=modules%2Fkernel.git

diff --git a/bin/killSalome.py b/bin/killSalome.py
index 2f1388182..b7c384ea4 100755
--- a/bin/killSalome.py
+++ b/bin/killSalome.py
@@ -1,54 +1,97 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
-#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+#! /usr/bin/env python3
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2021  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.
-# 
-# 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 
+# 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 
+#
+# 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
-# 
+#
+
+## @file killSalome.py
+#  @brief Forcibly stop all running %SALOME sessions.
+
+"""
+Forcibly stop all running SALOME sessions.
+
+To stop all SALOME sessions, do the following:
+
+* in shell:
+
+    $ killSalome.py
+
+* in Python script:
+
+    from killSalome import killAllPorts
+    killAllPorts()
+"""
+
+# pragma pylint: disable=invalid-name
 
-import os, string, sys, re
+import os
+import os.path as osp
+import re
+import sys
+from contextlib import suppress
+from glob import glob
 
-from killSalomeWithPort import killMyPort, getPiDict
+from killSalomeWithPort import getPiDict, killMyPort, killUnkilledProcesses
 
 def killAllPorts():
-    user = os.getenv('USER')
-    filedict = "^%s$"%(getPiDict('(\d*)',full=False))
-    fnamere = re.compile(filedict)
-    for file in os.listdir(os.getenv("HOME")):
-        mo = re.match(fnamere,file)
-        if mo and len(mo.groups()):
-            killMyPort(mo.groups()[0])
-        pass
-
-    if not sys.platform == 'win32':
-        cmd = "pid=`ps -fea | grep '"+os.getenv('USER')+"' | grep 'ghs3d' | grep 'f /tmp/GHS3D_' | grep -v 'grep' | awk '{print $2}'` ; echo $pid > /tmp/logs/"+os.getenv('USER')+"/_"+"Pid_ghs3d.log"
-        a = os.system(cmd)
-        try:
-            fpidomniNames=open('/tmp/logs/'+os.getenv('USER')+"/_"+"Pid_ghs3d.log")
-            prc = fpidomniNames.read()
-            fpidomniNames.close()
-            if prc != None :
-                for field in prc.split(" ") :
-                    field = field.strip()
-                    if field != None and len(field) != 0:
-                        os.system('kill -9 '+field)
-        except:
-            pass
-        pass
-
-if __name__ == "__main__":
+    """
+    Stop all running SALOME sessions owned by the current user.
+    """
+    # detect ports used by SALOME session and kill processes
+    for hidden in (True, False):
+        pidict_t = getPiDict(port='#####', hidden=hidden)
+        dir_pidict_t = osp.dirname(pidict_t)
+        fn_pidict_t = osp.basename(pidict_t).replace('#####', r'(\d*)')
+        fn_rex = re.compile('^{}'.format(fn_pidict_t))
+        with suppress(IOError):
+            for fname in os.listdir(dir_pidict_t):
+                m_res = fn_rex.match(fname)
+                if m_res:
+                    killMyPort(m_res.group(1))
+
+    # kill possibly unkilled processes
+    killUnkilledProcesses()
+
+    # other clean-up actions
+    # - delete uri files needed by ompi-server
+    for path in glob(osp.join(osp.expanduser('~'), '.urifile_*')):
+        with suppress(IOError):
+            os.remove(path)
+
+def main():
+    """
+    Main function
+    """
+    from argparse import ArgumentParser
+    parser = ArgumentParser(description='Forcibly stop all running SALOME sessions')
+    parser.parse_args()
+
+    try:
+        from salomeContextUtils import setOmniOrbUserPath
+        setOmniOrbUserPath()
+    except Exception as exc: # pragma pylint: disable=broad-except
+        print(exc)
+        sys.exit(1)
+
     killAllPorts()
-    
+
+if __name__ == '__main__':
+    main()