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

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
Lock around all of tokenizeriter_next 
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
  • Loading branch information
@lysnikolaou @pablogsal
lysnikolaou and pablogsal committed Jun 11, 2024
commit ca466fa0d1ebf2aa1377cbc2b79b5f75b2011557
38 changes: 11 additions & 27 deletions Python/Python-tokenize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,16 @@ tokenizeriter_new_impl(PyTypeObject *type, PyObject *readline,
}

static int
_tokenizer_error(struct tok_state *tok)
_tokenizer_error(tokenizeriterobject *it)
{
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(it);
if (PyErr_Occurred()) {
return -1;
}

const char *msg = NULL;
PyObject* errtype = PyExc_SyntaxError;
struct tok_state *tok = it->tok;
switch (tok->done) {
case E_TOKEN:
msg = "invalid token";
Expand Down Expand Up @@ -182,7 +184,7 @@ static PyObject *
_get_current_line(tokenizeriterobject *it, const char *line_start, Py_ssize_t size)
{
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(it);
PyObject *line;
PyObject *line = it->last_line;
if (it->tok->lineno != it->last_lineno) {
// Line has changed since last token, so we fetch the new line and cache it
// in the iter object.
Expand All @@ -193,10 +195,6 @@ _get_current_line(tokenizeriterobject *it, const char *line_start, Py_ssize_t si
it->byte_col_offset_diff = 0;
}
}
else {
// Line hasn't changed so we reuse the cached one.
line = it->last_line;
}
return line;
}

Expand Down Expand Up @@ -235,30 +233,23 @@ static PyObject *
tokenizeriter_next(tokenizeriterobject *it)
{
PyObject* result = NULL;
struct token token;
_PyToken_Init(&token);

int type;
Py_BEGIN_CRITICAL_SECTION(it);
type = _PyTokenizer_Get(it->tok, &token);
Py_END_CRITICAL_SECTION();

struct token token;
_PyToken_Init(&token);

int type = _PyTokenizer_Get(it->tok, &token);
if (type == ERRORTOKEN) {
if(!PyErr_Occurred()) {
_tokenizer_error(it->tok);
_tokenizer_error(it);
assert(PyErr_Occurred());
}
goto exit;
}
if (it->done || type == ERRORTOKEN) {
Copy link
Copy Markdown
Member

@pablogsal pablogsal Jun 11, 2024

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");

#ifdef Py_GIL_DISABLED
_Py_atomic_store_int(&it->done, 1);
#else
it->done = 1;
#endif

goto exit;
}
PyObject *str = NULL;
Expand Down Expand Up @@ -287,9 +278,7 @@ tokenizeriter_next(tokenizeriterobject *it)
size -= 1;
}

Py_BEGIN_CRITICAL_SECTION(it);
line = _get_current_line(it, line_start, size);
Py_END_CRITICAL_SECTION();
}
if (line == NULL) {
Py_DECREF(str);
Expand All @@ -300,10 +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();

if (it->tok->tok_extra_tokens) {
if (is_trailing_token) {
Expand Down Expand Up @@ -343,12 +329,10 @@ tokenizeriter_next(tokenizeriterobject *it)
exit:
_PyToken_Free(&token);
if (type == ENDMARKER) {
#ifdef Py_GIL_DISABLED
_Py_atomic_store_int(&it->done, 1);
#else
it->done = 1;
#endif
}

Py_END_CRITICAL_SECTION();
return result;
}

Expand Down