Rename interpreter cleanup functions

ashm-dev · ashm-dev · commit e6ff33e158b6 · 2025-10-19T15:10:26.000+03:00
Rename functions to be more descriptive of their actions.
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -486,19 +486,19 @@ free_interpreter(PyInterpreterState *interp)
 }
 
 static void
-_finalize_and_free_interpreter(PyInterpreterState *interp)
+cleanup_and_free_interpreter(PyInterpreterState *interp)
 {
     _Py_qsbr_fini(interp);
     _PyObject_FiniState(interp);
     free_interpreter(interp);
 }
 
 static inline void
-_interp_release_owner(PyInterpreterState *interp)
+release_interp_owner(PyInterpreterState *interp)
 {
     Py_ssize_t prev = _Py_atomic_add_ssize(&interp->owners, -1);
     if (prev == 1) {
-        _finalize_and_free_interpreter(interp);
+        cleanup_and_free_interpreter(interp);
     }
 }
 
@@ -975,7 +975,7 @@ PyInterpreterState_Delete(PyInterpreterState *interp)
 
     interp->finalizing = 1;
 
-    _interp_release_owner(interp);
+    release_interp_owner(interp);
 }
 
 
@@ -1441,7 +1441,7 @@ free_threadstate(_PyThreadStateImpl *tstate)
         PyMem_RawFree(tstate);
     }
 
-    _interp_release_owner(interp);
+    release_interp_owner(interp);
 }
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -486,19 +486,19 @@ free_interpreter(PyInterpreterState *interp)`
`486`	`486`	`}`
`487`	`487`
`488`	`488`	`static void`
`489`		`-_finalize_and_free_interpreter(PyInterpreterState *interp)`
	`489`	`+cleanup_and_free_interpreter(PyInterpreterState *interp)`
`490`	`490`	`{`
`491`	`491`	`_Py_qsbr_fini(interp);`
`492`	`492`	`_PyObject_FiniState(interp);`
`493`	`493`	`free_interpreter(interp);`
`494`	`494`	`}`
`495`	`495`
`496`	`496`	`static inline void`
`497`		`-_interp_release_owner(PyInterpreterState *interp)`
	`497`	`+release_interp_owner(PyInterpreterState *interp)`
`498`	`498`	`{`
`499`	`499`	`Py_ssize_t prev = _Py_atomic_add_ssize(&interp->owners, -1);`
`500`	`500`	`if (prev == 1) {`
`501`		`- _finalize_and_free_interpreter(interp);`
	`501`	`+ cleanup_and_free_interpreter(interp);`
`502`	`502`	`}`
`503`	`503`	`}`
`504`	`504`
`@@ -975,7 +975,7 @@ PyInterpreterState_Delete(PyInterpreterState *interp)`
`975`	`975`
`976`	`976`	`interp->finalizing = 1;`
`977`	`977`
`978`		`- _interp_release_owner(interp);`
	`978`	`+ release_interp_owner(interp);`
`979`	`979`	`}`
`980`	`980`
`981`	`981`
`@@ -1441,7 +1441,7 @@ free_threadstate(_PyThreadStateImpl *tstate)`
`1441`	`1441`	`PyMem_RawFree(tstate);`
`1442`	`1442`	`}`
`1443`	`1443`
`1444`		`- _interp_release_owner(interp);`
	`1444`	`+ release_interp_owner(interp);`
`1445`	`1445`	`}`
`1446`	`1446`
`1447`	`1447`	`static void`