summaryrefslogtreecommitdiffstats
path: root/Python/thread_nt.h
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-12-13 10:08:56 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-12-13 10:08:56 (GMT)
commit590cebe391fb2e199afe9b20ff67e360116a1266 (patch)
tree4adb2f6536cb319f479fbb2de06644f2ca32326d /Python/thread_nt.h
parentcb1c4c8c22e27f0f7a01e1bb5ad78a804cf17c07 (diff)
downloadcpython-590cebe391fb2e199afe9b20ff67e360116a1266.zip
cpython-590cebe391fb2e199afe9b20ff67e360116a1266.tar.gz
cpython-590cebe391fb2e199afe9b20ff67e360116a1266.tar.bz2
Issue #19787: PyThread_set_key_value() now always set the value
In Python 3.3, PyThread_set_key_value() did nothing if the key already exists (if the current value is a non-NULL pointer). When _PyGILState_NoteThreadState() is called twice on the same thread with a different Python thread state, it still keeps the old Python thread state to keep the old behaviour. Replacing the Python thread state with the new state introduces new bugs: see issues #10915 and #15751.
Diffstat (limited to 'Python/thread_nt.h')
-rw-r--r--Python/thread_nt.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/Python/thread_nt.h b/Python/thread_nt.h
index ab5a081..ee2079f 100644
--- a/Python/thread_nt.h
+++ b/Python/thread_nt.h
@@ -389,20 +389,11 @@ PyThread_delete_key(int key)
TlsFree(key);
}
-/* We must be careful to emulate the strange semantics implemented in thread.c,
- * where the value is only set if it hasn't been set before.
- */
int
PyThread_set_key_value(int key, void *value)
{
BOOL ok;
- void *oldvalue;
- assert(value != NULL);
- oldvalue = TlsGetValue(key);
- if (oldvalue != NULL)
- /* ignore value if already set */
- return 0;
ok = TlsSetValue(key, value);
if (!ok)
return -1;