1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-20 05:18:08 +00:00

loop: make wait properly dispose of child tasks

This commit is contained in:
Jan Pochyla 2018-01-18 14:38:56 +01:00
parent dc7d7bb3bd
commit 23728c2713

View File

@ -251,8 +251,8 @@ class wait(Syscall):
self.children = children
self.wait_for = wait_for
self.exit_others = exit_others
self.scheduled = None
self.finished = None
self.scheduled = None # list of scheduled wrapper tasks
self.finished = None # list of children that finished
self.callback = None
def handle(self, task):
@ -263,9 +263,8 @@ class wait(Syscall):
schedule(ct)
def exit(self):
for task in self.scheduled:
if task not in self.finished:
close(task)
for ct in self.scheduled:
close(ct)
async def _wait(self, child):
try:
@ -278,14 +277,14 @@ class wait(Syscall):
def _finish(self, child, result):
self.finished.append(child)
if self.wait_for == len(self.finished) or isinstance(result, Exception):
schedule(self.callback, result)
if self.exit_others:
self.exit()
schedule(self.callback, result)
def __iter__(self):
try:
return (yield self)
except Exception:
except:
# exception was raised on the waiting task externally with
# close() or throw(), kill the children tasks and re-raise
self.exit()