gaming/lutris
gaming/lutris
1
0
Fork 0
mirror of https://github.com/lutris/lutris synced 2024-11-02 11:48:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed some child process monitoring issues

Browse source
This commit is contained in:
Mathieu Comandon 2015-03-04 22:51:53 +01:00
parent 473e8fbf74
commit 2f961a583d
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lutris/game.py
View file

@ -275,5 +275,6 @@ class Game(object):
if self.runner.system_config.get('xboxdrv'):
self.xboxdrv_thread.stop()
if self.game_thread:
self.game_thread.stop()
# XXX might do more harm than good
# if self.game_thread:
# self.game_thread.stop()

18
lutris/thread.py
View file

@ -28,6 +28,7 @@ class LutrisThread(threading.Thread):
self.is_running = True
self.stdout = ''
self.attached_threads = []
self.cycles_without_children = 0
logger.debug('Running thread from %s', self.path)
def attach_thread(self, thread):
@ -71,17 +72,24 @@ class LutrisThread(threading.Thread):
def watch_children(self):
"""pokes at the running process"""
process = Process(self.rootpid)
num_childs = 0
num_children = 0
num_watched_children = 0
terminated_children = 0
for child in self.iter_children(process):
if child.name in ('steamwebhelper', 'steam', 'sh'):
num_children += 1
if child.name in ('steamwebhelper', 'steam', 'sh', 'tee', 'bash'):
continue
num_childs += 1
num_watched_children += 1
print "{}\t{}\t{}".format(child.pid,
child.state,
child.name)
if child.state == 'Z':
self.game_process.wait()
if num_childs == 0:
terminated_children += 1
if terminated_children and terminated_children == num_watched_children:
self.game_process.wait()
if num_watched_children == 0:
self.cycles_without_children += 1
if num_children == 0 or self.cycles_without_children >= 3:
self.is_running = False
return False
return True