PY-82449 Debug mode not working after last update

Update Cython files

GitOrigin-RevId: 634d3d90a29adcf66b1e0b7275080c5a6a31495d

python/helpers/pydev/_pydevd_bundle/pydevd_additional_thread_info_regular.py

@@ -7,7 +7,7 @@ from _pydev_bundle import pydev_log
 from _pydevd_bundle.pydevd_frame import PyDBFrame
 # ENDIF
 
-version = 58
+version = 59
 
 if not hasattr(sys, '_current_frames'):
 

python/helpers/pydev/_pydevd_bundle/pydevd_cython.pyx

@@ -13,7 +13,7 @@ pydev_log.debug("Using Cython speedups")
 # from _pydevd_bundle.pydevd_frame import PyDBFrame
 # ENDIF
 
-version = 58
+version = 59
 
 if not hasattr(sys, '_current_frames'):
 
@@ -663,7 +663,7 @@ cdef class PyDBFrame:
             line = frame.f_lineno
             line_cache_key = (frame_cache_key, line)
 
-            if main_debugger.pydb_disposed:
+            if main_debugger._finish_debugging_session:
                 if event != 'call': frame.f_trace = NO_FTRACE
                 return None
 
@@ -1133,6 +1133,7 @@ from _pydev_bundle.pydev_is_thread_alive import is_thread_alive
 from _pydev_imps._pydev_saved_modules import threading
 from _pydevd_bundle.pydevd_constants import get_current_thread_id, IS_IRONPYTHON, NO_FTRACE, IS_WINDOWS
 from _pydevd_bundle.pydevd_dont_trace_files import DONT_TRACE
+from _pydevd_bundle.pydevd_kill_all_pydevd_threads import kill_all_pydev_threads
 from pydevd_file_utils import get_abs_path_real_path_and_base_from_frame, NORM_PATHS_AND_BASE_CONTAINER
 from pydevd_tracing import SetTrace
 # IFDEF CYTHON -- DONT EDIT THIS FILE (it is automatically generated)
@@ -1518,8 +1519,14 @@ cdef class ThreadTracer:
         is_stepping = pydev_step_cmd != -1
 
         try:
-            if py_db.pydb_disposed:
+            if py_db._finish_debugging_session:
                 if not py_db._termination_event_set:
+                    # that was not working very well because jython gave some socket errors
+                    try:
+                        if py_db.output_checker_thread is None:
+                            kill_all_pydev_threads()
+                    except:
+                        traceback.print_exc()
                     py_db._termination_event_set = True
                 if event != 'call': frame.f_trace = NO_FTRACE
                 return None
@@ -1604,7 +1611,7 @@ cdef class ThreadTracer:
             return None
 
         except Exception:
-            if py_db.pydb_disposed:
+            if py_db._finish_debugging_session:
                 if event != 'call': frame.f_trace = NO_FTRACE
                 return None  # Don't log errors when we're shutting down.
             # Log it

python/helpers/pydev/_pydevd_bundle/pydevd_pep_669_tracing.py

