wip

fabioz · Dec 16, 2023 · 699f4fd · 699f4fd
1 parent eda7725
commit 699f4fd
Show file tree

Hide file tree

Showing 76 changed files with 22,173 additions and 22,538 deletions.
diff --git a/plugins/org.python.pydev.core/pysrc/.github/workflows/pydevd-tests-python.yml b/plugins/org.python.pydev.core/pysrc/.github/workflows/pydevd-tests-python.yml
@@ -17,9 +17,9 @@ jobs:
         name: [
           "ubuntu-pypy3",
           "macos-py37-cython",
-          "ubuntu-py38-cython-checkbin",
+          "ubuntu-py38-cython",
           "windows-py39-cython",
-          "windows-py310-cython",
+          "windows-py310-cython-checkbin",
           "windows-py311-cython",
           "ubuntu-py311-cython",
           "ubuntu-py312-cython",
@@ -34,15 +34,15 @@ jobs:
             python: "3.7"
             os: macos-latest
             PYDEVD_USE_CYTHON: YES
-          - name: "ubuntu-py38-cython-checkbin"
+          - name: "ubuntu-py38-cython"
             python: "3.8"
             os: ubuntu-latest
             PYDEVD_USE_CYTHON: YES
           - name: "windows-py39-cython"
             python: "3.9"
             os: windows-latest
             PYDEVD_USE_CYTHON: YES
-          - name: "windows-py310-cython"
+          - name: "windows-py310-cython-checkbin"
             python: "3.10"
             os: windows-latest
             PYDEVD_USE_CYTHON: YES
@@ -88,11 +88,11 @@ jobs:
         pip install psutil --no-warn-script-location
         pip install ipython --no-warn-script-location
         pip install untangle --no-warn-script-location
+        pip install "django==4.2" --no-warn-script-location
     - name: Install Python 3.x deps
-      if: contains(matrix.name, 'py3') && !contains(matrix.name, 'pypy') && !contains(matrix.name, 'py311') && !contains(matrix.name, 'py312')
+      if: contains(matrix.name, 'py3') && !contains(matrix.name, 'pypy') && !contains(matrix.name, 'py312') && !contains(matrix.name, 'py311')
       run: |
         pip install PySide2 --no-warn-script-location
-        pip install django<=4.2
         pip install cherrypy --no-warn-script-location
         pip install gevent greenlet
     - name: Install Pandas

diff --git a/plugins/org.python.pydev.core/pysrc/_pydev_bundle/pydev_monkey.py b/plugins/org.python.pydev.core/pysrc/_pydev_bundle/pydev_monkey.py
@@ -4,7 +4,7 @@
 import sys
 from _pydev_bundle._pydev_saved_modules import threading
 from _pydevd_bundle.pydevd_constants import get_global_debugger, IS_WINDOWS, IS_JYTHON, get_current_thread_id, \
-    sorted_dict_repr, set_global_debugger, DebugInfoHolder, USE_SYS_MONITORING
+    sorted_dict_repr, set_global_debugger, DebugInfoHolder, PYDEVD_USE_SYS_MONITORING
 from _pydev_bundle import pydev_log
 from contextlib import contextmanager
 from _pydevd_bundle import pydevd_constants, pydevd_defaults
@@ -234,7 +234,7 @@ def _on_forked_process(setup_tracing=True):
 
 def _on_set_trace_for_new_thread(global_debugger):
     if global_debugger is not None:
-        if not USE_SYS_MONITORING:
+        if not PYDEVD_USE_SYS_MONITORING:
             global_debugger.enable_tracing()
 
 

diff --git a/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_api.py b/plugins/org.python.pydev.core/pysrc/_pydevd_bundle/pydevd_api.py
@@ -15,7 +15,8 @@
 from _pydevd_bundle.pydevd_comm_constants import (CMD_THREAD_SUSPEND, file_system_encoding,
     CMD_STEP_INTO_MY_CODE, CMD_STOP_ON_START, CMD_SMART_STEP_INTO)
 from _pydevd_bundle.pydevd_constants import (get_current_thread_id, set_protocol, get_protocol,
-    HTTP_JSON_PROTOCOL, JSON_PROTOCOL, DebugInfoHolder, IS_WINDOWS)
+    HTTP_JSON_PROTOCOL, JSON_PROTOCOL, DebugInfoHolder, IS_WINDOWS,
+    PYDEVD_USE_SYS_MONITORING)
 from _pydevd_bundle.pydevd_net_command_factory_json import NetCommandFactoryJson
 from _pydevd_bundle.pydevd_net_command_factory_xml import NetCommandFactory
 import pydevd_file_utils
