eric: comparison eric6/DebugClients/Python/DebugClientBase.py

-:0d58e708f57b
+:1413bfe73d41
 self.dircache = []
 self.passive = False        # used to indicate the passive mode
 self.running = None
 self.test = None
 self.debugging = False
+self.multiprocessSupport = False
 self.fork_auto = False
 self.fork_child = False
 self.readstream = None
 self.set_quit()
 except Exception:
 pass
 self.debugging = False
+self.multiprocessSupport = False
 # make sure we close down our end of the socket
 # might be overkill as normally stdin, stdout and stderr
 # SHOULD be closed on exit, but it does not hurt to do it here
 self.readstream.close(True)
 else:
 os.chdir(params["workdir"])
 self.running = sys.argv[0]
 self.debugging = True
+self.multiprocessSupport = params["multiprocess"]
 self.fork_auto = params["autofork"]
 self.fork_child = params["forkChild"]
 self.threads.clear()
 self.writeReady(self.writestream)
 if self.errorstream in wrdy:
 self.writeReady(self.errorstream)
-def connectDebugger(self, port, remoteAddress=None, redirect=True):
+def connectDebugger(self, port, remoteAddress=None, redirect=True,
+name=""):
 """
 Public method to establish a session with the debugger.
 It opens a network connection to the debugger, connects it to stdin,
 stdout and stderr and saves these file objects in case the application
 being debugged redirects them itself.
-@param port the port number to connect to (int)
+@param port the port number to connect to
+@type int
 @param remoteAddress the network address of the debug server host
-(string)
+@type str
 @param redirect flag indicating redirection of stdin, stdout and
-stderr (boolean)
+stderr
+@type bool
+@param name name to be attached to the debugger ID
+@type str
 """
 if remoteAddress is None:
 remoteAddress = "127.0.0.1"
 elif "@@i" in remoteAddress:
 remoteAddress = remoteAddress.split("@@i")[0]
 sock = socket.create_connection((remoteAddress, port))
-self.__debuggerId = "{0}-{1}".format(socket.gethostname(), os.getpid())
+if not name:
+name = "main"
+self.__debuggerId = "{0}-{1}-{2}".format(
+socket.gethostname(), os.getpid(), name
+)
 name = sys.stdin.name
 # Special case if in a multiprocessing.Process
 if isinstance(name, int):
 name = '<stdin>'
 state += 1
 try:
 comp = completer(text, state)
 except Exception:
 comp = None
 def startDebugger(self, filename=None, host=None, port=None,
 enableTrace=True, exceptions=True, tracePython=False,
-redirect=True, passive=True):
+redirect=True, passive=True, multiprocessSupport=False):
 """
 Public method used to start the remote debugger.
 @param filename the program to be debugged
 @type str
 @param redirect flag indicating redirection of stdin, stdout and
 stderr
 @type bool
 @param passive flag indicating a passive debugging session
 @type bool
+@param multiprocessSupport flag indicating to enable multiprocess
+debugging support
+@type bool
 """
 if host is None:
 host = os.getenv('ERICHOST', 'localhost')
 if port is None:
 port = os.getenv('ERICPORT', 42424)
 remoteAddress = self.__resolveHost(host)
-self.connectDebugger(port, remoteAddress, redirect)
+if filename is not None:
+name = os.path.basename(filename)
+else:
+name = ""
+self.connectDebugger(port, remoteAddress, redirect, name=name)
 if filename is not None:
 self.running = os.path.abspath(filename)
 else:
 try:
 self.running = os.path.abspath(sys.argv[0])
 if enableTrace:
 self.mainThread.set_trace()
 def startProgInDebugger(self, progargs, wd='', host=None,
 port=None, exceptions=True, tracePython=False,
-redirect=True, passive=True):
+redirect=True, passive=True,
+multiprocessSupport=False):
 """
 Public method used to start the remote debugger.
 @param progargs commandline for the program to be debugged
 (list of strings)
 (boolean)
 @param redirect flag indicating redirection of stdin, stdout and
 stderr (boolean)
 @param passive flag indicating a passive debugging session
 @type bool
+@param multiprocessSupport flag indicating to enable multiprocess
+debugging support
+@type bool
 """
 if host is None:
 host = os.getenv('ERICHOST', 'localhost')
 if port is None:
 port = os.getenv('ERICPORT', 42424)
 remoteAddress = self.__resolveHost(host)
-self.connectDebugger(port, remoteAddress, redirect)
+name = os.path.basename(progargs[0])
+self.connectDebugger(port, remoteAddress, redirect, name=name)
 self._fncache = {}
 self.dircache = []
 sys.argv = progargs[:]
 sys.argv[0] = os.path.abspath(sys.argv[0])
 else:
 os.chdir(wd)
 self.running = sys.argv[0]
 self.__setCoding(self.running)
 self.debugging = True
+self.multiprocessSupport = multiprocessSupport
 self.passive = passive
 if passive:
 self.sendPassiveStartup(self.running, exceptions)
 self.__interact()
 wd = ''
 tracePython = False
 exceptions = True
 redirect = True
 passive = True
+multiprocess = False
 while args[0]:
 if args[0] == '-h':
 host = args[1]
 del args[0]
 del args[0]
 self.fork_child = False
 del args[0]
 elif args[0] == '--no-passive':
 passive = False
 del args[0]
+elif args[0] == '--multiprocess':
+multiprocess = True
+del args[0]
 elif args[0] == '--':
 del args[0]
 break
 else:   # unknown option
 del args[0]
 self.__coding = self.defaultCoding
 self.startProgInDebugger(args, wd, host, port,
 exceptions=exceptions,
 tracePython=tracePython,
 redirect=redirect,
-passive=passive)
+passive=passive,
+multiprocessSupport=multiprocess)
 else:
 if sys.argv[1] == '--no-encoding':
 self.noencoding = True
 del sys.argv[1]

Mercurial Repositories > eric / file comparison

comparison: eric6/DebugClients/Python/DebugClientBase.py

eric6/DebugClients/Python/DebugClientBase.py