Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-122581: Avoid data races when collecting parser statistics (#122694)

This commit is contained in:
Lysandros Nikolaou 2024-08-06 13:29:57 +02:00 committed by GitHub
parent a8be8fc6c4
commit ce0d66c8d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Include/internal/pycore_parser.h
View File

@ -21,6 +21,9 @@ extern "C" {
struct _parser_runtime_state { struct _parser_runtime_state {
#ifdef Py_DEBUG #ifdef Py_DEBUG
long memo_statistics[_PYPEGEN_NSTATISTICS]; long memo_statistics[_PYPEGEN_NSTATISTICS];
#ifdef Py_GIL_DISABLED
PyMutex mutex;
#endif
#else #else
int _not_used; int _not_used;
#endif #endif
@ -28,6 +31,21 @@ struct _parser_runtime_state {
}; };
_Py_DECLARE_STR(empty, "") _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), \
.v.Name.ctx = Load, \
.lineno = 1, \
.col_offset = 0, \
.end_lineno = 1, \
.end_col_offset = 0, \
}, \
}
#else
#define _parser_runtime_state_INIT \ #define _parser_runtime_state_INIT \
{ \ { \
.dummy_name = { \ .dummy_name = { \
@ -40,6 +58,7 @@ _Py_DECLARE_STR(empty, "")
.end_col_offset = 0, \ .end_col_offset = 0, \
}, \ }, \
} }
#endif
extern struct _mod* _PyParser_ASTFromString( extern struct _mod* _PyParser_ASTFromString(
const char *str, const char *str,

17
Parser/pegen.c
View File

@ -296,12 +296,22 @@ error:
#define NSTATISTICS _PYPEGEN_NSTATISTICS #define NSTATISTICS _PYPEGEN_NSTATISTICS
#define memo_statistics _PyRuntime.parser.memo_statistics #define memo_statistics _PyRuntime.parser.memo_statistics
#ifdef Py_GIL_DISABLED
#define MUTEX_LOCK() PyMutex_Lock(&_PyRuntime.parser.mutex)
#define MUTEX_UNLOCK() PyMutex_Unlock(&_PyRuntime.parser.mutex)
#else
#define MUTEX_LOCK()
#define MUTEX_UNLOCK()
#endif
void void
_PyPegen_clear_memo_statistics(void) _PyPegen_clear_memo_statistics(void)
{ {
MUTEX_LOCK();
for (int i = 0; i < NSTATISTICS; i++) { for (int i = 0; i < NSTATISTICS; i++) {
memo_statistics[i] = 0; memo_statistics[i] = 0;
} }
MUTEX_UNLOCK();
} }
PyObject * PyObject *
@ -311,18 +321,23 @@ _PyPegen_get_memo_statistics(void)
if (ret == NULL) { if (ret == NULL) {
return NULL; return NULL;
} }
MUTEX_LOCK();
for (int i = 0; i < NSTATISTICS; i++) { for (int i = 0; i < NSTATISTICS; i++) {
PyObject *value = PyLong_FromLong(memo_statistics[i]); PyObject *value = PyLong_FromLong(memo_statistics[i]);
if (value == NULL) { if (value == NULL) {
MUTEX_UNLOCK();
Py_DECREF(ret); Py_DECREF(ret);
return NULL; return NULL;
} }
// PyList_SetItem borrows a reference to value. // PyList_SetItem borrows a reference to value.
if (PyList_SetItem(ret, i, value) < 0) { if (PyList_SetItem(ret, i, value) < 0) {
MUTEX_UNLOCK();
Py_DECREF(ret); Py_DECREF(ret);
return NULL; return NULL;
} }
} }
MUTEX_UNLOCK();
return ret; return ret;
} }
#endif #endif
@ -348,7 +363,9 @@ _PyPegen_is_memoized(Parser *p, int type, void *pres)
if (count <= 0) { if (count <= 0) {
count = 1; count = 1;
} }
MUTEX_LOCK();
memo_statistics[type] += count; memo_statistics[type] += count;
MUTEX_UNLOCK();
} }
#endif #endif
p->mark = m->mark; p->mark = m->mark;