Lock for thread suspension, code-formatting.

Author: fabioz

_pydev_bundle/_pydev_calltip_util.py

@@ -2,6 +2,7 @@
 License: Apache 2.0
 Author: Yuli Fitterman
 """
+
 import types
 
 from _pydevd_bundle.pydevd_constants import IS_JYTHON

_pydev_bundle/fsnotify/__init__.py

@@ -37,6 +37,7 @@ def start_watching():  # Called from thread
 
 Note: changes are only reported for files (added/modified/deleted), not directories.
 """
+
 import sys
 from os.path import basename
 from _pydev_bundle import pydev_log, _pydev_saved_modules

_pydev_bundle/pydev_ipython_console_011.py

@@ -10,7 +10,7 @@
 #   eg: Completing a magic when user typed it without the leading % causes the % to be inserted
 #       to the left of what should be the first colon.
 """Interface to TerminalInteractiveShell for PyDev Interactive Console frontend
-   for IPython 0.11 to 1.0+.
+for IPython 0.11 to 1.0+.
 """
 
 from __future__ import print_function

_pydevd_bundle/pydevd_additional_thread_info_regular.py

@@ -140,7 +140,7 @@ def _get_related_thread(self):
             return None
 
         if thread._ident is None:  # Can this happen?
-            pydev_log.critical("thread._ident is None in _get_related_thread!")
+            pydev_log.critical("thread._ident is None in _get_related_thread! - thread: %s", thread)
             return None
 
         if threading._active.get(thread._ident) is not thread:

_pydevd_bundle/pydevd_comm.py

@@ -1,4 +1,4 @@
-""" pydevd - a debugging daemon
+"""pydevd - a debugging daemon
 This is the daemon you launch for python remote debugging.
 
 Protocol:
@@ -1528,13 +1528,14 @@ def build_exception_info_response(dbg, thread_id, thread, request_seq, set_addit
                                 if line_col_info.end_lineno is not None and lineno < line_col_info.end_lineno:
                                     line_text = "\n".join(linecache.getlines(filename_in_utf8)[lineno : line_col_info.end_lineno + 1])
                                 frame_summary = traceback.FrameSummary(
-                                    filename_in_utf8, 
-                                    lineno, 
-                                    method_name, 
-                                    line=line_text, 
-                                    end_lineno=line_col_info.end_lineno, 
-                                    colno=line_col_info.colno, 
-                                    end_colno=line_col_info.end_colno)
+                                    filename_in_utf8,
+                                    lineno,
+                                    method_name,
+                                    line=line_text,
+                                    end_lineno=line_col_info.end_lineno,
+                                    colno=line_col_info.colno,
+                                    end_colno=line_col_info.end_colno,
+                                )
                                 stack_summary.append(frame_summary)
                             else:
                                 frame_summary = traceback.FrameSummary(filename_in_utf8, lineno, method_name, line=line_text)

_pydevd_bundle/pydevd_console.py

@@ -1,5 +1,5 @@
-"""An helper file for the pydev debugger (REPL) console
-"""
+"""An helper file for the pydev debugger (REPL) console"""
+
 import sys
 import traceback
 from _pydevd_bundle.pydevconsole_code import InteractiveConsole, _EvalAwaitInNewEventLoop

_pydevd_bundle/pydevd_cython.c

@@ -146,7 +146,7 @@ cdef class PyDBAdditionalThreadInfo:
             return None
 
         if thread._ident is None:  # Can this happen?
-            pydev_log.critical("thread._ident is None in _get_related_thread!")
+            pydev_log.critical("thread._ident is None in _get_related_thread! - thread: %s", thread)
             return None
 
         if threading._active.get(thread._ident) is not thread:

_pydevd_bundle/pydevd_cython.pyx

@@ -1,6 +1,7 @@
 """
 Support for a tag that allows skipping over functions while debugging.
 """
+
 import linecache
 import re
 

_pydevd_bundle/pydevd_dont_trace.py

@@ -297,9 +297,9 @@ def __str__(self):
     __repr__ = __str__
 
 
-_cause_message = "\nThe above exception was the direct cause " "of the following exception:\n\n"
+_cause_message = "\nThe above exception was the direct cause of the following exception:\n\n"
 
-_context_message = "\nDuring handling of the above exception, " "another exception occurred:\n\n"
+_context_message = "\nDuring handling of the above exception, another exception occurred:\n\n"
 
 
 def create_frames_list_from_exception_cause(trace_obj, frame, exc_type, exc_desc, memo):

