Skip to content

Commit

Permalink
pythongh-117657: Avoid race in PAUSE_ADAPTIVE_COUNTER in free-threa…
Browse files Browse the repository at this point in the history
…ded build (pythonGH-122190)

The adaptive counter doesn't do anything currently in the free-threaded
build and TSan reports a data race due to concurrent modifications to
the counter.
(cherry picked from commit 2b163aa)

Co-authored-by: Sam Gross <[email protected]>
  • Loading branch information
colesbury authored and miss-islington committed Jul 30, 2024
1 parent 1912f94 commit 029a164
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Python/ceval_macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -314,17 +314,18 @@ GETITEM(PyObject *v, Py_ssize_t i) {
/* gh-115999 tracks progress on addressing this. */ \
static_assert(0, "The specializing interpreter is not yet thread-safe"); \
} while (0);
#define PAUSE_ADAPTIVE_COUNTER(COUNTER) ((void)COUNTER)
#else
#define ADVANCE_ADAPTIVE_COUNTER(COUNTER) \
do { \
(COUNTER) = advance_backoff_counter((COUNTER)); \
} while (0);
#endif

#define PAUSE_ADAPTIVE_COUNTER(COUNTER) \
do { \
(COUNTER) = pause_backoff_counter((COUNTER)); \
} while (0);
#endif

#define UNBOUNDLOCAL_ERROR_MSG \
"cannot access local variable '%s' where it is not associated with a value"
Expand Down
1 change: 0 additions & 1 deletion Tools/tsan/suppressions_free_threading.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ race:free_threadstate

# These warnings trigger directly in a CPython function.

race_top:_PyEval_EvalFrameDefault
race_top:assign_version_tag
race_top:new_reference
race_top:_multiprocessing_SemLock_acquire_impl
Expand Down

0 comments on commit 029a164

Please sign in to comment.