PyInterpreterState.global_config -> _PyRuntimeState.config.

Author: ericsnowcurrently

Include/internal/pycore_interp.h

@@ -135,7 +135,6 @@ struct _is {
     PyObject *codec_error_registry;
     int codecs_initialized;
 
-    PyConfig global_config;
     _PyInterpreterConfig config;
 
 #ifdef HAVE_DLOPEN

Include/internal/pycore_runtime.h

@@ -118,6 +118,7 @@ typedef struct pyruntimestate {
     struct _gilstate_runtime_state gilstate;
 
     PyPreConfig preconfig;
+    PyConfig config;
 
     // Audit values must be preserved when Py_Initialize()/Py_Finalize()
     // is called multiple times.

Python/pylifecycle.c

@@ -456,26 +456,28 @@ _Py_SetLocaleFromEnv(int category)
 
 
 static int
-interpreter_update_config(PyThreadState *tstate, int only_update_path_config)
+runtime_update_config(_PyRuntimeState *runtime, int only_update_path_config)
 {
-    const PyConfig *config = &tstate->interp->global_config;
-
     if (!only_update_path_config) {
-        PyStatus status = _PyConfig_Write(config, tstate->interp->runtime);
+        PyStatus status = _PyConfig_Write(&runtime->config, runtime);
         if (_PyStatus_EXCEPTION(status)) {
             _PyErr_SetFromPyStatus(status);
             return -1;
         }
     }
 
-    if (_Py_IsMainInterpreter(tstate->interp)) {
-        PyStatus status = _PyPathConfig_UpdateGlobal(config);
-        if (_PyStatus_EXCEPTION(status)) {
-            _PyErr_SetFromPyStatus(status);
-            return -1;
-        }
+    PyStatus status = _PyPathConfig_UpdateGlobal(&runtime->config);
+    if (_PyStatus_EXCEPTION(status)) {
+        _PyErr_SetFromPyStatus(status);
+        return -1;
     }
 
+    return 0;
+}
+
+static int
+interpreter_update_config(PyThreadState *tstate)
+{
     // Update the sys module for the new configuration
     if (_PySys_UpdateConfig(tstate) < 0) {
         return -1;
@@ -504,13 +506,20 @@ _Py_SetConfig(const PyConfig *src_config)
         goto done;
     }
 
-    status = _PyConfig_Copy(&tstate->interp->global_config, &config);
+    status = _PyConfig_Copy(&tstate->interp->runtime->config, &config);
     if (_PyStatus_EXCEPTION(status)) {
         _PyErr_SetFromPyStatus(status);
         goto done;
     }
 
-    res = interpreter_update_config(tstate, 0);
+    if (_Py_IsMainInterpreter(tstate->interp)) {
+        res = runtime_update_config(tstate->interp->runtime, 0);
+        if (res < 0) {
+            goto done;
+        }
+    }
+
+    res = interpreter_update_config(tstate);
 
 done:
     PyConfig_Clear(&config);
@@ -546,13 +555,15 @@ pyinit_core_reconfigure(_PyRuntimeState *runtime,
     if (interp == NULL) {
         return _PyStatus_ERR("can't make main interpreter");
     }
+    assert(interp->runtime == runtime);
+    assert(_Py_IsMainInterpreter(interp));
 
     status = _PyConfig_Write(config, runtime);
     if (_PyStatus_EXCEPTION(status)) {
         return status;
     }
 
-    status = _PyConfig_Copy(&interp->global_config, config);
+    status = _PyConfig_Copy(&runtime->config, config);
     if (_PyStatus_EXCEPTION(status)) {
         return status;
     }
@@ -645,9 +656,10 @@ pycore_create_interpreter(_PyRuntimeState *runtime,
     if (interp == NULL) {
         return _PyStatus_ERR("can't make main interpreter");
     }
+    assert(interp->runtime == runtime);
     assert(_Py_IsMainInterpreter(interp));
 
-    status = _PyConfig_Copy(&interp->global_config, config);
+    status = _PyConfig_Copy(&runtime->config, config);
     if (_PyStatus_EXCEPTION(status)) {
         return status;
     }
@@ -1067,7 +1079,12 @@ pyinit_core(_PyRuntimeState *runtime,
 static PyStatus
 pyinit_main_reconfigure(PyThreadState *tstate)
 {
-    if (interpreter_update_config(tstate, 0) < 0) {
+    if (_Py_IsMainInterpreter(tstate->interp)) {
+        if (runtime_update_config(tstate->interp->runtime, 0) < 0) {
+            return _PyStatus_ERR("fail to reconfigure Python");
+        }
+    }
+    if (interpreter_update_config(tstate) < 0) {
         return _PyStatus_ERR("fail to reconfigure Python");
     }
     return _PyStatus_OK();
@@ -1098,13 +1115,18 @@ init_interp_main(PyThreadState *tstate)
         return _PyStatus_OK();
     }
 
-    // Initialize the import-related configuration.
-    status = _PyConfig_InitImportConfig(&interp->global_config);
-    if (_PyStatus_EXCEPTION(status)) {
-        return status;
-    }
+    if (is_main_interp) {
+        // Initialize the import-related configuration.
+        status = _PyConfig_InitImportConfig(&interp->runtime->config);
+        if (_PyStatus_EXCEPTION(status)) {
+            return status;
+        }
 
-    if (interpreter_update_config(tstate, 1) < 0) {
+        if (runtime_update_config(tstate->interp->runtime, 1) < 0) {
+            return _PyStatus_ERR("failed to update the Python config");
+        }
+    }
+    if (interpreter_update_config(tstate) < 0) {
         return _PyStatus_ERR("failed to update the Python config");
     }
 
@@ -1766,14 +1788,14 @@ Py_FinalizeEx(void)
     /* Copy the core config, PyInterpreterState_Delete() free
        the core config memory */
 #ifdef Py_REF_DEBUG
-    int show_ref_count = tstate->interp->global_config.show_ref_count;
+    int show_ref_count = runtime->config.show_ref_count;
 #endif
 #ifdef Py_TRACE_REFS
-    int dump_refs = tstate->interp->global_config.dump_refs;
-    wchar_t *dump_refs_file = tstate->interp->global_config.dump_refs_file;
+    int dump_refs = runtime->config.dump_refs;
+    wchar_t *dump_refs_file = runtime->config.dump_refs_file;
 #endif
 #ifdef WITH_PYMALLOC
-    int malloc_stats = tstate->interp->global_config.malloc_stats;
+    int malloc_stats = runtime->config.malloc_stats;
 #endif
 
     /* Remaining daemon threads will automatically exit
@@ -1972,27 +1994,18 @@ new_interpreter(PyThreadState **tstate_p, const _PyInterpreterConfig *config)
     PyThreadState *save_tstate = PyThreadState_Swap(tstate);
 
     /* Copy the current interpreter config into the new interpreter */
-    const PyConfig *global_config;
 #ifndef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
     if (save_tstate != NULL) {
-        global_config = _PyInterpreterState_GetGlobalConfig(save_tstate->interp);
         if (config == NULL) {
             config = _PyInterpreterState_GetConfig(save_tstate->interp);
         }
     }
     else
 #endif
-    {
+    if (config == NULL) {
         /* No current thread state, copy from the main interpreter */
         PyInterpreterState *main_interp = _PyInterpreterState_Main();
-        global_config = _PyInterpreterState_GetGlobalConfig(main_interp);
-        if (config == NULL) {
-            config = _PyInterpreterState_GetConfig(main_interp);
-        }
-    }
-    status = _PyConfig_Copy(&interp->global_config, global_config);
-    if (_PyStatus_EXCEPTION(status)) {
-        goto error;
+        config = _PyInterpreterState_GetConfig(main_interp);
     }
     status = _PyInterpreterConfig_Copy(&interp->config, config);
     if (_PyStatus_EXCEPTION(status)) {

Python/pystate.c

@@ -119,6 +119,8 @@ init_runtime(_PyRuntimeState *runtime,
     // Set it to the ID of the main thread of the main interpreter.
     runtime->main_thread = PyThread_get_thread_ident();
 
+    PyConfig_InitPythonConfig(&runtime->config);
+
     runtime->unicode_ids.next_index = unicode_next_index;
     runtime->unicode_ids.lock = unicode_ids_mutex;
 
@@ -172,6 +174,8 @@ _PyRuntimeState_Fini(_PyRuntimeState *runtime)
 
 #undef FREE_LOCK
     PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
+
+    PyConfig_Clear(&runtime->config);
 }
 
 #ifdef HAVE_FORK
@@ -289,7 +293,6 @@ init_interpreter(PyInterpreterState *interp,
 
     _PyEval_InitState(&interp->ceval, pending_lock);
     _PyGC_InitState(&interp->gc);
-    PyConfig_InitPythonConfig(&interp->global_config);
     _PyType_InitCache(interp);
 
     interp->_initialized = 1;
@@ -397,7 +400,6 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
 
     Py_CLEAR(interp->audit_hooks);
 
-    PyConfig_Clear(&interp->global_config);
     Py_CLEAR(interp->codec_search_path);
     Py_CLEAR(interp->codec_search_cache);
     Py_CLEAR(interp->codec_error_registry);
@@ -2151,7 +2153,7 @@ _PyInterpreterState_GetConfig(PyInterpreterState *interp)
 const PyConfig*
 _PyInterpreterState_GetGlobalConfig(PyInterpreterState *interp)
 {
-    return &interp->global_config;
+    return &interp->runtime->config;
 }
 
 
@@ -2160,7 +2162,7 @@ _Py_CopyConfig(PyConfig *config)
 {
     PyInterpreterState *interp = PyInterpreterState_Get();
 
-    PyStatus status = _PyConfig_Copy(config, &interp->global_config);
+    PyStatus status = _PyConfig_Copy(config, &interp->runtime->config);
     if (PyStatus_Exception(status)) {
         _PyErr_SetFromPyStatus(status);
         return -1;