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

gh-159865: Fix profiling.sampling exception mode dropping blocked handlers by MrGreyfun · Pull Request #159866 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-159865: Fix profiling.sampling exception mode dropping blocked handlers #159866

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

Open
MrGreyfun wants to merge 1 commit into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
+68 −8
Conversation 1 Commits 1 Checks 48 Files changed 2
Open

gh-159865: Fix profiling.sampling exception mode dropping blocked handlers #159866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (2) 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
      • test_cli.py
21 changes: 13 additions & 8 deletions Lib/profiling/sampling/cli.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,15 @@ def _parse_mode(mode_string):
return mode_map[mode_string]


def _skip_idle_for_mode(mode):
"""Return whether collectors should discard idle threads for a mode."""
return mode not in (
PROFILING_MODE_WALL,
PROFILING_MODE_ALL,
PROFILING_MODE_EXCEPTION,
)


def _check_process_died(process):
"""Check if process died and raise an error with stderr if available."""
if process.poll() is None:
Expand Down Expand Up @@ -1186,9 +1195,7 @@ def _handle_attach(args):
)

# Determine skip_idle based on mode
skip_idle = (
mode != PROFILING_MODE_WALL if mode != PROFILING_MODE_ALL else False
)
skip_idle = _skip_idle_for_mode(mode)

output_file = None
if args.format == "binary":
Expand Down Expand Up @@ -1294,9 +1301,7 @@ def _handle_run(args):
)

# Determine skip_idle based on mode
skip_idle = (
mode != PROFILING_MODE_WALL if mode != PROFILING_MODE_ALL else False
)
skip_idle = _skip_idle_for_mode(mode)

output_file = None
if args.format == "binary":
Expand Down Expand Up @@ -1344,7 +1349,7 @@ def _handle_live_attach(args, pid):
mode = _parse_mode(args.mode)

# Determine skip_idle based on mode
skip_idle = mode != PROFILING_MODE_WALL
skip_idle = _skip_idle_for_mode(mode)

# Create live collector with default settings
collector = LiveStatsCollector(
Expand Down Expand Up @@ -1391,7 +1396,7 @@ def _handle_live_run(args):
mode = _parse_mode(args.mode)

# Determine skip_idle based on mode
skip_idle = mode != PROFILING_MODE_WALL
skip_idle = _skip_idle_for_mode(mode)

# Create live collector with default settings
collector = LiveStatsCollector(
Expand Down
55 changes: 55 additions & 0 deletions Lib/test/test_profiling/test_sampling_profiler/test_cli.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,72 @@
_generate_output_filename,
_handle_output,
_replay_with_reader,
_skip_idle_for_mode,
main,
)
from profiling.sampling.constants import (
PROFILING_MODE_ALL,
PROFILING_MODE_CPU,
PROFILING_MODE_EXCEPTION,
PROFILING_MODE_GIL,
PROFILING_MODE_WALL,
)
from profiling.sampling.errors import SamplingScriptNotFoundError, SamplingModuleNotFoundError, SamplingUnknownProcessError
from profiling.sampling.jsonl_collector import JsonlCollector

class TestSampleProfilerCLI(unittest.TestCase):
def test_skip_idle_mode_mapping(self):
self.assertFalse(_skip_idle_for_mode(PROFILING_MODE_WALL))
self.assertTrue(_skip_idle_for_mode(PROFILING_MODE_CPU))
self.assertTrue(_skip_idle_for_mode(PROFILING_MODE_GIL))
self.assertFalse(_skip_idle_for_mode(PROFILING_MODE_ALL))
self.assertFalse(_skip_idle_for_mode(PROFILING_MODE_EXCEPTION))
# Preserve the previous default for modes unknown to this CLI.
self.assertTrue(_skip_idle_for_mode(999))

@requires_remote_subprocess_debugging()
def test_exception_mode_captures_blocked_handler(self):
script = """
import time

try:
raise ValueError("boom")
except ValueError:
time.sleep(30)
"""
with tempfile.TemporaryDirectory() as temp_dir:
script_path = os.path.join(temp_dir, "blocked_handler.py")
output_path = os.path.join(temp_dir, "output.txt")
with open(script_path, "w", encoding="utf-8") as file:
file.write(script)

result = subprocess.run(
[
sys.executable,
"-m",
"profiling.sampling",
"run",
"--mode",
"exception",
"--collapsed",
"-r",
"1000",
"-d",
"1",
"-o",
output_path,
script_path,
],
capture_output=True,
text=True,
timeout=30,
)

self.assertEqual(result.returncode, 0, result.stderr)
with open(output_path, encoding="utf-8") as file:
output = file.read()
self.assertIn("blocked_handler.py", output)

def _setup_sync_mocks(self, mock_socket, mock_popen):
"""Helper to set up socket and process mocks for coordinator tests."""
# Mock the sync socket with context manager support
Expand Down
Loading
Back | FazBrowse Home | New Git URL