Get module without interp-dict and weakref

Author: neonene

Include/internal/pycore_global_objects_fini_generated.h

@@ -326,7 +326,6 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(c_call)
         STRUCT_FOR_ID(c_exception)
         STRUCT_FOR_ID(c_return)
-        STRUCT_FOR_ID(cached_datetime_module)
         STRUCT_FOR_ID(cached_statements)
         STRUCT_FOR_ID(cadata)
         STRUCT_FOR_ID(cafile)

Include/internal/pycore_global_strings.h

@@ -36,8 +36,7 @@ static PyTypeObject PyDateTime_TimeZoneType;
 
 
 typedef struct {
-    /* Corresponding module that can be referred even after
-     * its weak reference stops working at shutdown. */
+    /* Corresponding module that is referenced via the interpreter state. */
     PyObject *module;
 
     /* Module heap types. */
@@ -126,68 +125,37 @@ get_module_state(PyObject *module)
 }
 
 
-#define INTERP_KEY ((PyObject *)&_Py_ID(cached_datetime_module))
-
 static PyObject *
 get_current_module(PyInterpreterState *interp, int *p_reloading)
 {
-    PyObject *mod = NULL;
-    int reloading = 0;
-
-    PyObject *dict = PyInterpreterState_GetDict(interp);
-    if (dict == NULL) {
-        goto error;
-    }
-    PyObject *ref = NULL;
-    if (PyDict_GetItemRef(dict, INTERP_KEY, &ref) < 0) {
-        goto error;
-    }
-    if (ref != NULL) {
-        reloading = 1;
-        if (ref != Py_None) {
-            (void)PyWeakref_GetRef(ref, &mod);
-            if (mod == Py_None) {
-                Py_CLEAR(mod);
-            }
-            Py_DECREF(ref);
-        }
-    }
+    datetime_state *st = interp->datetime_module_state;
     if (p_reloading != NULL) {
-        *p_reloading = reloading;
+        *p_reloading = st != NULL ? 1 : 0;
+    }
+    if (st != NULL && st != (void *)Py_None && st->module != NULL) {
+        assert(PyModule_CheckExact(st->module));
+        return Py_NewRef(st->module);
     }
-    return mod;
-
-error:
-    assert(PyErr_Occurred());
     return NULL;
 }
 
-static PyModuleDef datetimemodule;
-
 static datetime_state *
 _get_current_state(PyObject **p_mod)
 {
     PyInterpreterState *interp = PyInterpreterState_Get();
     datetime_state *st = interp->datetime_module_state;
-    if (st != NULL && st->module != NULL) {
+    if (st != NULL && st != (void *)Py_None && st->module != NULL) {
         assert(PyModule_CheckExact(st->module));
         *p_mod = Py_NewRef(st->module);
         return st;
     }
 
-    PyObject *mod = get_current_module(interp, NULL);
+    assert(!_Py_IsInterpreterFinalizing(interp));
+    /* The static types can outlive the module,
+     * so we must re-import the module. */
+    PyObject *mod = PyImport_ImportModule("_datetime");
     if (mod == NULL) {
-        assert(!PyErr_Occurred());
-        if (PyErr_Occurred()) {
-            return NULL;
-        }
-        assert(!_Py_IsInterpreterFinalizing(interp));
-        /* The static types can outlive the module,
-         * so we must re-import the module. */
-        mod = PyImport_ImportModule("_datetime");
-        if (mod == NULL) {
-            return NULL;
-        }
+        return NULL;
     }
     st = get_module_state(mod);
     *p_mod = mod;
@@ -203,65 +171,18 @@ static int
 set_current_module(PyInterpreterState *interp, PyObject *mod)
 {
     assert(mod != NULL);
-    PyObject *dict = PyInterpreterState_GetDict(interp);
-    if (dict == NULL) {
-        return -1;
-    }
-    PyObject *ref = PyWeakref_NewRef(mod, NULL);
-    if (ref == NULL) {
-        return -1;
-    }
-    int rc = PyDict_SetItem(dict, INTERP_KEY, ref);
-    Py_DECREF(ref);
-    interp->datetime_module_state = rc == 0 ? get_module_state(mod) : NULL;
-    return rc;
+    interp->datetime_module_state = get_module_state(mod);
+    return 0;
 }
 
 static void
 clear_current_module(PyInterpreterState *interp, PyObject *expected)
 {
-    PyObject *exc = PyErr_GetRaisedException();
-
-    PyObject *dict = PyInterpreterState_GetDict(interp);
-    if (dict == NULL) {
-        goto error;
-    }
-
-    if (expected != NULL) {
-        PyObject *ref = NULL;
-        if (PyDict_GetItemRef(dict, INTERP_KEY, &ref) < 0) {
-            goto error;
-        }
-        if (ref != NULL) {
-            PyObject *current = NULL;
-            int rc = PyWeakref_GetRef(ref, &current);
-            /* We only need "current" for pointer comparison. */
-            Py_XDECREF(current);
-            Py_DECREF(ref);
-            if (rc < 0) {
-                goto error;
-            }
-            if (current != expected) {
-                goto finally;
-            }
-        }
+    if (expected && get_module_state(expected) != interp->datetime_module_state) {
+        return;
     }
-
     /* We use None to identify that the module was previously loaded. */
-    if (PyDict_SetItem(dict, INTERP_KEY, Py_None) < 0) {
-        goto error;
-    }
-
-    goto finally;
-
-error:
-    PyErr_FormatUnraisable("Exception ignored while clearing _datetime module");
-
-finally:
-    if (!expected || get_module_state(expected) == interp->datetime_module_state) {
-        interp->datetime_module_state = NULL;
-    }
-    PyErr_SetRaisedException(exc);
+    interp->datetime_module_state = Py_None;
 }