-
-
Notifications
You must be signed in to change notification settings - Fork 32.4k
gh-136421: Load _datetime
static types during interpreter initialization
#136583
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 6 commits
77d117c
963a9ee
e16fb54
ed65682
43b4843
0ad304f
d762ed5
db327e7
9456147
6adafa1
6e2f891
a15843f
d6064c4
9a3b1c2
3520514
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3651,6 +3651,25 @@ def test_repr_subclass(self): | |
td = SubclassDatetime(2010, 10, 2, second=3) | ||
self.assertEqual(repr(td), "SubclassDatetime(2010, 10, 2, 0, 0, 3)") | ||
|
||
@support.cpython_only | ||
def test_concurrent_initialization(self): | ||
# Run in a subprocess to ensure we get a clean version of _datetime | ||
script = """if True: | ||
from concurrent.futures import InterpreterPoolExecutor | ||
|
||
def func(): | ||
import _datetime | ||
print('a', end='') | ||
|
||
with InterpreterPoolExecutor() as executor: | ||
for _ in range(8): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Eh, I think this is fine. Many other systems have 8 cores, not 10. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Okay, but it sounds like you are talking about the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
executor.submit(func) | ||
""" | ||
rc, out, err = script_helper.assert_python_ok("-c", script) | ||
self.assertEqual(rc, 0) | ||
self.assertEqual(out, b"a" * 8) | ||
self.assertEqual(err, b"") | ||
|
||
|
||
class TestSubclassDateTime(TestDateTime): | ||
theclass = SubclassDatetime | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Fix crash when initializing :mod:`datetime` concurrently. |
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -14,6 +14,7 @@ | |||
#include "pycore_object.h" // _PyObject_Init() | ||||
#include "pycore_time.h" // _PyTime_ObjectToTime_t() | ||||
#include "pycore_unicodeobject.h" // _PyUnicode_Copy() | ||||
#include "pycore_initconfig.h" // _PyStatus_OK() | ||||
|
||||
#include "datetime.h" | ||||
|
||||
|
@@ -7329,13 +7330,9 @@ clear_state(datetime_state *st) | |||
} | ||||
|
||||
|
||||
static int | ||||
init_static_types(PyInterpreterState *interp, int reloading) | ||||
PyStatus | ||||
_PyDateTime_InitTypes(PyInterpreterState *interp) | ||||
{ | ||||
if (reloading) { | ||||
return 0; | ||||
} | ||||
|
||||
// `&...` is not a constant expression according to a strict reading | ||||
// of C standards. Fill tp_base at run-time rather than statically. | ||||
// See https://bugs.python.org/issue40777 | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This PR does not address the possible races in There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I guess not. I don't think there's an easy way to do this here, because atomically storing Do we even need to load it at runtime like this? We have other examples of directly storing it in the cpython/Objects/methodobject.c Line 396 in 958657b
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It is not needed now because the module is statically linked, that issue happens only with dynamic loaded modules so you can define it statically now. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I guess a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Ah, TIL. That's definitely the best option here then.
For what? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For ensuring There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please remove |
||||
|
@@ -7347,11 +7344,11 @@ init_static_types(PyInterpreterState *interp, int reloading) | |||
for (size_t i = 0; i < Py_ARRAY_LENGTH(capi_types); i++) { | ||||
PyTypeObject *type = capi_types[i]; | ||||
if (_PyStaticType_InitForExtension(interp, type) < 0) { | ||||
return -1; | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not for this PR but as a follow up I think it would be better to now remove _PyStaticType_InitForExtension and just use _PyStaticType_InitBuiltin for it, there's a lot of special casing that could be removed. |
||||
return _PyStatus_ERR("could not initialize static types"); | ||||
} | ||||
} | ||||
|
||||
return 0; | ||||
return _PyStatus_OK(); | ||||
} | ||||
|
||||
|
||||
|
@@ -7379,10 +7376,6 @@ _datetime_exec(PyObject *module) | |||
} | ||||
/* We actually set the "current" module right before a successful return. */ | ||||
|
||||
if (init_static_types(interp, reloading) < 0) { | ||||
kumaraditya303 marked this conversation as resolved.
Show resolved
Hide resolved
|
||||
goto error; | ||||
} | ||||
|
||||
for (size_t i = 0; i < Py_ARRAY_LENGTH(capi_types); i++) { | ||||
PyTypeObject *type = capi_types[i]; | ||||
const char *name = _PyType_Name(type); | ||||
|
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -760,6 +760,11 @@ pycore_init_types(PyInterpreterState *interp) | |||||||||||||||||||||
return status; | ||||||||||||||||||||||
} | ||||||||||||||||||||||
|
||||||||||||||||||||||
status = _PyDateTime_InitTypes(interp); | ||||||||||||||||||||||
if (_PyStatus_EXCEPTION(status)) { | ||||||||||||||||||||||
return status; | ||||||||||||||||||||||
} | ||||||||||||||||||||||
Comment on lines
+763
to
+766
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Reply from #136620 (comment) Can you run There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hm, what are you trying to achieve here? This will just break the types for the main interpreter. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Note that Correction: Run the script of the test without running |
||||||||||||||||||||||
|
||||||||||||||||||||||
return _PyStatus_OK(); | ||||||||||||||||||||||
} | ||||||||||||||||||||||
|
||||||||||||||||||||||
|
Uh oh!
There was an error while loading. Please reload this page.