Skip to content

gh-120198: Fix crash when two thread edit __class__ #120195

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

Merged
zooba merged 12 commits into from
Jun 11, 2024
Merged

gh-120198: Fix crash when two thread edit __class__ #120195

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df767e5
Make Py_TYPE and Py_SET_TYPE thread safe
Fidget-Spinner Jun 6, 2024
2e9fda6
fix Windows
Fidget-Spinner Jun 6, 2024
bda9545
add test
Fidget-Spinner Jun 7, 2024
b49dc1a
style nits
Fidget-Spinner Jun 7, 2024
54553a9
remove free-threaded stuff temporarily
Fidget-Spinner Jun 7, 2024
b1dc75b
Remove heap type flags
Fidget-Spinner Jun 7, 2024
5523a9e
Revert "Remove heap type flags"
Fidget-Spinner Jun 7, 2024
02a5587
fix bug
Fidget-Spinner Jun 10, 2024
70523eb
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 10, 2024
1fc5c01
Move test like Steve suggested
Fidget-Spinner Jun 10, 2024
a80f876
Merge branch 'hello' of github.com:Fidget-Spinner/cpython into hello
Fidget-Spinner Jun 10, 2024
b70dc07
skip test if no threads
Fidget-Spinner Jun 10, 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
add test
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Jun 7, 2024
commit bda9545ac413922c49b91fad870e12990258ffac
7 changes: 5 additions & 2 deletions Include/internal/pycore_interp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,11 @@ PyAPI_FUNC(PyStatus) _PyInterpreterState_New(

#define RARE_EVENT_INTERP_INC(interp, name) \
do { \
/* saturating add */ \
if (interp->rare_events.name < UINT8_MAX) interp->rare_events.name++; \
/* saturating add */ \
int val = FT_ATOMIC_LOAD_UINT8_RELAXED(interp->rare_events.name); \
if (val < UINT8_MAX) { \
FT_ATOMIC_STORE_UINT8_RELAXED(interp->rare_events.name, val+1); \
} \
RARE_EVENT_STAT_INC(name); \
} while (0); \

Expand Down
27 changes: 27 additions & 0 deletions Lib/test/test_free_threading/test_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import threading
import unittest

from concurrent.futures import ThreadPoolExecutor
Expand Down Expand Up @@ -95,6 +96,32 @@ def reader_func():

self.run_one(writer_func, reader_func)

def test___class___modification(self):
Comment thread
Fidget-Spinner marked this conversation as resolved.
Outdated
class Foo:
pass

class Bar:
pass

thing = Foo()
def work():
foo = thing
for _ in range(10000):
foo.__class__ = Bar
type(foo)
foo.__class__ = Foo
type(foo)


threads = []
for i in range(NTHREADS):
thread = threading.Thread(target=work)
thread.start()
threads.append(thread)

for thread in threads:
thread.join()

def run_one(self, writer_func, reader_func):
writer = Thread(target=writer_func)
readers = []
Expand Down