_pydevd_bundle/pydevd_frame_utils.py

@@ -559,6 +559,8 @@ def on_continue_request(self, py_db, request):
         """
         arguments = request.arguments  # : :type arguments: ContinueArguments
         thread_id = arguments.threadId
+        if py_db.multi_threads_single_notification:
+            thread_id = "*"
 
         def on_resumed():
             body = {"allThreadsContinued": thread_id == "*"}

_pydevd_bundle/pydevd_process_net_command_json.py

@@ -166,7 +166,7 @@ def _get_module_details(mod_name, error=ImportError):
         # pkgutil previously raised ImportError
         msg = "Error while finding module specification for {!r} ({}: {})"
         if mod_name.endswith(".py"):
-            msg += f". Try using '{mod_name[:-3]}' instead of " f"'{mod_name}' as the module name."
+            msg += f". Try using '{mod_name[:-3]}' instead of '{mod_name}' as the module name."
         raise error(msg.format(mod_name, type(ex).__name__, ex)) from ex
     if spec is None:
         raise error("No module named %s" % mod_name)

_pydevd_bundle/pydevd_runpy.py

@@ -1,6 +1,7 @@
 """
 Utility for saving locals.
 """
+
 import sys
 from _pydevd_bundle.pydevd_constants import IS_PY313_OR_GREATER
 from _pydev_bundle import pydev_log

_pydevd_bundle/pydevd_save_locals.py

@@ -25,7 +25,8 @@ def pydevd_find_thread_by_id(thread_id):
     return None
 
 
-def mark_thread_suspended(thread, stop_reason: int, original_step_cmd: int=-1, main_suspend: bool=True):
+def mark_thread_suspended(thread, stop_reason: int, original_step_cmd: int = -1, main_suspend: bool = True):
+    pydev_log.info("Marking thread suspended. Name: %s, stop_reason: %s, main_suspend: %s", thread.name, stop_reason, main_suspend)
     info = set_additional_thread_info(thread)
     info.suspend_type = PYTHON_SUSPEND
     if original_step_cmd != -1:
@@ -78,6 +79,11 @@ def resume_threads(thread_id, except_thread=None):
         internal_run_thread(t, set_additional_thread_info=set_additional_thread_info)
 
 
+from _pydevd_bundle.pydevd_constants import ForkSafeLock
+
+suspend_threads_lock = ForkSafeLock()
+
+
 def suspend_all_threads(py_db, except_thread):
     """
     Suspend all except the one passed as a parameter.

_pydevd_bundle/pydevd_thread_lifecycle.py

@@ -1,5 +1,5 @@
-"""For debug purpose we are replacing actual builtin property by the debug property
-"""
+"""For debug purpose we are replacing actual builtin property by the debug property"""
+
 from _pydevd_bundle.pydevd_comm import get_global_debugger
 from _pydev_bundle import pydev_log
 

_pydevd_bundle/pydevd_traceproperty.py