@@ -235,6 +235,8 @@ def _should_enable_line_events_for_code(frame, code, filename, info, will_be_sto
     # print('PY_START (should enable line events check) %s %s %s %s' % (line_number, code.co_name, filename, info.pydev_step_cmd))
 
     py_db = GlobalDebuggerHolder.global_dbg
+    if py_db is None:
+        return monitoring.DISABLE
 
     plugin_manager = py_db.plugin
 
@@ -432,8 +434,6 @@ def call_callback(code, instruction_offset, callable, arg0):
     frame = _getframe(1)
     # print('ENTER: CALL ', code.co_filename, frame.f_lineno, code.co_name)
 
-
-
     try:
         if py_db._finish_debugging_session:
             return monitoring.DISABLE
@@ -454,6 +454,9 @@ def call_callback(code, instruction_offset, callable, arg0):
         frame_cache_key = _make_frame_cache_key(code)
 
         info = thread_info.additional_info
+        if info is None:
+            return
+
         pydev_step_cmd = info.pydev_step_cmd
         is_stepping = pydev_step_cmd != -1
 
@@ -520,6 +523,9 @@ def py_start_callback(code, instruction_offset):
         frame_cache_key = _make_frame_cache_key(code)
 
         info = thread_info.additional_info
+        if info is None:
+            return
+
         pydev_step_cmd = info.pydev_step_cmd
         is_stepping = pydev_step_cmd != -1
 
@@ -644,6 +650,8 @@ def py_line_callback(code, line_number):
         return
 
     info = thread_info.additional_info
+    if info is None:
+        return
 
     # print('LINE %s %s %s %s' % (frame.f_lineno, code.co_name, code.co_filename, info.pydev_step_cmd))
 
@@ -655,6 +663,9 @@ def py_line_callback(code, line_number):
 
         py_db = GlobalDebuggerHolder.global_dbg
 
+        if py_db is None:
+            return monitoring.DISABLE
+
         if py_db._finish_debugging_session:
             return monitoring.DISABLE
 
@@ -915,6 +926,9 @@ def py_return_callback(code, instruction_offset, retval):
         return
 
     info = thread_info.additional_info
+    if info is None:
+        return
+
     stop_frame = info.pydev_step_stop
     filename = _get_abs_path_real_path_and_base_from_frame(frame)[1]
     plugin_stop = False

python/helpers/pydev/_pydevd_bundle/pydevd_pep_669_tracing_cython.pyx

@@ -241,6 +241,8 @@ def _should_enable_line_events_for_code(frame, code, filename, info, will_be_sto
     # print('PY_START (should enable line events check) %s %s %s %s' % (line_number, code.co_name, filename, info.pydev_step_cmd))
 
     py_db = GlobalDebuggerHolder.global_dbg
+    if py_db is None:
+        return monitoring.DISABLE
 
     plugin_manager = py_db.plugin
 
@@ -438,8 +440,6 @@ def call_callback(code, instruction_offset, callable, arg0):
     frame = _getframe(1)
     # print('ENTER: CALL ', code.co_filename, frame.f_lineno, code.co_name)
 
-
-
     try:
         if py_db._finish_debugging_session:
             return monitoring.DISABLE
@@ -460,6 +460,9 @@ def call_callback(code, instruction_offset, callable, arg0):
         frame_cache_key = _make_frame_cache_key(code)
 
         info = thread_info.additional_info
+        if info is None:
+            return
+
         pydev_step_cmd = info.pydev_step_cmd
         is_stepping = pydev_step_cmd != -1
 
@@ -526,6 +529,9 @@ def py_start_callback(code, instruction_offset):
         frame_cache_key = _make_frame_cache_key(code)
 
         info = thread_info.additional_info
+        if info is None:
+            return
+
         pydev_step_cmd = info.pydev_step_cmd
         is_stepping = pydev_step_cmd != -1
 
@@ -650,6 +656,8 @@ def py_line_callback(code, line_number):
         return
 
     info = thread_info.additional_info
+    if info is None:
+        return
 
     # print('LINE %s %s %s %s' % (frame.f_lineno, code.co_name, code.co_filename, info.pydev_step_cmd))
 
@@ -661,6 +669,9 @@ def py_line_callback(code, line_number):
 
         py_db = GlobalDebuggerHolder.global_dbg
 
+        if py_db is None:
+            return monitoring.DISABLE
+
         if py_db._finish_debugging_session:
             return monitoring.DISABLE
 
@@ -921,6 +932,9 @@ def py_return_callback(code, instruction_offset, retval):
         return
 
     info = thread_info.additional_info
+    if info is None:
+        return
+
     stop_frame = info.pydev_step_stop
     filename = _get_abs_path_real_path_and_base_from_frame(frame)[1]
     plugin_stop = False