Configure GIL in ceval_gil.c

colesbury · colesbury · commit 167b43482b96 · 2024-04-26T15:57:50.000Z
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
@@ -884,7 +884,7 @@ def test_pythondevmode_env(self):
     def test_python_gil(self):
         cases = [
             # (env, opt, expected, msg)
-            (None, None, '0', "no options set"),
+            (None, None, 'None', "no options set"),
             ('0', None, '0', "PYTHON_GIL=0"),
             ('1', None, '1', "PYTHON_GIL=1"),
             ('1', '0', '0', "-X gil=0 overrides PYTHON_GIL=1"),
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
@@ -534,7 +534,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
     if support.Py_DEBUG:
         CONFIG_COMPAT['run_presite'] = None
     if support.Py_GIL_DISABLED:
-        CONFIG_COMPAT['enable_gil'] = 0
+        CONFIG_COMPAT['enable_gil'] = -1
     if MS_WINDOWS:
         CONFIG_COMPAT.update({
             'legacy_windows_stdio': 0,
diff --git a/Python/ceval_gil.c b/Python/ceval_gil.c
@@ -451,9 +451,7 @@ init_own_gil(PyInterpreterState *interp, struct _gil_runtime_state *gil)
 {
     assert(!gil_created(gil));
 #ifdef Py_GIL_DISABLED
-    // gh-116329: Once it is safe to do so, change this condition to
-    // (enable_gil == _PyConfig_GIL_ENABLE), so the GIL is disabled by default.
-    gil->enabled = _PyInterpreterState_GetConfig(interp)->enable_gil != _PyConfig_GIL_DISABLE;
+    gil->enabled = _PyInterpreterState_GetConfig(interp)->enable_gil == _PyConfig_GIL_ENABLE;
 #endif
     create_gil(gil);
     assert(gil_created(gil));
diff --git a/Python/initconfig.c b/Python/initconfig.c
@@ -847,7 +847,7 @@ _PyConfig_InitCompatConfig(PyConfig *config)
     config->code_debug_ranges = 1;
     config->cpu_count = -1;
 #ifdef Py_GIL_DISABLED
-    config->enable_gil = _PyConfig_GIL_DISABLE;
+    config->enable_gil = _PyConfig_GIL_DEFAULT;
 #endif
 }
 

Original file line number	Diff line number	Diff line change
`@@ -847,7 +847,7 @@ _PyConfig_InitCompatConfig(PyConfig *config)`
`847`	`847`	`config->code_debug_ranges = 1;`
`848`	`848`	`config->cpu_count = -1;`
`849`	`849`	`#ifdef Py_GIL_DISABLED`
`850`		`- config->enable_gil = _PyConfig_GIL_DISABLE;`
	`850`	`+ config->enable_gil = _PyConfig_GIL_DEFAULT;`
`851`	`851`	`#endif`
`852`	`852`	`}`
`853`	`853`