X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FkillSalome.py;h=cafe632f7664b8e982f0e3ef61ce08f7ef7b5ef9;hb=44d76ca4d8b7d52192167790d1c0416d26629702;hp=ef06bd45fce94fdad3e76c5183490a1e2b91c58d;hpb=f876c49e5d46d086f1d741abada5ae86494bb5bb;p=modules%2Fkernel.git

diff --git a/bin/killSalome.py b/bin/killSalome.py
index ef06bd45f..cafe632f7 100755
--- a/bin/killSalome.py
+++ b/bin/killSalome.py
@@ -1,6 +1,6 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2019  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
@@ -30,12 +30,13 @@ import os, sys, re, signal
 
 from killSalomeWithPort import killMyPort, getPiDict
 #from salome_utils import getHostName, getShortHostName
+from salome_utils import getUserName
 
 def killAllPorts():
     """
     Kill all SALOME sessions belonging to the user.
     """
-    user = os.getenv('USER')
+    user = getUserName()
     #hostname  = getHostName()
     #shostname = getShortHostName()
     # new-style dot-prefixed pidict file
@@ -47,7 +48,7 @@ def killAllPorts():
     #if hostname in fpidict:
     #    fpidict = fpidict.replace(hostname, shostname+".*")
     fpidict   = fpidict.replace('#####', '(\d*)')
-    fnamere   = re.compile("^%s$" % fpidict)
+    fnamere   = re.compile("^%s" % fpidict)
     try:
         for f in os.listdir(dirpidict):
             mo = fnamere.match(f)
@@ -81,9 +82,9 @@ def killAllPorts():
         pass
     # kill other processes
     if sys.platform != 'win32':
-        import commands
+        import subprocess
         cmd = "ps -fea | grep '%s' | grep 'ghs3d' | grep 'f /tmp/GHS3D_' | grep -v 'grep' | awk '{print $2}'" % user
-        prc = commands.getoutput(cmd)
+        prc = subprocess.getoutput(cmd)
         for field in prc.split():
             try:
                 os.kill(int(field), signal.SIGKILL)
@@ -91,8 +92,27 @@ def killAllPorts():
                 pass
             pass
         pass
+        # kill ompi-server needed for MPI containers coupling
+        cmd = "ps -fea | grep '%s' | grep 'ompi-server' | grep -v 'grep' | awk '{print $2}'" % user
+        prc = subprocess.getoutput(cmd)
+        for field in prc.split():
+            try:
+                os.kill(int(field), signal.SIGKILL)
+            except:
+                pass
+            pass
+        pass
+        # delete uri files needed by ompi-server
+        cmd = "rm -f " + os.environ['HOME'] + "/.urifile_*"
+        os.system(cmd)
     pass
 
 if __name__ == "__main__":
+    try:
+        from salomeContextUtils import setOmniOrbUserPath
+        setOmniOrbUserPath()
+    except Exception as e:
+        print(e)
+        sys.exit(1)
     killAllPorts()
     pass