Clean up the diff

Author: brandtbucher

Include/internal/pycore_interpframe_structs.h

@@ -24,7 +24,6 @@ enum _frameowner {
     FRAME_OWNED_BY_GENERATOR = 1,
     FRAME_OWNED_BY_FRAME_OBJECT = 2,
     FRAME_OWNED_BY_INTERPRETER = 3,
-    FRAME_OWNED_BY_CSTACK = 4,  // XXX: Unused.
 };
 
 struct _PyInterpreterFrame {

Lib/test/test_profiling/test_sampling_profiler.py

@@ -124,7 +124,7 @@ def test_subprocess(script):
         server_socket.close()
         response = client_socket.recv(1024)
         if response != b"ready":
-            raise RuntimeError(f"Unexpected response from subprocess: {response}")
+            raise RuntimeError(f"Unexpected response from subprocess: {response!r}")
 
         yield SubprocessInfo(proc, client_socket)
     finally:
@@ -1689,8 +1689,6 @@ class TestSampleProfilerIntegration(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.test_script = '''
-import time
-import os
 import operator
 import gc
 
@@ -1830,10 +1828,10 @@ def test_sampling_with_collapsed_export(self):
                 try:
                     profiling.sampling.sample.sample(
                         subproc.process.pid,
-                        duration_sec=2,  # XXX
+                        duration_sec=1,
                         filename=collapsed_file.name,
                         output_format="collapsed",
-                        sample_interval_usec=100,  # XXX
+                        sample_interval_usec=10000,
                     )
                 except PermissionError:
                     self.skipTest(
@@ -1848,8 +1846,6 @@ def test_sampling_with_collapsed_export(self):
             with open(collapsed_file.name, "r") as f:
                 content = f.read()
 
-            with open("/Users/brandtbucher/cpython/x.txt", "w") as f:  # XXX
-                f.write(content)  # XXX
             lines = content.strip().split("\n")
             self.assertGreater(len(lines), 0)
 

Modules/_remote_debugging_module.c

@@ -25,7 +25,7 @@
 #include "Python.h"
 #include <internal/pycore_debug_offsets.h>  // _Py_DebugOffsets
 #include <internal/pycore_frame.h>          // FRAME_SUSPENDED_YIELD_FROM
-#include <internal/pycore_interpframe.h>    // FRAME_OWNED_BY_CSTACK
+#include <internal/pycore_interpframe.h>    // FRAME_OWNED_BY_INTERPRETER
 #include <internal/pycore_llist.h>          // struct llist_node
 #include <internal/pycore_long.h>           // _PyLong_GetZero
 #include <internal/pycore_stackref.h>       // Py_TAG_BITS
@@ -2240,8 +2240,7 @@ is_frame_valid(
 
     void* frame = (void*)frame_addr;
 
-    if (GET_MEMBER(char, frame, unwinder->debug_offsets.interpreter_frame.owner) == FRAME_OWNED_BY_CSTACK ||
-        GET_MEMBER(char, frame, unwinder->debug_offsets.interpreter_frame.owner) == FRAME_OWNED_BY_INTERPRETER) {
+    if (GET_MEMBER(char, frame, unwinder->debug_offsets.interpreter_frame.owner) == FRAME_OWNED_BY_INTERPRETER) {
         return 0;  // C frame
     }
 
@@ -2461,8 +2460,8 @@ process_frame_chain(
     uintptr_t initial_frame_addr,
     StackChunkList *chunks,
     PyObject *frame_info,
-    uintptr_t gc_frame
-) {
+    uintptr_t gc_frame)
+{
     uintptr_t frame_addr = initial_frame_addr;
     uintptr_t prev_frame_addr = 0;
     const size_t MAX_FRAMES = 1024;