More fixes from review

Author: pablogsal

Doc/library/profiling.sampling.rst

@@ -1103,13 +1103,15 @@ workflow that separates data capture from analysis. Rather than generating
 visualizations during profiling, you capture raw data to a compact binary file
 and convert it to different formats later.
 
-This approach has three main benefits. First, sampling runs faster because the
-work of building data structures for visualization is deferred until replay.
-Second, a single binary capture can be converted to multiple output formats
-without re-profiling---pstats for a quick overview, flame graph for visual
-exploration, heatmap for line-level detail. Third, binary files are compact
-and easy to share with colleagues who can convert them to their preferred
-format.
+This approach has three main benefits:
+
+- Sampling runs faster because the work of building data structures for
+  visualization is deferred until replay.
+- A single binary capture can be converted to multiple output formats
+  without re-profiling: pstats for a quick overview, flame graph for visual
+  exploration, heatmap for line-level detail.
+- Binary files are compact and easy to share with colleagues who can convert
+  them to their preferred format.
 
 A typical workflow::
 
@@ -1433,9 +1435,9 @@ Output options
 .. option:: -o <path>, --output <path>
 
    Output file or directory path. Default behavior varies by format:
-   ``--pstats`` writes to stdout, ``--flamegraph``, ``--gecko``, and
-   ``--binary`` generate files like ``flamegraph.PID.html``, and ``--heatmap``
-   creates a directory named ``heatmap_PID``.
+   :option:`--pstats` writes to stdout, while other formats generate a file
+   named ``<format>_<PID>.<ext>`` (for example, ``flamegraph_12345.html``).
+   :option:`--heatmap` creates a directory named ``heatmap_<PID>``.
 
 
 pstats display options

Modules/_remote_debugging/binary_io_reader.c

@@ -799,18 +799,19 @@ emit_batch(RemoteDebuggingState *state, PyObject *collector,
                        frame_indices, stack_depth, reader, timestamps_list);
 }
 
-/* Helper to invoke progress callback, clearing any errors */
-static inline void
+/* Helper to invoke progress callback, returns -1 on error */
+static inline int
 invoke_progress_callback(PyObject *callback, Py_ssize_t current, uint32_t total)
 {
     if (callback && callback != Py_None) {
         PyObject *result = PyObject_CallFunction(callback, "nI", current, total);
         if (result) {
             Py_DECREF(result);
         } else {
-            PyErr_Clear();
+            return -1;
         }
     }
+    return 0;
 }
 
 Py_ssize_t
@@ -838,7 +839,9 @@ binary_reader_replay(BinaryReader *reader, PyObject *collector, PyObject *progre
     Py_ssize_t replayed = 0;
 
     /* Initial progress callback at 0% */
-    invoke_progress_callback(progress_callback, 0, reader->sample_count);
+    if (invoke_progress_callback(progress_callback, 0, reader->sample_count) < 0) {
+        return -1;
+    }
 
     while (offset < reader->sample_data_size) {
         /* Read thread_id (8 bytes) + interpreter_id (4 bytes) */
@@ -954,7 +957,9 @@ binary_reader_replay(BinaryReader *reader, PyObject *collector, PyObject *progre
 
             /* Progress callback after batch */
             if (replayed % PROGRESS_CALLBACK_INTERVAL < count) {
-                invoke_progress_callback(progress_callback, replayed, reader->sample_count);
+                if (invoke_progress_callback(progress_callback, replayed, reader->sample_count) < 0) {
+                    return -1;
+                }
             }
             break;
         }
@@ -1026,12 +1031,16 @@ binary_reader_replay(BinaryReader *reader, PyObject *collector, PyObject *progre
 
         /* Progress callback */
         if (replayed % PROGRESS_CALLBACK_INTERVAL == 0) {
-            invoke_progress_callback(progress_callback, replayed, reader->sample_count);
+            if (invoke_progress_callback(progress_callback, replayed, reader->sample_count) < 0) {
+                return -1;
+            }
         }
     }
 
     /* Final progress callback at 100% */
-    invoke_progress_callback(progress_callback, replayed, reader->sample_count);
+    if (invoke_progress_callback(progress_callback, replayed, reader->sample_count) < 0) {
+        return -1;
+    }
 
     return replayed;
 }