Skip to content

gh-117657: initialize_new_array #118769

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

Closed
wants to merge 19 commits into from
Closed

gh-117657: initialize_new_array #118769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e7a4477
TSAN fix race between atomic and none-atomic mutation of tate->young.…
SonicField Apr 26, 2024
14858c2
Merge remote-tracking branch 'upstream/main'
SonicField Apr 26, 2024
5457972
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 26, 2024
d83833c
merge with upstream
SonicField Apr 26, 2024
edd9b7b
TSAN: move gc counter reset into critical section
SonicField Apr 26, 2024
e9bae12
Resolved merge conflict in Tools/tsan/suppressions_free_threading.txt
SonicField Apr 26, 2024
e1e040c
Merge branch 'main' of github.com:SonicField/cpython
SonicField Apr 26, 2024
dc97546
Merge branch 'main' of github.com:SonicField/cpython
SonicField Apr 26, 2024
2f200c9
Merge branch 'main' of github.com:SonicField/cpython
SonicField Apr 26, 2024
364d1d9
TSAN: Fix compiler warning in gc patch
SonicField Apr 26, 2024
6ec56ac
Merge branch 'main' into main
SonicField Apr 29, 2024
ef64718
Merge branch 'main' into main
SonicField Apr 29, 2024
822f8cc
Merge branch 'main' into main
SonicField Apr 29, 2024
655e071
Remove not require news entry
SonicField Apr 29, 2024
85b7b5c
Merge branch 'main' of github.com:SonicField/cpython
SonicField Apr 29, 2024
29c2696
Merge branch 'main' into main
SonicField Apr 29, 2024
00f0f7e
Merge branch 'python:main' into main
SonicField May 8, 2024
e34b902
gh-117657: tsan initialize_new_array
SonicField May 8, 2024
38eb14e
Merge branch 'python:main' into sonic-field-tsan
SonicField May 9, 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
2 changes: 1 addition & 1 deletion Include/internal/pycore_qsbr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ _Py_qsbr_register(struct _PyThreadStateImpl *tstate,

// Disassociates a PyThreadState from the QSBR state and frees the QSBR state.
extern void
_Py_qsbr_unregister(struct _PyThreadStateImpl *tstate);
_Py_qsbr_unregister(PyThreadState *tstate);

extern void
_Py_qsbr_fini(PyInterpreterState *interp);
Expand Down
2 changes: 1 addition & 1 deletion Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,7 @@ tstate_delete_common(PyThreadState *tstate)
HEAD_UNLOCK(runtime);

#ifdef Py_GIL_DISABLED
_Py_qsbr_unregister((_PyThreadStateImpl *)tstate);
_Py_qsbr_unregister(tstate);
#endif

// XXX Unbind in PyThreadState_Clear(), or earlier
Expand Down
11 changes: 6 additions & 5 deletions Python/qsbr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,20 +231,21 @@ _Py_qsbr_register(_PyThreadStateImpl *tstate, PyInterpreterState *interp,
}

void
_Py_qsbr_unregister(_PyThreadStateImpl *tstate)
_Py_qsbr_unregister(PyThreadState *tstate)
{
struct _qsbr_shared *shared = tstate->qsbr->shared;
struct _qsbr_shared *shared = &tstate->interp->qsbr;
struct _PyThreadStateImpl *tstate_imp = (_PyThreadStateImpl*) tstate;

PyMutex_Lock(&shared->mutex);
// NOTE: we must load (or reload) the thread state's qbsr inside the mutex
// because the array may have been resized (changing tstate->qsbr) while
// we waited to acquire the mutex.
struct _qsbr_thread_state *qsbr = tstate->qsbr;
struct _qsbr_thread_state *qsbr = tstate_imp->qsbr;

assert(qsbr->seq == 0 && "thread state must be detached");
assert(qsbr->allocated && qsbr->tstate == (PyThreadState *)tstate);
assert(qsbr->allocated && qsbr->tstate == tstate);

tstate->qsbr = NULL;
tstate_imp->qsbr = NULL;
qsbr->tstate = NULL;
qsbr->allocated = false;
qsbr->freelist_next = shared->freelist;
Expand Down
Loading