diff -r 3a1ca2452c30 -r 2971d5d19951 eric6/Debugger/DebugServer.py
--- a/eric6/Debugger/DebugServer.py Fri Jan 15 19:46:04 2021 +0100
+++ b/eric6/Debugger/DebugServer.py Fri Jan 15 19:49:36 2021 +0100
@@ -42,10 +42,10 @@
@signal clientOutput(str) emitted after the client has sent some output
@signal clientRawInputSent(debuggerId) emitted after the data was sent
to the indicated debug client
- @signal clientLine(filename, lineno, debuggerId, forStack) emitted after
- the debug client has executed a line of code
- @signal clientStack(stack, debuggerId) emitted after the debug client has
- executed a line of code
+ @signal clientLine(filename, lineno, debuggerId, threadName, forStack)
+ emitted after the debug client has executed a line of code
+ @signal clientStack(stack, debuggerId, threadName) emitted after the
+ debug client has executed a line of code
@signal clientThreadList(currentId, threadList, debuggerId) emitted after
a thread list has been received
@signal clientThreadSet(debuggerId) emitted after the client has
@@ -60,10 +60,11 @@
@signal clientDisassembly(disassembly, debuggerId) emitted after the client
has sent a disassembly of the code raising an exception
@signal clientException(exceptionType, exceptionMessage, stackTrace,
- debuggerId) emitted after an exception occured on the client side
+ debuggerId, threadName) emitted after an exception occured on the
+ client side
@signal clientSyntaxError(message, filename, linenumber, characternumber,
- debuggerId) emitted after a syntax error has been detected on the
- client side
+ debuggerId, threadName) emitted after a syntax error has been detected
+ on the client side
@signal clientSignal(message, filename, linenumber, function name,
function arguments, debuggerId) emitted after a signal has been
generated on the client side
@@ -131,16 +132,16 @@
clientProcessStderr = pyqtSignal(str)
clientRawInputSent = pyqtSignal(str)
clientOutput = pyqtSignal(str)
- clientLine = pyqtSignal(str, int, str, bool)
- clientStack = pyqtSignal(list, str)
+ clientLine = pyqtSignal(str, int, str, str, bool)
+ clientStack = pyqtSignal(list, str, str)
clientThreadList = pyqtSignal('PyQt_PyObject', list, str)
clientThreadSet = pyqtSignal(str)
clientVariables = pyqtSignal(int, list, str)
clientVariable = pyqtSignal(int, list, str)
clientStatement = pyqtSignal(bool, str)
clientDisassembly = pyqtSignal(dict, str)
- clientException = pyqtSignal(str, str, list, str)
- clientSyntaxError = pyqtSignal(str, str, int, int, str)
+ clientException = pyqtSignal(str, str, list, str, str)
+ clientSyntaxError = pyqtSignal(str, str, int, int, str, str)
clientSignal = pyqtSignal(str, str, int, str, str, str)
clientDisconnected = pyqtSignal(str)
clientExit = pyqtSignal(str, int, str, bool, str)
@@ -1651,7 +1652,8 @@
else:
self.clientOutput.emit(line)
- def signalClientLine(self, filename, lineno, debuggerId, forStack=False):
+ def signalClientLine(self, filename, lineno, debuggerId, forStack=False,
+ threadName=""):
"""
Public method to process client position feedback.
@@ -1663,10 +1665,13 @@
@type str
@param forStack flag indicating this is for a stack dump
@type bool
+ @param threadName name of the thread signaling the event
+ @type str
"""
- self.clientLine.emit(filename, lineno, debuggerId, forStack)
+ self.clientLine.emit(filename, lineno, debuggerId, threadName,
+ forStack)
- def signalClientStack(self, stack, debuggerId):
+ def signalClientStack(self, stack, debuggerId, threadName=""):
"""
Public method to process a client's stack information.
@@ -1675,8 +1680,10 @@
@type list of lists of (string, integer, string)
@param debuggerId ID of the debugger backend
@type str
+ @param threadName name of the thread signaling the event
+ @type str
"""
- self.clientStack.emit(stack, debuggerId)
+ self.clientStack.emit(stack, debuggerId, threadName)
def signalClientThreadList(self, currentId, threadList, debuggerId):
"""
@@ -1752,7 +1759,7 @@
self.clientDisassembly.emit(disassembly, debuggerId)
def signalClientException(self, exceptionType, exceptionMessage,
- stackTrace, debuggerId):
+ stackTrace, debuggerId, threadName=""):
"""
Public method to process the exception info from the client.
@@ -1766,13 +1773,15 @@
@type list
@param debuggerId ID of the debugger backend
@type str
+ @param threadName name of the thread signaling the event
+ @type str
"""
if self.running:
self.clientException.emit(exceptionType, exceptionMessage,
- stackTrace, debuggerId)
+ stackTrace, debuggerId, threadName)
def signalClientSyntaxError(self, message, filename, lineNo, characterNo,
- debuggerId):
+ debuggerId, threadName=""):
"""
Public method to process a syntax error info from the client.
@@ -1786,10 +1795,12 @@
@type int
@param debuggerId ID of the debugger backend
@type str
+ @param threadName name of the thread signaling the event
+ @type str
"""
if self.running:
self.clientSyntaxError.emit(message, filename, lineNo, characterNo,
- debuggerId)
+ debuggerId, threadName)
def signalClientSignal(self, message, filename, lineNo,
funcName, funcArgs, debuggerId):
