add an internal capsule

python · neonene · Apr 27, 2024 · Apr 27, 2024 · Apr 28, 2024 · Apr 28, 2024
commit 0769c965cf6de74e1f947ffcda2533fb6b408aee
@@ -186,16 +186,30 @@ typedef struct {
 } PyDateTime_CAPI;
 
 #define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI"
-
-PyAPI_FUNC(void) _PyDateTimeAPI_Import(void);
-PyAPI_FUNC(void) _PyDateTimeAPI_Clear(void);
-PyAPI_FUNC(PyDateTime_CAPI *) _PyDateTimeAPI_Get(void);
+#define PyDateTime_INTERNAL_CAPSULE_NAME "datetime.datetime_CAPI_INTERNAL"
 
 /* This block is only used as part of the public API and should not be
  * included in _datetimemodule.c, which does not use the C API capsule.
  * See bpo-35081 for more details.
  * */
 #ifndef _PY_DATETIME_IMPL
+static PyDateTime_CAPI *
+_PyDateTimeAPI_not_ready(void)
+{
+    return NULL;
+}
+typedef PyDateTime_CAPI *(*datetime_api_getfunc)(void);
+static datetime_api_getfunc _PyDateTimeAPI_Get = _PyDateTimeAPI_not_ready;
+
+static inline void
+_PyDateTimeAPI_Import(void)
+{
+    datetime_api_getfunc (*func)(void) = PyCapsule_Import(
+                                           PyDateTime_INTERNAL_CAPSULE_NAME, 0);
+    if (func) {
+        _PyDateTimeAPI_Get = func();
+    }
+}
 
 #define PyDateTimeAPI _PyDateTimeAPI_Get()
 #define PyDateTime_IMPORT _PyDateTimeAPI_Import()

@@ -91,7 +91,7 @@ def test_name_cleanup(self):
                     if not name.startswith('__') and not name.endswith('__'))
         allowed = set(['MAXYEAR', 'MINYEAR', 'date', 'datetime',
                        'datetime_CAPI', 'time', 'timedelta', 'timezone',
-                       'tzinfo', 'UTC', 'sys'])
+                       'tzinfo', 'UTC', 'sys', 'datetime_CAPI_INTERNAL'])
         self.assertEqual(names - allowed, set([]))
 
     def test_divide_and_round(self):

@@ -69,27 +69,23 @@ set_datetime_capi_by_interp(PyDateTime_CAPI *capi)
     _PyInterpreterState_GET()->datetime_capi = capi;
 }
 
-void
+static PyDateTime_CAPI *
+_PyDateTimeAPI_Get(void)
+{
+    return (PyDateTime_CAPI *)_PyInterpreterState_GET()->datetime_capi;
+}
+
+static void *
 _PyDateTimeAPI_Import(void)
 {
     PyDateTime_CAPI *capi = PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0);
     if (capi) {
         // PyInit__datetime() is not called when the module is already loaded
         // with single-phase init.
         set_datetime_capi_by_interp(capi);
+        return _PyDateTimeAPI_Get;
     }
-}
-
-PyDateTime_CAPI *
-_PyDateTimeAPI_Get(void)
-{
-    return (PyDateTime_CAPI *)_PyInterpreterState_GET()->datetime_capi;
-}
-
-void
-_PyDateTimeAPI_Clear(void)
-{
-    set_datetime_capi_by_interp(NULL);
+    return NULL;
 }
 
 /* We require that C int be at least 32 bits, and use int virtually
@@ -6972,6 +6968,18 @@ _datetime_exec(PyObject *module)
         PyMem_Free(capi);
         goto error;
     }
+
+    capsule = PyCapsule_New(_PyDateTimeAPI_Import,
+                            PyDateTime_INTERNAL_CAPSULE_NAME, NULL);
+    if (capsule == NULL) {
+        PyMem_Free(capi);
+        goto error;
+    }
+    if (PyModule_Add(module, "datetime_CAPI_INTERNAL", capsule) < 0) {
+        PyMem_Free(capi);
+        goto error;
+    }
+
     /* Ensure that the newest capi is used on multi-phase init */
     set_datetime_capi_by_interp(capi);
 

diff --git a/Modules/_testcapi/datetime.c b/Modules/_testcapi/datetime.c
@@ -8,9 +8,6 @@ static int test_run_counter = 0;
 static PyObject *
 test_datetime_capi(PyObject *self, PyObject *args)
 {
-    if (!test_run_counter) {
-        _PyDateTimeAPI_Clear();
-    }
     if (PyDateTimeAPI) {
         if (test_run_counter) {
             /* Probably regrtest.py -R */

@@ -998,7 +998,7 @@ datetime_capi_import_with_error(void)
 static int
 datetime_capi_client_exec(PyObject *m)
 {
-    _PyDateTimeAPI_Clear();
+    _PyDateTimeAPI_Get = _PyDateTimeAPI_not_ready;
     if (_PyDateTimeAPI_Get() != NULL) {
         PyErr_SetString(PyExc_AssertionError,
                         "DateTime API is expected to remain NULL.");

@@ -446,6 +446,7 @@ Modules/_tkinter.c	-	trbInCmd	-
 ## initialized once
 
 ## other
+Include/datetime.h	-	_PyDateTimeAPI_Get	-
 Modules/_ctypes/cfield.c	_ctypes_get_fielddesc	initialized	-
 Modules/_ctypes/malloc_closure.c	-	_pagesize	-
 Modules/_cursesmodule.c	-	initialised	-