Apply suggestions from code review

Co-authored-by: Victor Stinner <vstinner@python.org>
python · ZeroIntensity · Apr 24, 2025 · Apr 24, 2025 · Apr 25, 2025 · Apr 25, 2025
commit 71f2fd7d46831209a31dc18b22f493ba58852e9d
@@ -279,11 +279,11 @@ PyAPI_FUNC(PyInterpreterState *) PyInterpreterRef_AsInterpreter(PyInterpreterRef
 #define PyInterpreterRef_Close(ref) do {    \
    PyInterpreterRef_Close(ref);            \
    ref = 0;                                \
-} while (0);
+} while (0)

 /* Weak interpreter references */

-typedef struct _interpreter_weakref {
+typedef struct _PyInterpreterWeakRef {
    int64_t id;
    Py_ssize_t refcount;
 } _PyInterpreterWeakRef;
@@ -298,7 +298,7 @@ PyAPI_FUNC(void) PyInterpreterWeakRef_Close(PyInterpreterWeakRef wref);
 #define PyInterpreterWeakRef_Close(ref) do {    \
    PyInterpreterWeakRef_Close(ref);            \
    ref = 0;                                    \
-} while (0);
+} while (0)

 // Exports for '_testcapi' shared extension
 PyAPI_FUNC(Py_ssize_t) _PyInterpreterState_Refcount(PyInterpreterState *interp);

diff --git a/Programs/_testembed.c b/Programs/_testembed.c
@@ -2313,7 +2313,9 @@
    return result;
 }

-const char *THREAD_CODE = "import time\n"
+const char *THREAD_CODE = \
+     "import time\n"
+     ...
                   "time.sleep(0.2)\n"
                   "def fib(n):\n"
                   "  if n <= 1:\n"

@@ -3141,8 +3141,7 @@ Py_ssize_t
 _PyInterpreterState_Refcount(PyInterpreterState *interp)
 {
    assert(interp != NULL);
-    Py_ssize_t refcount = _Py_atomic_load_ssize_relaxed(&interp->threads.finalizing.countdown);
-    return refcount;
+    return _Py_atomic_load_ssize_relaxed(&interp->threads.finalizing.countdown);
 }

 int
@@ -3168,7 +3167,7 @@ ref_as_interp(PyInterpreterRef ref)
 {
    PyInterpreterState *interp = (PyInterpreterState *)ref;
    if (interp == NULL) {
-        Py_FatalError("Got a null interpreter reference, likely due to use after close.");
+        Py_FatalError("Got a null interpreter reference, likely due to use after PyInterpreterRef_Close()");
    }

    return interp;
@@ -3235,7 +3234,7 @@ wref_handle_as_ptr(PyInterpreterWeakRef wref_handle)
 {
    _PyInterpreterWeakRef *wref = (_PyInterpreterWeakRef *)wref_handle;
    if (wref == NULL) {
-        Py_FatalError("Got a null weak interpreter reference, likely due to use after close.");
+        Py_FatalError("Got a null weak interpreter reference, likely due to use after PyInterpreterWeakRef_Close()");
    }

    return wref;
@@ -3269,7 +3268,8 @@ try_acquire_strong_ref(PyInterpreterState *interp, PyInterpreterRef *strong_ptr)
        /* Interpreter has already finished threads */
        *strong_ptr = 0;
        return -1;
-    } else {
+    }
+    else {
        _Py_atomic_add_ssize(&finalizing->countdown, 1);
    }
    PyMutex_Unlock(mutex);
-Original file line number
+Diff line change
@@ -2313,7 +2313,9 @@
         return result;
     }
-    const char *THREAD_CODE = "import time\n"
+    const char *THREAD_CODE = \
+         "import time\n"
+         ...
     Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Ubuntu (free-threading)  / build and test (ubuntu-24.04)
  

  
    
      
    
  

  
    expected ‘,’ or ‘;’ before ‘...’ token
  




        
  
  
      
  
  
    Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Ubuntu   / build and test (ubuntu-24.04)
  

  
    
      
    
  

  
    expected ‘,’ or ‘;’ before ‘...’ token
  




        
  
  
      
  
  
    Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Ubuntu  (bolt) / build and test (ubuntu-24.04)
  

  
    
      
    
  

  
    expected ‘,’ or ‘;’ before ‘...’ token
  




        
  
  
      
  
  
    Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Ubuntu (free-threading)  / build and test (ubuntu-24.04-arm)
  

  
    
      
    
  

  
    expected ‘,’ or ‘;’ before ‘...’ token
  




        
  
  
      
  
  
    Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Cross build Linux
  

  
    
      
    
  

  
    expected ‘,’ or ‘;’ before ‘...’ token
  




        
  
  
      
  
  
    Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Hypothesis tests on Ubuntu
  

  
    
      
    
  

  
    expected ‘,’ or ‘;’ before ‘...’ token
  




        
  
  
      
  
  
    Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Ubuntu   / build and test (ubuntu-24.04-arm)
  

  
    
      
    
  

  
    expected ‘,’ or ‘;’ before ‘...’ token
  




        
  
  
      
  
  
    Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Windows  / Build and test (x64)
  

  
    
      
    
  

  
    syntax error: missing ';' before '...' [D:\a\cpython\cpython\PCbuild\_testembed.vcxproj]
  




        
  
  
      
  
  
    Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Windows (free-threading) / Build and test (x64)
  

  
    
      
    
  

  
    syntax error: missing ';' before '...' [D:\a\cpython\cpython\PCbuild\_testembed.vcxproj]
  




        
  
  
      
  
  
    Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Address sanitizer (ubuntu-24.04)
  

  
    
      
    
  

  
    expected ‘,’ or ‘;’ before ‘...’ token
  




        
  
  
      
  
  
    Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Windows  / Build and test (arm64)
  

  
    
      
    
  

  
    syntax error: missing ';' before '...' [C:\a\cpython\cpython\PCbuild\_testembed.vcxproj]
  




        
  
  
      
  
  
    Check failure
        on line 2318
        in Programs/_testembed.c
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Windows (free-threading) / Build and test (arm64)
  

  
    
      
    
  

  
    syntax error: missing ';' before '...' [C:\a\cpython\cpython\PCbuild\_testembed.vcxproj]
                   vstinner marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
                        "time.sleep(0.2)\n"
                        "def fib(n):\n"
                        "  if n <= 1:\n"
-          Expand Down