Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
8b34b53c
Commit
8b34b53c
authored
Mar 31, 2012
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Plain Diff
Issue #14406: Fix a race condition when using `concurrent.futures.wait(return_when=ALL_COMPLETED)`.
Patch by Matt Joiner.
parents
6eeadf0a
f70401e8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
4 deletions
+25
-4
Lib/concurrent/futures/_base.py
Lib/concurrent/futures/_base.py
+5
-3
Lib/test/test_concurrent_futures.py
Lib/test/test_concurrent_futures.py
+17
-1
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/concurrent/futures/_base.py
View file @
8b34b53c
...
...
@@ -111,12 +111,14 @@ class _AllCompletedWaiter(_Waiter):
def
__init__
(
self
,
num_pending_calls
,
stop_on_exception
):
self
.
num_pending_calls
=
num_pending_calls
self
.
stop_on_exception
=
stop_on_exception
self
.
lock
=
threading
.
Lock
()
super
().
__init__
()
def
_decrement_pending_calls
(
self
):
self
.
num_pending_calls
-=
1
if
not
self
.
num_pending_calls
:
self
.
event
.
set
()
with
self
.
lock
:
self
.
num_pending_calls
-=
1
if
not
self
.
num_pending_calls
:
self
.
event
.
set
()
def
add_result
(
self
,
future
):
super
().
add_result
(
future
)
...
...
Lib/test/test_concurrent_futures.py
View file @
8b34b53c
...
...
@@ -183,7 +183,9 @@ class ProcessPoolShutdownTest(ProcessPoolMixin, ExecutorShutdownTest):
for
p
in
processes
.
values
():
p
.
join
()
class
WaitTests
(
unittest
.
TestCase
):
def
test_first_completed
(
self
):
future1
=
self
.
executor
.
submit
(
mul
,
21
,
2
)
future2
=
self
.
executor
.
submit
(
time
.
sleep
,
1.5
)
...
...
@@ -284,7 +286,21 @@ class WaitTests(unittest.TestCase):
class
ThreadPoolWaitTests
(
ThreadPoolMixin
,
WaitTests
):
pass
def
test_pending_calls_race
(
self
):
# Issue #14406: multi-threaded race condition when waiting on all
# futures.
event
=
threading
.
Event
()
def
future_func
():
event
.
wait
()
oldswitchinterval
=
sys
.
getswitchinterval
()
sys
.
setswitchinterval
(
1e-6
)
try
:
fs
=
{
self
.
executor
.
submit
(
future_func
)
for
i
in
range
(
100
)}
event
.
set
()
futures
.
wait
(
fs
,
return_when
=
futures
.
ALL_COMPLETED
)
finally
:
sys
.
setswitchinterval
(
oldswitchinterval
)
class
ProcessPoolWaitTests
(
ProcessPoolMixin
,
WaitTests
):
...
...
Misc/NEWS
View file @
8b34b53c
...
...
@@ -37,6 +37,9 @@ Core and Builtins
Library
-------
-
Issue
#
14406
:
Fix
a
race
condition
when
using
``
concurrent
.
futures
.
wait
(
return_when
=
ALL_COMPLETED
)``.
Patch
by
Matt
Joiner
.
-
Issue
#
5136
:
deprecate
old
,
unused
functions
from
tkinter
.
-
Issue
#
14409
:
IDLE
now
properly
executes
commands
in
the
Shell
window
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment