summaryrefslogtreecommitdiff
path: root/Python/thread.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-12-13 11:08:56 +0100
committerVictor Stinner <victor.stinner@gmail.com>2013-12-13 11:08:56 +0100
commit590cebe391fb2e199afe9b20ff67e360116a1266 (patch)
tree4adb2f6536cb319f479fbb2de06644f2ca32326d /Python/thread.c
parentcb1c4c8c22e27f0f7a01e1bb5ad78a804cf17c07 (diff)
downloadcpython-git-590cebe391fb2e199afe9b20ff67e360116a1266.tar.gz
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.c')
-rw-r--r--Python/thread.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/Python/thread.c b/Python/thread.c
index 8540942e28..d1cb0e6f9d 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -205,7 +205,7 @@ static int nkeys = 0; /* PyThread_create_key() hands out nkeys+1 next */
* segfaults. Now we lock the whole routine.
*/
static struct key *
-find_key(int key, void *value)
+find_key(int set_value, int key, void *value)
{
struct key *p, *prev_p;
long id = PyThread_get_thread_ident();
@@ -215,8 +215,11 @@ find_key(int key, void *value)
PyThread_acquire_lock(keymutex, 1);
prev_p = NULL;
for (p = keyhead; p != NULL; p = p->next) {
- if (p->id == id && p->key == key)
+ if (p->id == id && p->key == key) {
+ if (set_value)
+ p->value = value;
goto Done;
+ }
/* Sanity check. These states should never happen but if
* they do we must abort. Otherwise we'll end up spinning in
* in a tight loop with the lock held. A similar check is done
@@ -227,7 +230,7 @@ find_key(int key, void *value)
if (p->next == keyhead)
Py_FatalError("tls find_key: circular list(!)");
}
- if (value == NULL) {
+ if (!set_value && value == NULL) {
assert(p == NULL);
goto Done;
}
@@ -279,19 +282,12 @@ PyThread_delete_key(int key)
PyThread_release_lock(keymutex);
}
-/* Confusing: If the current thread has an association for key,
- * value is ignored, and 0 is returned. Else an attempt is made to create
- * an association of key to value for the current thread. 0 is returned
- * if that succeeds, but -1 is returned if there's not enough memory
- * to create the association. value must not be NULL.
- */
int
PyThread_set_key_value(int key, void *value)
{
struct key *p;
- assert(value != NULL);
- p = find_key(key, value);
+ p = find_key(1, key, value);
if (p == NULL)
return -1;
else
@@ -304,7 +300,7 @@ PyThread_set_key_value(int key, void *value)
void *
PyThread_get_key_value(int key)
{
- struct key *p = find_key(key, NULL);
+ struct key *p = find_key(0, key, NULL);
if (p == NULL)
return NULL;