@@ -1,13 +1,14 @@
-""" pydevd_vars deals with variables:
-    resolution/conversion to XML.
+"""pydevd_vars deals with variables:
+resolution/conversion to XML.
 """
+
 import pickle
 from _pydevd_bundle.pydevd_constants import get_frame, get_current_thread_id, iter_chars, silence_warnings_decorator, get_global_debugger
 
 from _pydevd_bundle.pydevd_xml import ExceptionOnEvaluate, get_type, var_to_xml
 from _pydev_bundle import pydev_log
 import functools
-from _pydevd_bundle.pydevd_thread_lifecycle import resume_threads, mark_thread_suspended, suspend_all_threads
+from _pydevd_bundle.pydevd_thread_lifecycle import resume_threads, mark_thread_suspended, suspend_all_threads, suspend_threads_lock
 from _pydevd_bundle.pydevd_comm_constants import CMD_SET_BREAK
 
 import sys  # @Reimport
@@ -337,10 +338,11 @@ def on_timeout_unblock_threads():
 
     finally:
         if on_timeout_unblock_threads is not None and on_timeout_unblock_threads.called:
-            mark_thread_suspended(curr_thread, CMD_SET_BREAK)
-            py_db.threads_suspended_single_notification.increment_suspend_time()
-            suspend_all_threads(py_db, except_thread=curr_thread)
-            py_db.threads_suspended_single_notification.on_thread_suspend(tid, curr_thread, CMD_SET_BREAK)
+            with suspend_threads_lock:
+                mark_thread_suspended(curr_thread, CMD_SET_BREAK)
+                py_db.threads_suspended_single_notification.increment_suspend_time()
+                suspend_all_threads(py_db, except_thread=curr_thread)
+                py_db.threads_suspended_single_notification.on_thread_suspend(tid, curr_thread, CMD_SET_BREAK)
 
 
 def _evaluate_with_timeouts(original_func):

_pydevd_bundle/pydevd_vars.py

@@ -175,9 +175,7 @@ def __iter__(self):
 
     def _check_instr(self, instr):
         if not isinstance(instr, (Label, SetLineno, Instr)):
-            raise ValueError(
-                "Bytecode must only contain Label, " "SetLineno, and Instr objects, " "but %s was found" % type(instr).__name__
-            )
+            raise ValueError("Bytecode must only contain Label, SetLineno, and Instr objects, but %s was found" % type(instr).__name__)
 
     def _copy_attr_from(self, bytecode):
         super()._copy_attr_from(bytecode)

_pydevd_frame_eval/vendored/bytecode/bytecode.py

@@ -21,11 +21,11 @@ def __iter__(self):
             index += 1
 
             if not isinstance(instr, (SetLineno, Instr)):
-                raise ValueError("BasicBlock must only contain SetLineno and Instr objects, " "but %s was found" % instr.__class__.__name__)
+                raise ValueError("BasicBlock must only contain SetLineno and Instr objects, but %s was found" % instr.__class__.__name__)
 
             if isinstance(instr, Instr) and instr.has_jump():
                 if index < len(self):
-                    raise ValueError("Only the last instruction of a basic " "block can be a jump")
+                    raise ValueError("Only the last instruction of a basic block can be a jump")
 
                 if not isinstance(instr.arg, BasicBlock):
                     raise ValueError(

_pydevd_frame_eval/vendored/bytecode/cfg.py

@@ -137,7 +137,7 @@ def __iter__(self):
     def _check_instr(self, instr):
         if not isinstance(instr, (ConcreteInstr, SetLineno)):
             raise ValueError(
-                "ConcreteBytecode must only contain " "ConcreteInstr and SetLineno objects, " "but %s was found" % type(instr).__name__
+                "ConcreteBytecode must only contain ConcreteInstr and SetLineno objects, but %s was found" % type(instr).__name__
             )
 
     def _copy_attr_from(self, bytecode):
@@ -249,7 +249,7 @@ def _assemble_lnotab(first_lineno, linenos):
                 continue
             # FIXME: be kind, force monotonic line numbers? add an option?
             if dlineno < 0 and sys.version_info < (3, 6):
-                raise ValueError("negative line number delta is not supported " "on Python < 3.6")
+                raise ValueError("negative line number delta is not supported on Python < 3.6")
             old_lineno = lineno
 
             doff = offset - old_offset
@@ -646,7 +646,7 @@ def to_concrete_bytecode(self, compute_jumps_passes=None):
             if not modified:
                 break
         else:
-            raise RuntimeError("compute_jumps() failed to converge after" " %d passes" % (pas + 1))
+            raise RuntimeError("compute_jumps() failed to converge after %d passes" % (pas + 1))
 
         concrete = ConcreteBytecode(
             self.instructions,

_pydevd_frame_eval/vendored/bytecode/concrete.py

@@ -62,7 +62,7 @@ def infer_flags(bytecode, is_async=None):
         bytecode,
         (_bytecode.Bytecode, _bytecode.ConcreteBytecode, _bytecode.ControlFlowGraph),
     ):
-        msg = "Expected a Bytecode, ConcreteBytecode or ControlFlowGraph " "instance not %s"
+        msg = "Expected a Bytecode, ConcreteBytecode or ControlFlowGraph instance not %s"
         raise ValueError(msg % bytecode)
 
     instructions = bytecode.get_instructions() if isinstance(bytecode, _bytecode.ControlFlowGraph) else bytecode
@@ -150,9 +150,7 @@ def infer_flags(bytecode, is_async=None):
     # next set the GENERATOR flag if relevant
     else:
         if sure_async:
-            raise ValueError(
-                "The is_async argument is False but bytecodes " "that can only be used in async functions have " "been detected."
-            )
+            raise ValueError("The is_async argument is False but bytecodes that can only be used in async functions have been detected.")
 
         if maybe_generator:
             flags |= CompilerFlags.GENERATOR

_pydevd_frame_eval/vendored/bytecode/flags.py

@@ -123,10 +123,10 @@ class FreeVar(_Variable):
 
 def _check_arg_int(name, arg):
     if not isinstance(arg, int):
-        raise TypeError("operation %s argument must be an int, " "got %s" % (name, type(arg).__name__))
+        raise TypeError("operation %s argument must be an int, got %s" % (name, type(arg).__name__))
 
     if not (0 <= arg <= 2147483647):
-        raise ValueError("operation %s argument must be in " "the range 0..2,147,483,647" % name)
+        raise ValueError("operation %s argument must be in the range 0..2,147,483,647" % name)
 
 
 if sys.version_info < (3, 8):
@@ -169,7 +169,7 @@ def __init__(self, name, arg=UNSET, *, lineno=None, offset=None):
     def _check_arg(self, name, opcode, arg):
         if name == "EXTENDED_ARG":
             raise ValueError(
-                "only concrete instruction can contain EXTENDED_ARG, " "highlevel instruction can represent arbitrary argument without it"
+                "only concrete instruction can contain EXTENDED_ARG, highlevel instruction can represent arbitrary argument without it"
             )
 
         if opcode >= _opcode.HAVE_ARGUMENT:
@@ -181,25 +181,25 @@ def _check_arg(self, name, opcode, arg):
 
         if self._has_jump(opcode):
             if not isinstance(arg, (Label, _bytecode.BasicBlock)):
-                raise TypeError("operation %s argument type must be " "Label or BasicBlock, got %s" % (name, type(arg).__name__))
+                raise TypeError("operation %s argument type must be Label or BasicBlock, got %s" % (name, type(arg).__name__))
 
         elif opcode in _opcode.hasfree:
             if not isinstance(arg, (CellVar, FreeVar)):
-                raise TypeError("operation %s argument must be CellVar " "or FreeVar, got %s" % (name, type(arg).__name__))
+                raise TypeError("operation %s argument must be CellVar or FreeVar, got %s" % (name, type(arg).__name__))
 
         elif opcode in _opcode.haslocal or opcode in _opcode.hasname:
             if not isinstance(arg, str):
-                raise TypeError("operation %s argument must be a str, " "got %s" % (name, type(arg).__name__))
+                raise TypeError("operation %s argument must be a str, got %s" % (name, type(arg).__name__))
 
         elif opcode in _opcode.hasconst:
             if isinstance(arg, Label):
-                raise ValueError("label argument cannot be used " "in %s operation" % name)
+                raise ValueError("label argument cannot be used in %s operation" % name)
             if isinstance(arg, _bytecode.BasicBlock):
-                raise ValueError("block argument cannot be used " "in %s operation" % name)
+                raise ValueError("block argument cannot be used in %s operation" % name)
 
         elif opcode in _opcode.hascompare:
             if not isinstance(arg, Compare):
-                raise TypeError("operation %s argument type must be " "Compare, got %s" % (name, type(arg).__name__))
+                raise TypeError("operation %s argument type must be Compare, got %s" % (name, type(arg).__name__))
 
         elif opcode >= _opcode.HAVE_ARGUMENT:
             _check_arg_int(name, arg)

_pydevd_frame_eval/vendored/bytecode/instr.py

@@ -2,6 +2,7 @@
 Peephole optimizer of CPython 3.6 reimplemented in pure Python using
 the bytecode module.
 """
+
 import opcode
 import operator
 import sys

_pydevd_frame_eval/vendored/bytecode/peephole_opt.py

@@ -555,9 +555,9 @@ def test_to_code(self):
 
         if OFFSET_AS_INSTRUCTION:
             # The argument of the jump is divided by 2
-            expected = b"|\x05" b"r\x04" b"|\x00" b"}\x05" b"d\x01" b"}\x05" b"|\x05" b"S\x00"
+            expected = b"|\x05r\x04|\x00}\x05d\x01}\x05|\x05S\x00"
         else:
-            expected = b"|\x05" b"r\x08" b"|\x00" b"}\x05" b"d\x01" b"}\x05" b"|\x05" b"S\x00"
+            expected = b"|\x05r\x08|\x00}\x05d\x01}\x05|\x05S\x00"
 
         code = bytecode.to_code()
         self.assertEqual(code.co_consts, (None, 3))

_pydevd_frame_eval/vendored/bytecode/tests/test_cfg.py

@@ -1,6 +1,7 @@
 """
 Helper module to hold the names to rename while doing refactoring to convert to pep8.
 """
+
 NAMES = """
 # sendCaughtExceptionStack
 # sendBreakpointConditionException