Skip to content

gh-120317: Lock around global state in the tokenize module #120318

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.

Sign up for GitHub

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

Merged
lysnikolaou merged 13 commits into from
Jul 16, 2024
Merged

gh-120317: Lock around global state in the tokenize module #120318

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
900dd6a
gh-120317: Lock around tokenizer calls in the tokenizer module
lysnikolaou Jun 10, 2024
abf568a
Use Py_BEGIN_CRITICAL_SECTION
lysnikolaou Jun 10, 2024
9dfe174
Add more locking around global tokenizer state
lysnikolaou Jun 10, 2024
5fd07b6
Add test
lysnikolaou Jun 10, 2024
814d9af
Address feedback & improve test
lysnikolaou Jun 10, 2024
c1093be
Guard atomic store behind Py_GIL_DISABLED
lysnikolaou Jun 10, 2024
117d256
Add requires working threading decorator to test
lysnikolaou Jun 10, 2024
975f01a
Merge branch 'main' into tokenize-thread-safety
lysnikolaou Jun 11, 2024
ca466fa
Lock around all of tokenizeriter_next
lysnikolaou Jun 11, 2024
3abb8ab
Merge branch 'main' into tokenize-thread-safety
lysnikolaou Jun 12, 2024
601e539
Fix formatting
lysnikolaou Jun 12, 2024
6290f19
Merge branch 'main' into tokenize-thread-safety
lysnikolaou Jul 1, 2024
0ddde2f
Change sleeping time
lysnikolaou Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address feedback & improve test
  • Loading branch information
@lysnikolaou
lysnikolaou committed Jun 10, 2024
commit 814d9affecac24e7c185d1d063a4ac800d452e4d
5 changes: 3 additions & 2 deletions Lib/test/test_free_threading/test_tokenize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ def next_token(it):
tokenize.TokenInfo(type=0, string='', start=(2, -1), end=(2, -1), line=' pass'),
]

for token in tokens:
self.assertIn(token, expected_tokens)
tokens.sort()
expected_tokens.sort()
self.assertListEqual(tokens, expected_tokens)


if __name__ == "__main__":
Expand Down
22 changes: 11 additions & 11 deletions Python/Python-tokenize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ _tokenizer_error(struct tok_state *tok)
static PyObject *
_get_current_line(tokenizeriterobject *it, const char *line_start, Py_ssize_t size)
{
Comment thread
lysnikolaou marked this conversation as resolved.
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(it);
PyObject *line;
if (it->tok->lineno != it->last_lineno) {
// Line has changed since last token, so we fetch the new line and cache it
Expand All @@ -187,7 +188,8 @@ _get_current_line(tokenizeriterobject *it, const char *line_start, Py_ssize_t si
line = PyUnicode_DecodeUTF8(line_start, size, "replace");
it->last_line = line;
it->byte_col_offset_diff = 0;
} else {
}
else {
// Line hasn't changed so we reuse the cached one.
line = it->last_line;
}
Expand All @@ -199,7 +201,8 @@ _get_col_offsets(tokenizeriterobject *it, struct token token, const char *line_s
PyObject *line, Py_ssize_t lineno, Py_ssize_t end_lineno,
Py_ssize_t *col_offset, Py_ssize_t *end_col_offset)
{
Py_ssize_t byte_offset;
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(it);
Py_ssize_t byte_offset = -1;
if (token.start != NULL && token.start >= line_start) {
byte_offset = token.start - line_start;
*col_offset = byte_offset - it->byte_col_offset_diff;
Expand All @@ -214,7 +217,8 @@ _get_col_offsets(tokenizeriterobject *it, struct token token, const char *line_s
Py_ssize_t token_col_offset = _PyPegen_byte_offset_to_character_offset_line(line, byte_offset, end_byte_offset);
Comment thread
lysnikolaou marked this conversation as resolved.
Comment thread
lysnikolaou marked this conversation as resolved.
*end_col_offset = *col_offset + token_col_offset;
it->byte_col_offset_diff += token.end - token.start - token_col_offset;
} else {
}
else {
*end_col_offset = _PyPegen_byte_offset_to_character_offset_raw(it->tok->line_start, end_byte_offset);
it->byte_col_offset_diff += end_byte_offset - *end_col_offset;
}
Expand Down Expand Up @@ -243,11 +247,7 @@ tokenizeriter_next(tokenizeriterobject *it)
}
if (it->done || type == ERRORTOKEN) {

@pablogsal pablogsal Jun 11, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need to protect the read? Otherwise we may get weird partial reads no?

PyErr_SetString(PyExc_StopIteration, "EOF");

Py_BEGIN_CRITICAL_SECTION(it);
it->done = 1;
Py_END_CRITICAL_SECTION();

_Py_atomic_store_int(&it->done, 1);
Comment thread
Fidget-Spinner marked this conversation as resolved.
Outdated
goto exit;
}
PyObject *str = NULL;
Expand Down Expand Up @@ -275,6 +275,7 @@ tokenizeriter_next(tokenizeriterobject *it)
if (size >= 1 && it->tok->implicit_newline) {
size -= 1;
}

Py_BEGIN_CRITICAL_SECTION(it);
line = _get_current_line(it, line_start, size);
Py_END_CRITICAL_SECTION();
Expand All @@ -288,6 +289,7 @@ tokenizeriter_next(tokenizeriterobject *it)
Py_ssize_t end_lineno = it->tok->lineno;
Py_ssize_t col_offset = -1;
Py_ssize_t end_col_offset = -1;

Py_BEGIN_CRITICAL_SECTION(it);
_get_col_offsets(it, token, line_start, line, lineno, end_lineno, &col_offset, &end_col_offset);
Py_END_CRITICAL_SECTION();
Expand Down Expand Up @@ -330,9 +332,7 @@ tokenizeriter_next(tokenizeriterobject *it)
exit:
_PyToken_Free(&token);
if (type == ENDMARKER) {
Py_BEGIN_CRITICAL_SECTION(it);
it->done = 1;
Py_END_CRITICAL_SECTION();
_Py_atomic_store_int(&it->done, 1);
Comment thread
Fidget-Spinner marked this conversation as resolved.
Outdated
}
return result;
}
Expand Down