X-Git-Url: https://git.sthu.org/?p=pygdb.git;a=blobdiff_plain;f=DbgTerminal.py;h=9d08866820acc3083048b589c78f4b54eacc30f2;hp=89659d035628a9fe7a450bffc9e603ff905eceb7;hb=HEAD;hpb=1094f7f4581a9c0074294004bbd8c934593a54d5 diff --git a/DbgTerminal.py b/DbgTerminal.py index 89659d0..9d08866 100644 --- a/DbgTerminal.py +++ b/DbgTerminal.py @@ -4,10 +4,14 @@ __author__ = "shuber" +import gobject import gtk +import os import pango import pty +import re import string +import sys import time import threading import vte @@ -18,15 +22,19 @@ import ClientIOTerminal class DbgTerminal (vte.Terminal): - isactive = True - lastrow = 0 - history = [] - - def __init__(self, clientCmd): vte.Terminal.__init__(self) + #Set members + self.childpid = None + self.history = [""] + self.isactive = True + self.lastc, self.lastr = 0,0 + self.gotActiveCallback = [] + self.gotInactiveCallback = [] + self.activityChanged = None + #Start debugger self.clientCmd = clientCmd #Open pseudo-terminal where to-be-debugged process reads/writes to @@ -34,7 +42,8 @@ class DbgTerminal (vte.Terminal): #Set up terminal window and initialize debugger self.connect("cursor-moved", self.contents_changed) - self.connect("child-exited", lambda *w: gtk.main_quit()) + self.connect("child-exited", quitHandler) + gobject.timeout_add(50, self.checkActivityChanged) #font description fontdesc = pango.FontDescription("monospace 9") @@ -42,57 +51,133 @@ class DbgTerminal (vte.Terminal): def initialize(self): - self.fork_command( self.getCommand(), self.getArgv()) + self.childpid = self.fork_command( self.getCommand(), self.getArgv()) + self.waitForPrompt(0) self.setPty(self.client_ptyslave) - self.waitForActivation() + + def stopDbg(self): + + if self.childpid != None: + #9=KILL, 15=TERM + os.kill(self.childpid, 15); + self.childpid = None + + def getClientExecuteable(self): + return string.split(self.clientCmd)[0] + + + def toAbsPath(self, path): + """convert path to an absolute path relative to the client + executable we debug.""" + + #Current working dir + pwd = os.getcwd() + "/" + + #executeable path + client = self.getClientExecuteable() + client = relToAbsPath(pwd, client) + + return relToAbsPath(client, path) + + + def checkActivityChanged(self): + + try: + + #There was activity + if self.activityChanged != None: + + res = self.activityChanged + self.activityChanged = None + + status, param = res + if self.isActive(): + print "got active: ", res + for cb in self.gotActiveCallback: + cb(status, param) + else: + print "got inactive: ", res + for cb in self.gotInactiveCallback: + cb(status, param) + except Exception, e: + import traceback + traceback.print_exc() + print e + + return True + def contents_changed(self, term): + assert( self.getHistoryLen()>0 ) + c,r = term.get_cursor_position() + text = self.get_text_range(self.lastr,0,r,c,lambda *w:True) + self.lastc, self.lastr = c,r + + #Remove annoying \n at the end + assert(text[-1] == "\n") + text = text[:-1] + + #Get the lines and remove empty lines + lines = string.split(text, "\n") + + #Remove the incomplete line + len = max(0,self.getHistoryLen()) + self.history[-1] = lines[0] + self.history += lines[1:] - if self.lastrow <= r: - text = self.get_text_range(self.lastrow,0,r,-1,lambda *w:True) - #Remove the incomplete line - if self.getHistoryLen()>0 and (len(self.history[-1])==0 or self.history[-1]!='\n') : - del self.history[-1] + #Check if activity status has been changed + for i in range(len, self.getHistoryLen()): + line = self.history[i] + + res = self.testForInactivity(i) + if res != None: + while self.activityChanged != None: + print "wait for pending activity" + gtk.main_iteration() - #Get the lines and remove empty lines - lines = string.split(text, "\n") + self.setActive(False) + self.activityChanged = res + + res = self.testForActivity(i) + if res != None: + while self.activityChanged != None: + print "wait for pending activity" + gtk.main_iteration() + + self.setActive(True) + self.activityChanged = res - #Remove last empty line... - if lines[-1] == "": - del lines[-1] - #Add lines to history - self.history += [l+"\n" for l in lines[:-1]] - self.history += [lines[-1]] - self.lastrow = r def waitForNewline(self): - r = self.lastrow - while not self.lastrow > r: + l = self.getHistoryLen() + while not self.getHistoryLen() > l: gtk.main_iteration() def getHistoryLen(self): return len(self.history) - def waitForRx(self, rx, start=None): - - if start == None: - start = self.getHistoryLen() - if start < 0: - start = 0 + def waitForRx(self, pat, start): + rx = re.compile(pat) + curr = start while True: - for no in range(start, self.getHistoryLen()): + assert( curr>=start ) + for no in range(curr, self.getHistoryLen()): line = self.history[no] if rx.search(line): return no, line - start = self.getHistoryLen() - gtk.main_iteration() + #Do not forget the last line + curr = max(start,self.getHistoryLen()-1) + lr, lc = self.lastr, self.lastc + + while (self.lastr, self.lastc) == (lr,lc): + gtk.main_iteration() def getCommand(self): @@ -116,6 +201,9 @@ class DbgTerminal (vte.Terminal): def setStepin(self): raise NotImplementedError() + def setStepout(self): + raise NotImplementedError() + def setQuit(self): raise NotImplementedError() @@ -128,7 +216,19 @@ class DbgTerminal (vte.Terminal): def getExpression(self, expr): raise NotImplementedError() - def waitForActivation(self, his): + def listCodeSnippet(self): + raise NotImplementedError() + + def getBacktrace(self): + raise NotImplementedError() + + def waitForPrompt(self, his): + raise NotImplementedError() + + def testForActivity(self, his): + raise NotImplementedError() + + def testForInactivity(self, his): raise NotImplementedError() def setActive(self, isactive): @@ -138,8 +238,32 @@ class DbgTerminal (vte.Terminal): return self.isactive - +def quitHandler(*w): + try: + gtk.main_quit() + except: + pass + + +def relToAbsPath(absfile, relfile): + """When an absfile is given and a relfile is given by + relative paths relative to absfile, determine the abs + path of relfile""" + + #Get directories except for "." parts + relsplit = filter(lambda x: x!=".", string.split(relfile, os.sep)) + #Get the directories of absfile withouth the trailing filename + abssplit = string.split(absfile, os.sep)[:-1] + + #Determine number of ".." and remove them + up=0 + while relsplit[0] == "..": + up += 1 + del relsplit[0] + del abssplit[-1] + + return string.join(abssplit + relsplit, os.sep) class DbgWindow (gtk.Window): @@ -154,7 +278,7 @@ class DbgWindow (gtk.Window): #Set up GTK stuff gtk.Window.__init__(self) - self.connect("destroy", lambda *w: gtk.main_quit()) + self.connect("destroy", quitHandler) #Set title and add terminal self.set_title("Debugger I/O")