Minor updates, improve thread suspension.

Author: fabioz

_pydevd_bundle/pydevd_constants.py

@@ -180,6 +180,7 @@ def _current_frames():
 # Bug affecting Python 3.13.0 specifically makes some tests crash the interpreter!
 # Hopefully it'll be fixed in 3.13.1.
 IS_PY313_0 = sys.version_info[:3] == (3, 13, 0)
+IS_PY313_1 = sys.version_info[:3] == (3, 13, 1)
 
 # Mark tests that need to be fixed with this.
 TODO_PY313_OR_GREATER = IS_PY313_OR_GREATER

_pydevd_bundle/pydevd_cython.c

@@ -359,9 +359,11 @@ except ImportError:
     def get_smart_step_into_variant_from_frame_offset(*args, **kwargs):
         return None
 
+
 # IFDEF CYTHON -- DONT EDIT THIS FILE (it is automatically generated)
 # ELSE
 # # Note: those are now inlined on cython.
+# 105 = 105
 # 107 = 107
 # 144 = 144
 # 109 = 109
@@ -445,6 +447,7 @@ cdef class _TryExceptContainerObj:
 # 
 #     try_except_infos = None
 # 
+# 
 # ENDIF
 
 
@@ -1131,7 +1134,7 @@ cdef class PyDBFrame:
                 if should_skip:
                     stop = False
 
-                elif step_cmd in (107, 144, 206):
+                elif step_cmd in (107, 144, 206, 105):
                     force_check_project_scope = step_cmd == 144
                     if is_line:
                         if not info.pydev_use_scoped_step_frame:

_pydevd_bundle/pydevd_cython.pyx

@@ -25,7 +25,9 @@
     def get_smart_step_into_variant_from_frame_offset(*args, **kwargs):
         return None
 
+
 # IFDEF CYTHON
+# cython_inline_constant: CMD_THREAD_SUSPEND = 105
 # cython_inline_constant: CMD_STEP_INTO = 107
 # cython_inline_constant: CMD_STEP_INTO_MY_CODE = 144
 # cython_inline_constant: CMD_STEP_RETURN = 109
@@ -40,6 +42,7 @@ def get_smart_step_into_variant_from_frame_offset(*args, **kwargs):
 # cython_inline_constant: STATE_SUSPEND = 2
 # ELSE
 # Note: those are now inlined on cython.
+CMD_THREAD_SUSPEND = 105
 CMD_STEP_INTO = 107
 CMD_STEP_INTO_MY_CODE = 144
 CMD_STEP_RETURN = 109
@@ -123,6 +126,7 @@ class _TryExceptContainerObj(object):
 
     try_except_infos = None
 
+
 # ENDIF
 
 
@@ -809,7 +813,7 @@ def trace_dispatch(self, frame, event, arg):
                 if should_skip:
                     stop = False
 
-                elif step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_STEP_INTO_COROUTINE):
+                elif step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_STEP_INTO_COROUTINE, CMD_THREAD_SUSPEND):
                     force_check_project_scope = step_cmd == CMD_STEP_INTO_MY_CODE
                     if is_line:
                         if not info.pydev_use_scoped_step_frame:

_pydevd_bundle/pydevd_frame.py

@@ -25,7 +25,7 @@ def pydevd_find_thread_by_id(thread_id):
     return None
 
 
-def mark_thread_suspended(thread, stop_reason: int, original_step_cmd: int = -1):
+def mark_thread_suspended(thread, stop_reason: int, original_step_cmd: int=-1, main_suspend: bool=True):
     info = set_additional_thread_info(thread)
     info.suspend_type = PYTHON_SUSPEND
     if original_step_cmd != -1:
@@ -34,7 +34,10 @@ def mark_thread_suspended(thread, stop_reason: int, original_step_cmd: int = -1)
 
     # Note: don't set the 'pydev_original_step_cmd' here if unset.
 
-    if info.pydev_step_cmd == -1:
+    if not main_suspend:
+        info.pydev_step_cmd = CMD_THREAD_SUSPEND
+        info.pydev_step_stop = None
+    elif info.pydev_step_cmd == -1:
         # If the step command is not specified, set it to step into
         # to make sure it'll break as soon as possible.
         info.pydev_step_cmd = CMD_STEP_INTO
