Skip to content

gh-122581: Use parser mutex in default build for subinterpreters #142959

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

Open
colesbury wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −28
Open

gh-122581: Use parser mutex in default build for subinterpreters #142959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 0 additions & 16 deletions Include/internal/pycore_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ extern "C" {
#include "pycore_pyarena.h" // PyArena

_Py_DECLARE_STR(empty, "")
#if defined(Py_DEBUG) && defined(Py_GIL_DISABLED)
#define _parser_runtime_state_INIT \
{ \
.mutex = {0}, \
.dummy_name = { \
.kind = Name_kind, \
.v.Name.id = &_Py_STR(empty), \
Expand All @@ -28,20 +26,6 @@ _Py_DECLARE_STR(empty, "")
.end_col_offset = 0, \
}, \
}
#else
#define _parser_runtime_state_INIT \
{ \
.dummy_name = { \
.kind = Name_kind, \
.v.Name.id = &_Py_STR(empty), \
.v.Name.ctx = Load, \
.lineno = 1, \
.col_offset = 0, \
.end_lineno = 1, \
.end_col_offset = 0, \
}, \
}
#endif

extern struct _mod* _PyParser_ASTFromString(
const char *str,
Expand Down
2 changes: 0 additions & 2 deletions Include/internal/pycore_runtime_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ struct _fileutils_state {
struct _parser_runtime_state {
#ifdef Py_DEBUG
long memo_statistics[_PYPEGEN_NSTATISTICS];
#ifdef Py_GIL_DISABLED
PyMutex mutex;
#endif
#else
int _not_used;
#endif
Expand Down
19 changes: 9 additions & 10 deletions Parser/pegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_parser.h" // _PYPEGEN_NSTATISTICS
#include "pycore_pyerrors.h" // PyExc_IncompleteInputError
#include "pycore_runtime.h" // _PyRuntime
#include "pycore_runtime.h" // _PyRuntime
#include "pycore_unicodeobject.h" // _PyUnicode_InternImmortal
#include "pycore_pyatomic_ft_wrappers.h"
#include <errcode.h>

#include "lexer/lexer.h"
Expand Down Expand Up @@ -303,11 +302,11 @@ _PyPegen_fill_token(Parser *p)
void
_PyPegen_clear_memo_statistics(void)
{
FT_MUTEX_LOCK(&_PyRuntime.parser.mutex);
PyMutex_Lock(&_PyRuntime.parser.mutex);
for (int i = 0; i < NSTATISTICS; i++) {
memo_statistics[i] = 0;
}
FT_MUTEX_UNLOCK(&_PyRuntime.parser.mutex);
PyMutex_Unlock(&_PyRuntime.parser.mutex);
}

PyObject *
Expand All @@ -318,22 +317,22 @@ _PyPegen_get_memo_statistics(void)
return NULL;
}

FT_MUTEX_LOCK(&_PyRuntime.parser.mutex);
PyMutex_Lock(&_PyRuntime.parser.mutex);
for (int i = 0; i < NSTATISTICS; i++) {
PyObject *value = PyLong_FromLong(memo_statistics[i]);
if (value == NULL) {
FT_MUTEX_UNLOCK(&_PyRuntime.parser.mutex);
PyMutex_Unlock(&_PyRuntime.parser.mutex);
Py_DECREF(ret);
return NULL;
}
// PyList_SetItem borrows a reference to value.
if (PyList_SetItem(ret, i, value) < 0) {
FT_MUTEX_UNLOCK(&_PyRuntime.parser.mutex);
PyMutex_Unlock(&_PyRuntime.parser.mutex);
Py_DECREF(ret);
return NULL;
}
}
FT_MUTEX_UNLOCK(&_PyRuntime.parser.mutex);
PyMutex_Unlock(&_PyRuntime.parser.mutex);
return ret;
}
#endif
Expand All @@ -359,9 +358,9 @@ _PyPegen_is_memoized(Parser *p, int type, void *pres)
if (count <= 0) {
count = 1;
}
FT_MUTEX_LOCK(&_PyRuntime.parser.mutex);
PyMutex_Lock(&_PyRuntime.parser.mutex);
memo_statistics[type] += count;
FT_MUTEX_UNLOCK(&_PyRuntime.parser.mutex);
PyMutex_Unlock(&_PyRuntime.parser.mutex);
}
#endif
p->mark = m->mark;
Expand Down
Loading