skip sample_interval_usec in v0

Author: maurycy

Lib/profiling/sampling/_control.py

@@ -12,7 +12,6 @@ class ProfilerControl:
     def __init__(self):
         self.enabled = True
         self.running = True
-        self.sample_interval_usec = 0
 
 
 def parse_control_uri(uri, *, allowed_schemes=("unix",)):
@@ -188,10 +187,7 @@ def _dispatch(self, conn, command):
             case "ping":
                 reply = "ok\n"
             case "status":
-                reply = (
-                    f"ok enabled={self.control.enabled} "
-                    f"rate_usec={self.control.sample_interval_usec}\n"
-                )
+                reply = f"ok enabled={self.control.enabled}\n"
             case "quit":
                 self.control.running = False
                 conn.close_after_write = True

Lib/profiling/sampling/sample.py

@@ -125,8 +125,6 @@ def sample(
         pending_timestamps = [] if aggregating else None
 
         control = control_server.control if control_server is not None else None
-        if control is not None:
-            control.sample_interval_usec = self.sample_interval_usec
 
         def flush_pending():
             nonlocal pending_count, pending_timestamps

Lib/test/test_profiling/test_sampling_profiler/test_control.py

@@ -110,13 +110,12 @@ def test_dispatch_basic_commands(self):
                     self.assertEqual(server.control.enabled, expected_enabled)
 
     def test_dispatch_status_format(self):
-        """status reply exposes enabled and rate_usec."""
+        """status reply exposes the enabled flag."""
         server = self.start_server()
-        server.control.sample_interval_usec = 1000
         client = self.connect()
         self.assertEqual(
             self.request(server, client, b"status\n"),
-            b"ok enabled=True rate_usec=1000\n",
+            b"ok enabled=True\n",
         )
 
     def test_dispatch_quit_sets_running_and_closes(self):
@@ -163,8 +162,11 @@ def test_close_listener_preserves_replaced_path(self):
     def test_cli_rejects_control_with_subprocesses(self):
         """--control and --subprocesses are mutually exclusive."""
         argv = [
-            "profiling.sampling.cli", "attach",
-            "--subprocesses", "--control", "unix:/tmp/x.sock",
+            "profiling.sampling.cli",
+            "attach",
+            "--subprocesses",
+            "--control",
+            "unix:/tmp/x.sock",
             "123",
         ]
         with (
@@ -181,8 +183,11 @@ def test_cli_rejects_control_with_subprocesses(self):
     def test_cli_rejects_bad_uri(self):
         """An unsupported control URI scheme is rejected during validation."""
         argv = [
-            "profiling.sampling.cli", "attach",
-            "--control", "fifo:/tmp/x", "123",
+            "profiling.sampling.cli",
+            "attach",
+            "--control",
+            "fifo:/tmp/x",
+            "123",
         ]
         with (
             mock.patch("sys.argv", argv),

Lib/test/test_profiling/test_sampling_profiler/test_profiler.py

@@ -436,30 +436,11 @@ def test_sample_profiler_keyboard_interrupt(self):
     @staticmethod
     def _fake_control_server(*, enabled=True, running=True):
         """Build a minimal control_server stub for sample() integration."""
-        control = types.SimpleNamespace(
-            enabled=enabled, running=running, sample_interval_usec=0,
-        )
+        control = types.SimpleNamespace(enabled=enabled, running=running)
         server = mock.MagicMock()
         server.control = control
         return server
 
-    def test_sample_passes_interval_to_control_server(self):
-        """Test that sample() copies its interval into control.sample_interval_usec."""
-        control_server = self._fake_control_server(running=False)
-        with self._patched_unwinder() as u:
-            u.instance.get_stack_trace.return_value = []
-            profiler = SampleProfiler(
-                pid=12345, sample_interval_usec=4242, all_threads=False
-            )
-            with io.StringIO() as output:
-                with mock.patch("sys.stdout", output):
-                    profiler.sample(
-                        mock.MagicMock(),
-                        duration_sec=10,
-                        control_server=control_server,
-                    )
-        self.assertEqual(control_server.control.sample_interval_usec, 4242)
-
     def test_sample_polls_control_server_periodically(self):
         """Test that sample() drives control_server.poll() during the loop."""
         control_server = self._fake_control_server()
@@ -523,9 +504,7 @@ def test_sample_pauses_when_control_disabled(self):
 
     def test_sample_resumes_after_re_enable(self):
         """Test that sampling resumes when control flips from disabled to enabled."""
-        control = types.SimpleNamespace(
-            enabled=False, running=True, sample_interval_usec=0,
-        )
+        control = types.SimpleNamespace(enabled=False, running=True)
         control_server = mock.MagicMock()
         control_server.control = control
 
@@ -556,9 +535,7 @@ def poll_side_effect(timeout=0):
 
     def test_sample_rate_reflects_enabled_time(self):
         """Test that Sample rate divides by enabled time, not wall time."""
-        control = types.SimpleNamespace(
-            enabled=False, running=True, sample_interval_usec=0,
-        )
+        control = types.SimpleNamespace(enabled=False, running=True)
         control_server = mock.MagicMock()
         control_server.control = control