@@ -32,6 +33,7 @@
 from _pydevd_bundle.pydevd_daemon_thread import run_as_pydevd_daemon_thread
 from _pydevd_bundle.pydevd_thread_lifecycle import pydevd_find_thread_by_id, resume_threads
 import tokenize
+from _pydevd_sys_monitoring import pydevd_sys_monitoring
 
 try:
     import dis
@@ -562,7 +564,7 @@ def add_breakpoint(
         id_to_pybreakpoint[breakpoint_id] = added_breakpoint
         py_db.consolidate_breakpoints(canonical_normalized_filename, id_to_pybreakpoint, file_to_line_to_breakpoints)
         if py_db.plugin is not None:
-            py_db.has_plugin_line_breaks = py_db.plugin.has_line_breaks()
+            py_db.has_plugin_line_breaks = py_db.plugin.has_line_breaks(py_db)
             py_db.plugin.after_breakpoints_consolidated(py_db, canonical_normalized_filename, id_to_pybreakpoint, file_to_line_to_breakpoints)
 
         py_db.on_breakpoints_changed()
@@ -680,7 +682,7 @@ def remove_breakpoint(self, py_db, received_filename, breakpoint_type, breakpoin
                 del id_to_pybreakpoint[breakpoint_id]
                 py_db.consolidate_breakpoints(canonical_normalized_filename, id_to_pybreakpoint, file_to_line_to_breakpoints)
                 if py_db.plugin is not None:
-                    py_db.has_plugin_line_breaks = py_db.plugin.has_line_breaks()
+                    py_db.has_plugin_line_breaks = py_db.plugin.has_line_breaks(py_db)
                     py_db.plugin.after_breakpoints_consolidated(py_db, canonical_normalized_filename, id_to_pybreakpoint, file_to_line_to_breakpoints)
 
             except KeyError:
@@ -797,7 +799,7 @@ def add_plugins_exception_breakpoint(self, py_db, breakpoint_type, exception):
             supported_type = plugin.add_breakpoint('add_exception_breakpoint', py_db, breakpoint_type, exception)
 
         if supported_type:
-            py_db.has_plugin_exception_breaks = py_db.plugin.has_exception_breaks()
+            py_db.has_plugin_exception_breaks = py_db.plugin.has_exception_breaks(py_db)
             py_db.on_breakpoints_changed()
         else:
             raise NameError(breakpoint_type)
@@ -830,7 +832,7 @@ def remove_plugins_exception_breakpoint(self, py_db, exception_type, exception):
         supported_type = plugin.remove_exception_breakpoint(py_db, exception_type, exception)
 
         if supported_type:
-            py_db.has_plugin_exception_breaks = py_db.plugin.has_exception_breaks()
+            py_db.has_plugin_exception_breaks = py_db.plugin.has_exception_breaks(py_db)
         else:
             pydev_log.info('No exception of type: %s was previously registered.', exception_type)
 
@@ -924,6 +926,9 @@ def stop_on_entry(self):
             info = set_additional_thread_info(main_thread)
             info.pydev_original_step_cmd = CMD_STOP_ON_START
             info.pydev_step_cmd = CMD_STEP_INTO_MY_CODE
+            if PYDEVD_USE_SYS_MONITORING:
+                pydevd_sys_monitoring.update_monitor_events(suspend_requested=True)
+                pydevd_sys_monitoring.restart_events()
 
     def set_ignore_system_exit_codes(self, py_db, ignore_system_exit_codes):
         py_db.set_ignore_system_exit_codes(ignore_system_exit_codes)