FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-136186: Fix race condition in test_external_inspection.test_only_active_thread by pablogsal · Pull Request #136347 · python/cpython · GitHub

/ cpython Public
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
22 changes: 18 additions & 4 deletions Lib/test/test_external_inspection.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import sys
import socket
import threading
import time
from asyncio import staggered, taskgroups, base_events, tasks
from unittest.mock import ANY
from test.support import os_helper, SHORT_TIMEOUT, busy_retry, requires_gil_enabled
Expand Down Expand Up @@ -930,9 +931,6 @@ def main_work():
# Signal threads to start waiting
ready_event.set()

# Give threads time to start sleeping
time.sleep(0.1)

# Now do busy work to hold the GIL
main_work()
"""
Expand Down Expand Up @@ -967,7 +965,23 @@ def main_work():

# Get stack trace with all threads
unwinder_all = RemoteUnwinder(p.pid, all_threads=True)
all_traces = unwinder_all.get_stack_trace()
for _ in range(10):
# Wait for the main thread to start its busy work
all_traces = unwinder_all.get_stack_trace()
found = False
for thread_id, stack in all_traces:
if not stack:
continue
current_frame = stack[0]
if current_frame.funcname == "main_work" and current_frame.lineno >15:
found = True

if found:
break
# Give a bit of time to take the next sample
time.sleep(0.1)
else:
self.fail("Main thread did not start its busy work on time")

# Get stack trace with only GIL holder
unwinder_gil = RemoteUnwinder(p.pid, only_active_thread=True)
Expand Down

Back | FazBrowse Home | New Git URL