Merge: #11866: Eliminate race condition in the computation of names for new threads.
diff --git a/Lib/threading.py b/Lib/threading.py
index f7422dd..24cc911 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -6,7 +6,7 @@
from time import monotonic as _time
from traceback import format_exc as _format_exc
from _weakrefset import WeakSet
-from itertools import islice as _islice
+from itertools import islice as _islice, count as _count
try:
from _collections import deque as _deque
except ImportError:
@@ -729,11 +729,10 @@
# Helper to generate new thread names
-_counter = 0
+_counter = _count().__next__
+_counter() # Consume 0 so first non-main thread has id 1.
def _newname(template="Thread-%d"):
- global _counter
- _counter += 1
- return template % _counter
+ return template % _counter()
# Active thread administration
_active_limbo_lock = _allocate_lock()
diff --git a/Misc/NEWS b/Misc/NEWS
index 6b8ef3e..c23186d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -162,6 +162,9 @@
Library
-------
+- Issue #11866: Eliminated race condition in the computation of names
+ for new threads.
+
- Issue #21905: Avoid RuntimeError in pickle.whichmodule() when sys.modules
is mutated while iterating. Patch by Olivier Grisel.