Skip to content

gh-138122: Refactor the CLI of profiling.sampling into subcommands #141813

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
pablogsal merged 8 commits into from
Nov 24, 2025
Merged

gh-138122: Refactor the CLI of profiling.sampling into subcommands #141813

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
db2ed3b
gh-138122: Refactor the CLI of profile.sampling into subcommands
pablogsal Nov 21, 2025
d6ca1b3
fixup! gh-138122: Refactor the CLI of profile.sampling into subcommands
pablogsal Nov 21, 2025
54be163
fixup! fixup! gh-138122: Refactor the CLI of profile.sampling into su…
pablogsal Nov 21, 2025
7d90c37
Merge remote-tracking branch 'upstream/main' into gh-138122-2
pablogsal Nov 21, 2025
817fdc0
fixup! Merge remote-tracking branch 'upstream/main' into gh-138122-2
pablogsal Nov 21, 2025
170760b
Address feedback
pablogsal Nov 22, 2025
6e4c0d9
Address Laszlo's review
pablogsal Nov 23, 2025
271df56
Update Lib/profiling/sampling/cli.py
pablogsal Nov 23, 2025
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
Merge remote-tracking branch 'upstream/main' into gh-138122-2
  • Loading branch information
@pablogsal
pablogsal committed Nov 21, 2025
commit 7d90c377fc194015253caf48c21f2a649ab2ff86
14 changes: 9 additions & 5 deletions Lib/test/test_profiling/test_sampling_profiler/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@

from test.support import (
requires_subprocess,
captured_stdout,
captured_stderr,
SHORT_TIMEOUT,
)

from .helpers import (
Expand Down Expand Up @@ -403,13 +406,13 @@ def test_sampling_basic_functionality(self):
mock.patch("sys.stdout", captured_output),
):
try:
collector = PstatsCollector(sample_interval_usec=1000, skip_idle=False)
# Sample for up to SHORT_TIMEOUT seconds, but process exits after fixed iterations
profiling.sampling.sample.sample(
subproc.process.pid,
collector,
duration_sec=2,
duration_sec=SHORT_TIMEOUT,
sample_interval_usec=1000, # 1ms
show_summary=False,
)
collector.print_stats(show_summary=False)
except PermissionError:
self.skipTest("Insufficient permissions for remote profiling")

Expand Down Expand Up @@ -550,7 +553,8 @@ def test_sample_target_script(self):
script_file.flush()
self.addCleanup(close_and_unlink, script_file)

test_args = ["profiling.sampling.cli", "run", "-d", "1", script_file.name]
# Sample for up to SHORT_TIMEOUT seconds, but process exits after fixed iterations
test_args = ["profiling.sampling.sample", "-d", PROFILING_TIMEOUT, script_file.name]

with (
mock.patch("sys.argv", test_args),
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.