[Python-checkins] cpython: Issue #26588: more assertions

[victor.stinner]

https://hg.python.org/cpython/rev/bbdb24611294
changeset:   100658:bbdb24611294
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Mar 22 17:40:07 2016 +0100
summary:
  Issue #26588: more assertions

files:
  Modules/_tracemalloc.c |  25 +++++++++++++++++++++++--
  1 files changed, 23 insertions(+), 2 deletions(-)


diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
--- a/Modules/_tracemalloc.c
+++ b/Modules/_tracemalloc.c
@@ -189,11 +189,11 @@
 {
     assert(reentrant == 0 || reentrant == 1);
     if (reentrant) {
-        assert(PyThread_get_key_value(tracemalloc_reentrant_key) == NULL);
+        assert(!get_reentrant());
         PyThread_set_key_value(tracemalloc_reentrant_key, REENTRANT);
     }
     else {
-        assert(PyThread_get_key_value(tracemalloc_reentrant_key) == REENTRANT);
+        assert(get_reentrant());
         PyThread_set_key_value(tracemalloc_reentrant_key, NULL);
     }
 }
@@ -901,6 +901,11 @@
 tracemalloc_init(void)
 {
 DEBUG("tracemalloc_init()");
+
+#ifdef WITH_THREAD
+    assert(PyGILState_Check());
+#endif
+
     if (tracemalloc_config.initialized == TRACEMALLOC_FINALIZED) {
         PyErr_SetString(PyExc_RuntimeError,
                         "the tracemalloc module has been unloaded");
@@ -1027,6 +1032,11 @@
     size_t size;
 
 DEBUG("tracemalloc_start()");
+
+#ifdef WITH_THREAD
+    assert(PyGILState_Check());
+#endif
+
     if (tracemalloc_init() < 0) {
 DEBUG("tracemalloc_start(): ERROR! init failed!");
         return -1;
@@ -1035,8 +1045,10 @@
     if (tracemalloc_config.tracing) {
         /* hook already installed: do nothing */
 DEBUG("tracemalloc_start(): exit (already tracing)");
+assert(!get_reentrant());
         return 0;
     }
+assert(get_reentrant());
 
     assert(1 <= max_nframe && max_nframe <= MAX_NFRAME);
     tracemalloc_config.max_nframe = max_nframe;
@@ -1081,6 +1093,7 @@
     set_reentrant(0);
 
 DEBUG("tracemalloc_start(): done");
+assert(!get_reentrant());
     return 0;
 }
 
@@ -1089,10 +1102,17 @@
 tracemalloc_stop(void)
 {
 DEBUG("tracemalloc_stop()");
+
+#ifdef WITH_THREAD
+    assert(PyGILState_Check());
+#endif
+
     if (!tracemalloc_config.tracing) {
 DEBUG("tracemalloc_stop(): exit (not tracing)");
+assert(get_reentrant());
         return;
     }
+assert(!get_reentrant());
 
     /* stop tracing Python memory allocations */
     tracemalloc_config.tracing = 0;
@@ -1115,6 +1135,7 @@
     raw_free(tracemalloc_traceback);
     tracemalloc_traceback = NULL;
 DEBUG("tracemalloc_stop(): done");
+assert(get_reentrant());
 }
 
 PyDoc_STRVAR(tracemalloc_is_tracing_doc,

-- 
Repository URL: https://hg.python.org/cpython