Fix stray changes.

Author: ZeroIntensity

Include/cpython/pystate.h

@@ -322,7 +322,7 @@ PyAPI_FUNC(void) _PyInterpreterState_SetEvalFrameFunc(
     PyInterpreterState *interp,
     _PyFrameEvalFunction eval_frame);
 
-/* Interpreter locks */
+/* Interpreter guards */
 
 typedef uintptr_t PyInterpreterGuard;
 typedef uintptr_t PyInterpreterView;

Include/internal/pycore_pystate.h

@@ -339,7 +339,7 @@ _Py_RecursionLimit_GetMargin(PyThreadState *tstate)
 }
 
 // Exports for '_testinternalcapi' shared extension
-PyAPI_FUNC(Py_ssize_t) _PyInterpreterState_LockCountdown(PyInterpreterState *interp);
+PyAPI_FUNC(Py_ssize_t) _PyInterpreterState_GuardCountdown(PyInterpreterState *interp);
 
 #ifdef __cplusplus
 }

Modules/_testcapimodule.c

@@ -2562,6 +2562,7 @@ toggle_reftrace_printer(PyObject *ob, PyObject *arg)
     Py_RETURN_NONE;
 }
 
+
 typedef struct {
     PyObject_HEAD
 } ManagedWeakrefNoGCObject;

Modules/_testinternalcapi.c

@@ -2460,28 +2460,6 @@ check_threadstate_set_stack_protection(PyThreadState *tstate,
     assert(ts->c_stack_soft_limit < ts->c_stack_top);
 }
 
-#define NUM_GUARDS 100
-
-static PyObject *
-test_interp_guard_countdown(PyObject *self, PyObject *unused)
-{
-    PyInterpreterState *interp = PyInterpreterState_Get();
-    assert(_PyInterpreterState_LockCountdown(interp) == 0);
-    PyInterpreterGuard guards[NUM_GUARDS];
-    for (int i = 0; i < NUM_GUARDS; ++i) {
-        guards[i] = PyInterpreterGuard_FromCurrent();
-        assert(guards[i] != 0);
-        assert(_PyInterpreterState_LockCountdown(interp) == i + 1);
-    }
-
-    for (int i = 0; i < NUM_GUARDS; ++i) {
-        PyInterpreterGuard_Release(guards[i]);
-        assert(_PyInterpreterState_LockCountdown(interp) == (NUM_GUARDS - i - 1));
-    }
-
-    Py_RETURN_NONE;
-}
-
 
 static PyObject *
 test_threadstate_set_stack_protection(PyObject *self, PyObject *Py_UNUSED(args))
@@ -2519,6 +2497,28 @@ test_threadstate_set_stack_protection(PyObject *self, PyObject *Py_UNUSED(args))
     Py_RETURN_NONE;
 }
 
+#define NUM_GUARDS 100
+
+static PyObject *
+test_interp_guard_countdown(PyObject *self, PyObject *unused)
+{
+    PyInterpreterState *interp = PyInterpreterState_Get();
+    assert(_PyInterpreterState_GuardCountdown(interp) == 0);
+    PyInterpreterGuard guards[NUM_GUARDS];
+    for (int i = 0; i < NUM_GUARDS; ++i) {
+        guards[i] = PyInterpreterGuard_FromCurrent();
+        assert(guards[i] != 0);
+        assert(_PyInterpreterState_GuardCountdown(interp) == i + 1);
+    }
+
+    for (int i = 0; i < NUM_GUARDS; ++i) {
+        PyInterpreterGuard_Release(guards[i]);
+        assert(_PyInterpreterState_GuardCountdown(interp) == (NUM_GUARDS - i - 1));
+    }
+
+    Py_RETURN_NONE;
+}
+
 static PyObject *
 test_interp_view_countdown(PyObject *self, PyObject *unused)
 {
@@ -2527,20 +2527,20 @@ test_interp_view_countdown(PyObject *self, PyObject *unused)
     if (view == 0) {
         return NULL;
     }
-    assert(_PyInterpreterState_LockCountdown(interp) == 0);
+    assert(_PyInterpreterState_GuardCountdown(interp) == 0);
 
     PyInterpreterGuard guards[NUM_GUARDS];
 
     for (int i = 0; i < NUM_GUARDS; ++i) {
         guards[i] = PyInterpreterGuard_FromView(view);
         assert(guards[i] != 0);
         assert(PyInterpreterGuard_GetInterpreter(guards[i]) == interp);
-        assert(_PyInterpreterState_LockCountdown(interp) == i + 1);
+        assert(_PyInterpreterState_GuardCountdown(interp) == i + 1);
     }
 
     for (int i = 0; i < NUM_GUARDS; ++i) {
         PyInterpreterGuard_Release(guards[i]);
-        assert(_PyInterpreterState_LockCountdown(interp) == (NUM_GUARDS - i - 1));
+        assert(_PyInterpreterState_GuardCountdown(interp) == (NUM_GUARDS - i - 1));
     }
 
     PyInterpreterView_Close(view);

Python/pystate.c

@@ -1560,6 +1560,7 @@ new_threadstate(PyInterpreterState *interp, int whence)
     }
 #endif
 
+
 #ifdef Py_STATS
     // The PyStats structure is quite large and is allocated separated from tstate.
     if (!_PyStats_ThreadInit(interp, tstate)) {
@@ -3186,7 +3187,7 @@ _Py_GetMainConfig(void)
 }
 
 Py_ssize_t
-_PyInterpreterState_LockCountdown(PyInterpreterState *interp)
+_PyInterpreterState_GuardCountdown(PyInterpreterState *interp)
 {
     assert(interp != NULL);
     return _Py_atomic_load_ssize_relaxed(&interp->finalization_guards.countdown);