@@ -91,7 +94,7 @@ def suspend_all_threads(py_db, except_thread):
         else:
             if t is except_thread:
                 continue
-            info = mark_thread_suspended(t, CMD_THREAD_SUSPEND)
+            info = mark_thread_suspended(t, CMD_THREAD_SUSPEND, main_suspend=False)
             frame = info.get_topmost_frame(t)
 
             # Reset the tracing as in this case as it could've set scopes to be untraced.

_pydevd_bundle/pydevd_thread_lifecycle.py

@@ -59,6 +59,25 @@ def get_smart_step_into_variant_from_frame_offset(*args, **kwargs):
 _get_ident = threading.get_ident
 _thread_active = threading._active  # noqa
 
+
+# IFDEF CYTHON
+# cython_inline_constant: CMD_THREAD_SUSPEND = 105
+# cython_inline_constant: CMD_STEP_INTO = 107
+# cython_inline_constant: CMD_STEP_OVER = 108
+# cython_inline_constant: CMD_STEP_INTO_MY_CODE = 144
+# cython_inline_constant: CMD_STEP_INTO_COROUTINE = 206
+# cython_inline_constant: CMD_SMART_STEP_INTO = 128
+# cython_inline_constant: can_skip: bool = True
+# cython_inline_constant: CMD_STEP_RETURN = 109
+# cython_inline_constant: CMD_STEP_OVER_MY_CODE = 159
+# cython_inline_constant: CMD_STEP_RETURN_MY_CODE = 160
+# cython_inline_constant: CMD_SET_BREAK = 111
+# cython_inline_constant: CMD_SET_FUNCTION_BREAK = 208
+# cython_inline_constant: STATE_RUN = 1
+# cython_inline_constant: STATE_SUSPEND = 2
+# ELSE
+# Note: those are now inlined on cython.
+CMD_THREAD_SUSPEND: int = 105
 CMD_STEP_INTO: int = 107
 CMD_STEP_OVER: int = 108
 CMD_STEP_INTO_MY_CODE: int = 144
@@ -72,6 +91,8 @@ def get_smart_step_into_variant_from_frame_offset(*args, **kwargs):
 CMD_SET_FUNCTION_BREAK: int = 208
 STATE_RUN: int = 1
 STATE_SUSPEND: int = 2
+# ENDIF
+
 
 IGNORE_EXCEPTION_TAG = re.compile("[^#]*#.*@IgnoreException")
 DEBUG_START = ("pydevd.py", "run")
@@ -809,7 +830,7 @@ def _enable_code_tracing(py_db, additional_info, func_code_info: FuncCodeInfo, c
 def _enable_step_tracing(py_db, code, step_cmd, info, frame):
 # ENDIF
 # fmt: on
-    if step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_STEP_INTO_COROUTINE, CMD_SMART_STEP_INTO):
+    if step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_STEP_INTO_COROUTINE, CMD_SMART_STEP_INTO, CMD_THREAD_SUSPEND):
         # Stepping (must have line/return tracing enabled).
         _enable_line_tracing(code)
         _enable_return_tracing(code)
@@ -1088,7 +1109,7 @@ def _return_event(code, instruction, retval):
 
     # Python line stepping
     stop_frame = info.pydev_step_stop
-    if step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_STEP_INTO_COROUTINE):
+    if step_cmd in (CMD_STEP_INTO, CMD_STEP_INTO_MY_CODE, CMD_STEP_INTO_COROUTINE, CMD_THREAD_SUSPEND):
         force_check_project_scope = step_cmd == CMD_STEP_INTO_MY_CODE
         if frame.f_back is not None and not info.pydev_use_scoped_step_frame:
             back_func_code_info = _get_func_code_info(frame.f_back.f_code, frame.f_back)
@@ -1581,6 +1602,11 @@ def _internal_line_event(func_code_info, frame, line):
             _do_wait_suspend(py_db, thread_info, frame, "line", None)
             return
 
+    elif step_cmd == CMD_THREAD_SUSPEND:
+        py_db.set_suspend(thread_info.thread, step_cmd, original_step_cmd=info.pydev_original_step_cmd)
+        _do_wait_suspend(py_db, thread_info, frame, "line", None)
+        return
+
     elif step_cmd == CMD_SMART_STEP_INTO:
         stop = False
         back = frame.f_back