pydevd-pycharm 241.17011.127__tar.gz → 241.18034.18__tar.gz

{pydevd-pycharm-241.17011.127/pydevd_pycharm.egg-info → pydevd-pycharm-241.18034.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pydevd-pycharm
-Version: 241.17011.127
+Version: 241.18034.18
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd-pycharm-241.18034.18/VERSION

@@ -0,0 +1 @@
+241.18034.18

{pydevd-pycharm-241.17011.127 → pydevd-pycharm-241.18034.18}/_pydevd_bundle/pydevd_comm.py

@@ -148,7 +148,7 @@ from _pydevd_bundle.pydevd_comm_constants import (
 MAX_IO_MSG_SIZE = 1000  #if the io is too big, we'll not send all (could make the debugger too non-responsive)
 #this number can be changed if there's need to do so
 
-VERSION_STRING = "241.17011.127"
+VERSION_STRING = "241.18034.18"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
 file_system_encoding = getfilesystemencoding()
@@ -1881,6 +1881,7 @@ class InternalLoadFullValue(InternalThreadCommand):
         self.thread_id = thread_id
         self.frame_id = frame_id
         self.vars = vars
+        self.py_db = GlobalDebuggerHolder.global_dbg
 
     def do_it(self, dbg):
         """Starts a thread that will load values asynchronously"""
@@ -1899,6 +1900,7 @@ class InternalLoadFullValue(InternalThreadCommand):
                     var_objects.append((var_obj, name))
 
             t = GetValueAsyncThreadDebug(dbg, self.sequence, var_objects, dbg.get_user_type_renderers())
+            self.py_db.value_resolve_thread_list.append(t)
             t.start()
         except:
             exc = get_exception_traceback_str()

{pydevd-pycharm-241.17011.127 → pydevd-pycharm-241.18034.18}/_pydevd_bundle/pydevd_constants.py

@@ -176,6 +176,9 @@ USE_LOW_IMPACT_MONITORING = (IS_PY312_OR_GREATER and
 # The tool name to use in the API calls from PEP 669.
 PYDEVD_TOOL_NAME = 'pydevd'
 
+HALT_VARIABLE_RESOLVE_THREADS_ON_STEP_RESUME = os.environ.get(
+    'HALT_VARIABLE_RESOLVE_THREADS_ON_STEP_RESUME', False)
+
 
 class ValuesPolicy:
     SYNC = 0

{pydevd-pycharm-241.17011.127 → pydevd-pycharm-241.18034.18}/_pydevd_bundle/pydevd_process_net_command.py

@@ -24,8 +24,10 @@ from _pydevd_bundle.pydevd_comm import (CMD_RUN, CMD_VERSION, CMD_LIST_THREADS,
     CMD_GET_THREAD_STACK, CMD_THREAD_DUMP_TO_STDERR, CMD_STOP_ON_START, CMD_GET_EXCEPTION_DETAILS, NetCommand,
     CMD_SET_PROTOCOL, CMD_PYDEVD_JSON_CONFIG, InternalGetThreadStack, InternalSmartStepInto, InternalGetSmartStepIntoVariants,
     CMD_DATAVIEWER_ACTION, InternalDataViewerAction, CMD_TABLE_EXEC, InternalTableCommand, CMD_INTERRUPT_DEBUG_CONSOLE, CMD_SET_USER_TYPE_RENDERERS)
-from _pydevd_bundle.pydevd_constants import (get_thread_id, IS_PY3K, DebugInfoHolder, dict_keys, STATE_RUN,
-    NEXT_VALUE_SEPARATOR, IS_WINDOWS, get_current_thread_id)
+from _pydevd_bundle.pydevd_constants import (get_thread_id, IS_PY3K, DebugInfoHolder,
+                                             dict_keys, STATE_RUN,
+                                             NEXT_VALUE_SEPARATOR, IS_WINDOWS,
+                                             get_current_thread_id)
 from _pydevd_bundle.pydevd_additional_thread_info import set_additional_thread_info
 from _pydev_imps._pydev_saved_modules import threading
 import json
@@ -152,6 +154,7 @@ def process_net_command(py_db, cmd_id, seq, text):
                     break
 
             elif cmd_id == CMD_THREAD_RUN:
+                py_db.maybe_kill_active_value_resolve_threads()
                 threads = []
                 if text.strip() == '*':
                     threads = pydevd_utils.get_non_pydevd_threads()
@@ -173,6 +176,8 @@ def process_net_command(py_db, cmd_id, seq, text):
             elif cmd_id == CMD_STEP_INTO or cmd_id == CMD_STEP_OVER or cmd_id == CMD_STEP_RETURN or \
                     cmd_id == CMD_STEP_INTO_MY_CODE:
                 # we received some command to make a single step
+                py_db.maybe_kill_active_value_resolve_threads()
+
                 t = pydevd_find_thread_by_id(text)
                 if t:
                     thread_id = get_thread_id(t)
@@ -183,6 +188,7 @@ def process_net_command(py_db, cmd_id, seq, text):
                     sys.stderr.write("Can't make tasklet step command: %s\n" % (text,))
 
             elif cmd_id in (CMD_RUN_TO_LINE, CMD_SET_NEXT_STATEMENT, CMD_SMART_STEP_INTO):
+                py_db.maybe_kill_active_value_resolve_threads()
                 if cmd_id == CMD_SMART_STEP_INTO:
                     # we received a smart step into command
                     thread_id, frame_id, line, func_name, call_order, start_line, end_line = text.split('\t', 6)

{pydevd-pycharm-241.17011.127 → pydevd-pycharm-241.18034.18}/_pydevd_bundle/pydevd_utils.py

@@ -1,5 +1,6 @@
 from __future__ import nested_scopes
 
+import ctypes
 import os
 import traceback
 
@@ -16,8 +17,10 @@ except:
     OrderedDict = dict
 
 import inspect
-from _pydevd_bundle.pydevd_constants import BUILTINS_MODULE_NAME, IS_PY38_OR_GREATER, dict_iter_items, get_global_debugger, IS_PY3K, LOAD_VALUES_POLICY, \
-    ValuesPolicy, GET_FRAME_RETURN_GROUP, GET_FRAME_NORMAL_GROUP, IS_PY311
+from _pydevd_bundle.pydevd_constants import BUILTINS_MODULE_NAME, IS_PY38_OR_GREATER, \
+    dict_iter_items, get_global_debugger, IS_PY3K, LOAD_VALUES_POLICY, \
+    ValuesPolicy, GET_FRAME_RETURN_GROUP, GET_FRAME_NORMAL_GROUP, IS_PY311, \
+    IS_PY37_OR_GREATER
 import sys
 from _pydev_bundle import pydev_log
 from _pydev_imps._pydev_saved_modules import threading
@@ -643,3 +646,27 @@ def eval_expression(expression, globals, locals):
         return eval_func(expression, globals, locals, False)
 
     return eval(expression, globals, locals)
+
+
+def kill_thread(thread):
+    if not thread.is_alive():
+        return
+
+    thread_id = thread.ident
+
+    if IS_PY37_OR_GREATER:
+        tid = ctypes.c_long(thread_id)
+    else:
+        tid = ctypes.c_ulong(thread_id)
+
+    res = ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, ctypes.py_object(SystemExit))
+
+    if res == 0:
+        pydev_log.debug("Thread with ID '%s' not found" % thread_id)
+    elif res > 1:
+        pydev_log.debug("More then one thread with ID '%s' found" % thread_id)
+        ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, None)
+    else:
+        pydev_log.debug("Successfully raised an exception in thread with ID '%s'"
+                        % thread_id)
+    pydev_log.debug("Thread with ID '%s' is stopped" % thread_id)

{pydevd-pycharm-241.17011.127 → pydevd-pycharm-241.18034.18}/pydevd.py

@@ -32,7 +32,7 @@ from _pydevd_bundle.pydevd_constants import IS_JYTH_LESS25, IS_PYCHARM, get_thre
     clear_cached_thread_id, INTERACTIVE_MODE_AVAILABLE, SHOW_DEBUG_INFO_ENV, \
     IS_PY34_OR_GREATER, IS_PY36_OR_GREATER, \
     IS_PY2, NULL, NO_FTRACE, dummy_excepthook, IS_CPYTHON, GOTO_HAS_RESPONSE, \
-    USE_LOW_IMPACT_MONITORING
+    USE_LOW_IMPACT_MONITORING, HALT_VARIABLE_RESOLVE_THREADS_ON_STEP_RESUME
 from _pydev_bundle import fix_getpass
 from _pydev_bundle import pydev_imports, pydev_log
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
@@ -62,7 +62,8 @@ from _pydevd_frame_eval.pydevd_frame_eval_main import (
     frame_eval_func, dummy_trace_dispatch, show_frame_eval_warning)
 from _pydevd_bundle.pydevd_pep_669_tracing_wrapper import enable_pep669_monitoring
 from _pydevd_bundle.pydevd_additional_thread_info import set_additional_thread_info
-from _pydevd_bundle.pydevd_utils import save_main_module, is_current_thread_main_thread
+from _pydevd_bundle.pydevd_utils import save_main_module, is_current_thread_main_thread, \
+    kill_thread
 from pydevd_concurrency_analyser.pydevd_concurrency_logger import ThreadingLogger, AsyncioLogger, send_message, cur_time
 from pydevd_concurrency_analyser.pydevd_thread_wrappers import wrap_threads, wrap_asyncio
 from pydevd_file_utils import get_fullname, rPath, get_package_dir
@@ -514,6 +515,8 @@ class PyDB(object):
 
         self.is_pep669_monitoring_enabled = False
 
+        self.value_resolve_thread_list = []
+
     def get_thread_local_trace_func(self):
         try:
             thread_trace_func = self._local_thread_trace_func.thread_trace_func
@@ -554,6 +557,12 @@ class PyDB(object):
     def disable_tracing(self):
         pydevd_tracing.SetTrace(None)
 
+    def maybe_kill_active_value_resolve_threads(self):
+        if HALT_VARIABLE_RESOLVE_THREADS_ON_STEP_RESUME:
+            for t in self.value_resolve_thread_list:
+                kill_thread(t)
+            self.value_resolve_thread_list = []
+
     def on_breakpoints_changed(self, removed=False):
         '''
         When breakpoints change, we have to re-evaluate all the assumptions we've made so far.

{pydevd-pycharm-241.17011.127 → pydevd-pycharm-241.18034.18/pydevd_pycharm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pydevd-pycharm
-Version: 241.17011.127
+Version: 241.18034.18
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd-pycharm-241.17011.127/VERSION

@@ -1 +0,0 @@
-241.17011.127