X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2FkillSalome.py;h=f03beaa04d28ebd179296ea6bf7b4d00fb38aef2;hb=9ed27bb6b3a18d7554fa762bcbfc74d6018843a4;hp=2d93685ef505facf406d5ad219729604dd4695c6;hpb=e6bfea36374791cd31c274a2f97df90dc60ddaf3;p=modules%2Fkernel.git

diff --git a/bin/killSalome.py b/bin/killSalome.py
index 2d93685ef..f03beaa04 100755
--- a/bin/killSalome.py
+++ b/bin/killSalome.py
@@ -1,37 +1,98 @@
-#!/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 python
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2013  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 
+# 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 
+#
+# 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
+#  Stop all %SALOME servers from all sessions by killing them
+#
 
-import os, string, sys, re
+import os, sys, re, signal
 
 from killSalomeWithPort import killMyPort, getPiDict
+#from salome_utils import getHostName, getShortHostName
 
 def killAllPorts():
+    """
+    Kill all SALOME sessions belonging to the user.
+    """
     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])
+    #hostname  = getHostName()
+    #shostname = getShortHostName()
+    # new-style dot-prefixed pidict file
+    #fpidict   = getPiDict('(\d*)',hidden=True)
+    #problem with WIN32 path slashes
+    fpidict   = getPiDict('#####',hidden=True)
+    dirpidict = os.path.dirname(fpidict)
+    fpidict   = os.path.basename(fpidict)
+    #if hostname in fpidict:
+    #    fpidict = fpidict.replace(hostname, shostname+".*")
+    fpidict   = fpidict.replace('#####', '(\d*)')
+    fnamere   = re.compile("^%s$" % fpidict)
+    try:
+        for f in os.listdir(dirpidict):
+            mo = fnamere.match(f)
+            try:
+                killMyPort(mo.group(1))
+            except:
+                pass
+            pass
+        pass
+    except:
+        pass
+    # provide compatibility with old-style pidict file (not dot-prefixed)
+    #fpidict   = getPiDict('(\d*)',hidden=False)
+    fpidict   = getPiDict('#####',hidden=False)
+    dirpidict = os.path.dirname(fpidict)
+    fpidict   = os.path.basename(fpidict)
+    #if hostname in fpidict:
+    #    fpidict = fpidict.replace(hostname, shostname+".*")
+    fpidict = fpidict.replace('#####', '(\d*)')
+    fnamere   = re.compile("^%s$" % fpidict)
+    try:
+        for f in os.listdir(dirpidict):
+            mo = fnamere.match(f)
+            try:
+                killMyPort(mo.group(1))
+            except:
+                pass
+            pass
+        pass
+    except:
+        pass
+    # kill other processes
+    if sys.platform != 'win32':
+        import commands
+        cmd = "ps -fea | grep '%s' | grep 'ghs3d' | grep 'f /tmp/GHS3D_' | grep -v 'grep' | awk '{print $2}'" % user
+        prc = commands.getoutput(cmd)
+        for field in prc.split():
+            try:
+                os.kill(int(field), signal.SIGKILL)
+            except:
+                pass
+            pass
         pass
+    pass
 
 if __name__ == "__main__":
     killAllPorts()
+    pass