Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EDF bug 17743, salome.sg regressions in DEV (missing getAllSelected method)
[modules/kernel.git]
/
bin
/
killSalomeWithPort.py
diff --git
a/bin/killSalomeWithPort.py
b/bin/killSalomeWithPort.py
index d95a6fe2bad864f64769ef733eba11034e8c358a..fec9e4aa356850f7a1794f4bc39e881283a9febf 100755
(executable)
--- a/
bin/killSalomeWithPort.py
+++ b/
bin/killSalomeWithPort.py
@@
-1,6
+1,6
@@
-#! /usr/bin/env python
+#! /usr/bin/env python
3
# -*- coding: iso-8859-1 -*-
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-201
7
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
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-31,7
+31,7
@@
# \endcode
#
# \endcode
#
-import os, sys, pickle, signal,
command
s,glob
+import os, sys, pickle, signal,
subproces
s,glob
import subprocess
import shlex
from salome_utils import verbose
import subprocess
import shlex
from salome_utils import verbose
@@
-96,7
+96,7
@@
def appliCleanOmniOrbConfig(port):
the last is removed only if the link points to the first file.
"""
if verbose():
the last is removed only if the link points to the first file.
"""
if verbose():
- print
"clean OmniOrb config for port %s"%port
+ print
("clean OmniOrb config for port %s"%port)
from salome_utils import generateFileName, getUserName
omniorbUserPath = os.getenv("OMNIORB_USER_PATH")
from salome_utils import generateFileName, getUserName
omniorbUserPath = os.getenv("OMNIORB_USER_PATH")
@@
-202,7
+202,7
@@
def shutdownMyPort(port, cleanup=True):
# shutdown all
orb = CORBA.ORB_init([''], CORBA.ORB_ID)
lcc = LifeCycleCORBA(orb) # see (1)
# shutdown all
orb = CORBA.ORB_init([''], CORBA.ORB_ID)
lcc = LifeCycleCORBA(orb) # see (1)
- print
"Terminating SALOME on port %s..."%(port
)
+ print
("Terminating SALOME on port %s..."%(port)
)
lcc.shutdownServers()
# give some time to shutdown to complete
time.sleep(1)
lcc.shutdownServers()
# give some time to shutdown to complete
time.sleep(1)
@@
-214,12
+214,12
@@
def shutdownMyPort(port, cleanup=True):
pass
except:
pass
pass
except:
pass
- exit(0) # see (1)
+
sys.
exit(0) # see (1)
pass
# (1) If --shutdown-servers option is set to 1, session close procedure is
pass
# (1) If --shutdown-servers option is set to 1, session close procedure is
-# called twice: first explicit
e
ly by salome command, second by automatic
+# called twice: first explicitly by salome command, second by automatic
# atexit to handle Ctrl-C. During second call, LCC does not exist anymore and
# atexit to handle Ctrl-C. During second call, LCC does not exist anymore and
-# a RuntimeError is raised; we explicit
e
ly exit this function with code 0 to
+# a RuntimeError is raised; we explicitly exit this function with code 0 to
# prevent parent thread from crashing.
def __killMyPort(port, filedict):
# prevent parent thread from crashing.
def __killMyPort(port, filedict):
@@
-228,22
+228,22
@@
def __killMyPort(port, filedict):
port = int(port)
try:
port = int(port)
try:
- with open(filedict, 'r') as fpid:
+ with open(filedict, 'r
b
') as fpid:
process_ids=pickle.load(fpid)
for process_id in process_ids:
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]
)
+ for pid, cmd in
list(process_id.items()
):
+ if verbose(): print
("stop process %s : %s"% (pid, cmd[0])
)
try:
from salome_utils import killpid
killpid(int(pid))
except:
try:
from salome_utils import killpid
killpid(int(pid))
except:
- if verbose(): print
" ------------------ process %s : %s not found"% (pid, cmd[0]
)
+ if verbose(): print
(" ------------------ process %s : %s not found"% (pid, cmd[0])
)
pass
pass # for pid ...
pass # for process_id ...
# end with
except:
pass
pass # for pid ...
pass # for process_id ...
# end with
except:
- print
"Cannot find or open SALOME PIDs file for port", port
+ print
("Cannot find or open SALOME PIDs file for port", port)
pass
os.remove(filedict)
pass
pass
os.remove(filedict)
pass
@@
-276,7
+276,7
@@
def __guessPiDictFilename(port):
log_msg += " ... not found\n"
if verbose():
log_msg += " ... not found\n"
if verbose():
- print
log_msg
+ print
(log_msg)
return filedict
#
return filedict
#
@@
-296,12
+296,12
@@
def killMyPort(port):
filedict = getPiDict(port)
if not os.path.isfile(filedict): # removed by previous call, see (1)
if verbose():
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
+ print
("SALOME on port %s: already removed by previous call"%port)
# Remove port from PortManager config file
try:
from PortManager import releasePort
if verbose():
# Remove port from PortManager config file
try:
from PortManager import releasePort
if verbose():
- print
"Removing port from PortManager configuration file"
+ print
("Removing port from PortManager configuration file")
releasePort(port)
except ImportError:
pass
releasePort(port)
except ImportError:
pass
@@
-311,7
+311,7
@@
def killMyPort(port):
# try to shutdown session normally
import threading, time
# try to shutdown session normally
import threading, time
- threading.Thread(target=shutdownMyPort, args=(port,
Fals
e)).start()
+ threading.Thread(target=shutdownMyPort, args=(port,
Tru
e)).start()
time.sleep(3) # wait a little, then kill processes (should be done if shutdown procedure hangs up)
try:
time.sleep(3) # wait a little, then kill processes (should be done if shutdown procedure hangs up)
try:
@@
-391,10
+391,10
@@
def killMyPortSpy(pid, port):
if __name__ == "__main__":
if len(sys.argv) < 2:
if __name__ == "__main__":
if len(sys.argv) < 2:
- print
"Usage: "
- print
" %s <port>" % os.path.basename(sys.argv[0]
)
- print
- print
"Kills SALOME session running on specified <port>."
+ print
("Usage: ")
+ print
(" %s <port>" % os.path.basename(sys.argv[0])
)
+ print
()
+ print
("Kills SALOME session running on specified <port>.")
sys.exit(1)
pass
if sys.argv[1] == "--spy":
sys.exit(1)
pass
if sys.argv[1] == "--spy":
@@
-408,8
+408,8
@@
if __name__ == "__main__":
try:
from salomeContextUtils import setOmniOrbUserPath #@UnresolvedImport
setOmniOrbUserPath()
try:
from salomeContextUtils import setOmniOrbUserPath #@UnresolvedImport
setOmniOrbUserPath()
- except Exception
,
e:
- print
e
+ except Exception
as
e:
+ print
(e)
sys.exit(1)
for port in sys.argv[1:]:
killMyPort(port)
sys.exit(1)
for port in sys.argv[1:]:
killMyPort(port)