Fix exception handling

This commit is contained in:
Andras Schmelczer 2022-07-01 23:50:31 +02:00
parent 835f9b4ba0
commit 9866b88faf
2 changed files with 17 additions and 15 deletions

View file

@ -106,10 +106,14 @@ def parallel_map(
unordered=unordered, unordered=unordered,
ignore_exceptions=ignore_exceptions, ignore_exceptions=ignore_exceptions,
) )
finally:
should_stop.set() should_stop.set()
for p in processes: for p in processes:
p.join() p.join()
p.close() p.close()
except:
for p in processes:
p.terminate()
raise
finally:
input_queue.close() input_queue.close()
output_queue.close() output_queue.close()

View file

@ -94,17 +94,15 @@ def threaded_parallel_map(
for t in threads: for t in threads:
t.start() t.start()
try: yield from manage_communication(
yield from manage_communication( tqdm_options=tqdm_options,
tqdm_options=tqdm_options, input_values=input_values,
input_values=input_values, chunk_size=config.chunk_size,
chunk_size=config.chunk_size, input_queue=input_queue,
input_queue=input_queue, output_queue=output_queue,
output_queue=output_queue, unordered=unordered,
unordered=unordered, ignore_exceptions=ignore_exceptions,
ignore_exceptions=ignore_exceptions, )
) should_stop.set()
finally: for t in threads:
should_stop.set() t.join()
for t in threads:
t.join()