Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions Lib/multiprocessing/pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -774,11 +774,18 @@ def get(self, timeout=None):
raise self._value

def _set(self, i, obj):
self._success, self._value = obj
if self._callback and self._success:
self._callback(self._value)
if self._error_callback and not self._success:
self._error_callback(self._value)
success, value = obj
try:
if self._callback and success:
self._callback(value)
if self._error_callback and not success:
self._error_callback(value)
except BaseException as e:
self._value = e
self._success = False
else:
self._value = value
self._success = success
self._event.set()
del self._cache[self._job]
self._pool = None
Expand Down Expand Up @@ -812,8 +819,12 @@ def _set(self, i, success_result):
if success and self._success:
self._value[i*self._chunksize:(i+1)*self._chunksize] = result
if self._number_left == 0:
if self._callback:
self._callback(self._value)
try:
if self._callback:
self._callback(self._value)
except BaseException as e:
self._value = e
self._success = False
del self._cache[self._job]
self._event.set()
self._pool = None
Expand All @@ -824,8 +835,12 @@ def _set(self, i, success_result):
self._value = result
if self._number_left == 0:
# only consider the result ready once all jobs are done
if self._error_callback:
self._error_callback(self._value)
try:
if self._error_callback:
self._error_callback(self._value)
except BaseException as e:
self._value = e
self._success = False
del self._cache[self._job]
self._event.set()
self._pool = None
Expand Down
Loading