summaryrefslogtreecommitdiff
path: root/Modules/_tracemalloc.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-12-13 04:14:41 +0100
committerVictor Stinner <victor.stinner@gmail.com>2013-12-13 04:14:41 +0100
commit85178aa8d643e098eeb3d1314194316369b49846 (patch)
tree0a5f32480083e00871ebc81123a615fbeae63fc4 /Modules/_tracemalloc.c
parentcb588ebd972405b416e626d1f26b26563b68d2c9 (diff)
downloadcpython-85178aa8d643e098eeb3d1314194316369b49846.tar.gz
Backout changeset 46393019b650
test_capi is failing and the fix is not trivial, I prefer to revert
Diffstat (limited to 'Modules/_tracemalloc.c')
-rw-r--r--Modules/_tracemalloc.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
index 95b05d61c5..b39e950c27 100644
--- a/Modules/_tracemalloc.c
+++ b/Modules/_tracemalloc.c
@@ -168,11 +168,14 @@ set_reentrant(int reentrant)
assert(reentrant == 0 || reentrant == 1);
if (reentrant) {
assert(PyThread_get_key_value(tracemalloc_reentrant_key) == NULL);
- PyThread_set_key_value(tracemalloc_reentrant_key, REENTRANT);
+ PyThread_set_key_value(tracemalloc_reentrant_key,
+ REENTRANT);
}
else {
- assert(PyThread_get_key_value(tracemalloc_reentrant_key) == REENTRANT);
- PyThread_set_key_value(tracemalloc_reentrant_key, NULL);
+ /* FIXME: PyThread_set_key_value() cannot be used to set the flag
+ to zero, because it does nothing if the variable has already
+ a value set. */
+ PyThread_delete_key_value(tracemalloc_reentrant_key);
}
}