Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-23 09:08:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: sim_vehicle.py - correct process termination

Browse Source 
Closes #4699
This commit is contained in:
Peter Barker 2016-08-22 13:59:22 +10:00
parent 211175efac
commit 569a7a4abd
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tools/autotest/sim_vehicle.py
View File

@ -87,9 +87,8 @@ def cygwin_pidof(proc_name):
pid = int(line_split[0].strip())
except:
pid = int(line_split[1].strip())
str_pid = str(pid)
if str_pid not in pids:
pids.append(str_pid)
if pid not in pids:
pids.append(pid)
return pids
@ -143,7 +142,7 @@ def kill_tasks():
"""Clean up stray processes by name. This is a somewhat shotgun approach"""
progress("Killing tasks")
try:
victim_names = [
victim_names = set([
'JSBSim',
'lt-JSBSim',
'ArduPlane.elf',
@ -154,7 +153,12 @@ def kill_tasks():
'MAVProxy.exe',
'runsim.py',
'AntennaTracker.elf',
]
])
for frame in _options_for_frame.keys():
if not _options_for_frame[frame].has_key("waf_target"):
continue
exe_name = os.path.basename(_options_for_frame[frame]["waf_target"])
victim_names.add(exe_name)
if under_cygwin():
return kill_tasks_cygwin(victim_names)