Merge pull request #187 from hpyproject/antocuni/debug-mode-closed-ha…

…ndles-followup

PR #176 follow up

Makefile

@@ -16,6 +16,7 @@ cppcheck-build-dir:
 
 cppcheck: cppcheck-build-dir
 	# azure pipelines doesn't show stderr, so we write the errors to a file and cat it later :(
+	cppcheck --version
 	cppcheck \
 		--error-exitcode=1 \
 		--cppcheck-build-dir=$(or ${CPPCHECK_BUILD_DIR}, .cppcheck) \

azure-pipelines.yml

@@ -129,15 +129,15 @@ jobs:
       python test/check_py27_compat.py
     displayName: 'check_py27_compat.py'
 
-- job: CPPCheck
-  pool:
-    vmImage: 'ubuntu-latest'
-  displayName: "Run CPPCheck"
-  steps:
-  - template: azure-templates/cppcheck.yml
-  - template: azure-templates/python.yml
-  - script: make cppcheck
-    displayName: Run CPPCheck
+# - job: CPPCheck
+#   pool:
+#     vmImage: 'ubuntu-latest'
+#   displayName: "Run CPPCheck"
+#   steps:
+#   - template: azure-templates/cppcheck.yml
+#   - template: azure-templates/python.yml
+#   - script: make cppcheck
+#     displayName: Run CPPCheck
 
 - job: infer
   pool:

hpy/debug/src/debug_handles.c

@@ -74,22 +74,10 @@ void DHPy_invalid_handle(HPyContext *dctx, DHPy dh)
        the callback and let the execution to continue, so that people
        can fix the warnings one by one.
     */
-    // XXX: so far the only call API that we have is CallTupleDict, we
-    // should use a more C-friendly variant as soon as we have it.
-    UHPy uh_args = HPy_NULL;
     UHPy uh_res = HPy_NULL;
-    uh_args = HPyTuple_Pack(uctx, 0);
-    if (HPy_IsNull(uh_args)) {
-        print_error(uctx, "Error when preparing args to call the on_invalid_handle callback");
-        goto exit;
-    }
-    uh_res = HPy_CallTupleDict(uctx, info->uh_on_invalid_handle, uh_args, HPy_NULL);
-    if (HPy_IsNull(uh_res)) {
+    uh_res = HPy_CallTupleDict(uctx, info->uh_on_invalid_handle, HPy_NULL, HPy_NULL);
+    if (HPy_IsNull(uh_res))
         print_error(uctx, "Error when executing the on_invalid_handle callback");
-        goto exit;
-    }
- exit:
-    HPy_Close(uctx, uh_args);
     HPy_Close(uctx, uh_res);
 }
 

hpy/debug/src/dhqueue.c

@@ -1,5 +1,7 @@
 #include "debug_internal.h"
 
+// TODO: we need to make DHQueue thread-safe if we want to use the same
+// context in multiple threads
 void DHQueue_init(DHQueue *q) {
     q->head = NULL;
     q->tail = NULL;
@@ -46,7 +48,7 @@ DebugHandle *DHQueue_popfront(DHQueue *q)
 void DHQueue_remove(DHQueue *q, DebugHandle *h)
 {
 #ifndef NDEBUG
-    // if we are debugging, let's check that h it's effectively in the queue
+    // if we are debugging, let's check that h is effectively in the queue
     DebugHandle *it = q->head;
     bool found = false;
     while(it != NULL) {