Skip to content
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

Jump to bottom

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

Merged
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
Use Py_BEGIN_CRITICAL_SECTION
  • Loading branch information
@lysnikolaou
lysnikolaou committed Jun 10, 2024
commit abf568a7f1f61eb2e70eb0b76b59ee97656c045e
23 changes: 6 additions & 17 deletions Python/Python-tokenize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "Python.h"
#include "errcode.h"
#include "internal/pycore_lock.h" // PyMutex
#include "internal/pycore_critical_section.h" // Py_BEGIN_CRITICAL_SECTION
#include "../Parser/lexer/state.h"
#include "../Parser/lexer/lexer.h"
#include "../Parser/tokenizer/tokenizer.h"
#include "../Parser/pegen.h" // _PyPegen_byte_offset_to_character_offset()
#include "../Parser/pegen.h" // _PyPegen_byte_offset_to_character_offset()

static struct PyModuleDef _tokenizemodule;

Expand Down Expand Up @@ -38,10 +38,6 @@ typedef struct
PyObject *last_line;
Py_ssize_t last_lineno;
Py_ssize_t byte_col_offset_diff;

#ifdef Py_GIL_DISABLED
PyMutex mutex;
#endif
} tokenizeriterobject;

/*[clinic input]
Expand Down Expand Up @@ -79,10 +75,6 @@ tokenizeriter_new_impl(PyTypeObject *type, PyObject *readline,
}
self->done = 0;

#ifdef Py_GIL_DISABLED
self->mutex = (PyMutex) {_Py_UNLOCKED};
#endif

self->last_line = NULL;
self->byte_col_offset_diff = 0;
self->last_lineno = 0;
Expand Down Expand Up @@ -191,13 +183,10 @@ tokenizeriter_next(tokenizeriterobject *it)
struct token token;
_PyToken_Init(&token);

#ifdef Py_GIL_DISABLED
PyMutex_Lock(&it->mutex);
#endif
int type = _PyTokenizer_Get(it->tok, &token);
#ifdef Py_GIL_DISABLED
PyMutex_Unlock(&it->mutex);
#endif
int type;
Py_BEGIN_CRITICAL_SECTION(it);
type = _PyTokenizer_Get(it->tok, &token);
Py_END_CRITICAL_SECTION();

if (type == ERRORTOKEN) {
if(!PyErr_Occurred()) {
Expand Down
Loading