Changeset 80

Timestamp:

08/18/07 20:02:56 (1 year ago)

Author:

edsuom

Message:

Moving tracer to misc subpackage for general use beyond just WSGI debugging

Files:

• projects/Twisted-Goodies/trunk/twisted_goodies/misc/__init__.py (modified) (2 diffs)
• projects/Twisted-Goodies/trunk/twisted_goodies/simpleserver/http/wsgi.py (modified) (2 diffs)

projects/Twisted-Goodies/trunk/twisted_goodies/misc/__init__.py

@@ -23 +23 @@
-"""
-
-
+, sys
-from twisted.internet import interfaces, defer
-from twisted.spread import pb
@@ -196 +196 @@
-        # The perspective is ready to give to the client
-        return thisPerspective
+
+
+class TracerMixin(object):
+    """
+    Mix me in to trace problems
+    """
+    isTracing = False
+    traceFrame = None
+    traceStack = [
+        # Bottom frame on up, just like a stack. The following items just
+        # represent an example that was used in Trac/WSGI debugging.
+        ('cache.py', 'get_changes'),
+        ('changeset.py', 'get_changes'),
+        ('changeset.py', '_render_html')
+        ]
+    traceLevels = 5
+    
+    def settrace(self):
+        """
+        Call this method to start tracing. If you're using threads, you must
+        call it within the same thread whose execution you want to trace.
+        """
+        sys.settrace(self.trace)
+        self.isTracing = True
+
+    def trace(self, frame, event, arg):
+        """
+        This is the actual trace function.
+        """
+        def msg(level):
+            values = ["." * level]
+            values.extend([
+                getattr(frame.f_code, "co_%s" % x)
+                for x in ('filename', 'firstlineno', 'name')])
+            if values != getattr(self, '_prevMsgValues', None):
+                self._prevMsgValues = values
+                print "%s %s (%04d): %s" % tuple(values)
+
+        def isTraceEntry(k, thisFrame):
+            if thisFrame.f_code.co_name == self.traceStack[k][1]:
+                tail = "/%s" % self.traceStack[k][0]
+                if thisFrame.f_code.co_filename.endswith(tail):
+                    return True
+
+        def frameGenerator(N):
+            nextFrame = frame
+            for k in xrange(N):
+                yield k, nextFrame
+                nextFrame = nextFrame.f_back
+
+        if not self.isTracing:
+            return
+        if event == 'call':
+            level = 1
+            if self.traceFrame is None:
+                N = len(self.traceStack)
+                for k, thisFrame in frameGenerator(N):
+                    if not isTraceEntry(k, thisFrame):
+                        return
+                else:
+                    print "-" * 40
+                    self.traceFrame = frame
+            else:
+                for k, thisFrame in frameGenerator(self.traceLevels):
+                    level += 1
+                    if thisFrame in (None, self.traceFrame):
+                        break
+                else:
+                    return
+            msg(level)
+            return self.trace
+        elif event == 'return' and frame == self.traceFrame:
+            self.traceFrame = None
+            print "->", arg

projects/Twisted-Goodies/trunk/twisted_goodies/simpleserver/http/wsgi.py

@@ -24 +24 @@
-"""
-
-, sys
+
-import Queue
-from zope.interface import implements
@@ -61 +61 @@
-        newClass = super(WSGIMeta, mcls).__new__(mcls, name, bases, dictionary)
-        return newClass
-
-
-class TracerMixin(object):
-    """
-    Mix me in to trace problems
-    """
-    isTracing = False
-    traceFrame = None
-    traceStack = [
-        # Bottom frame on up, just like a stack...
-        ('cache.py', 'get_changes'),
-        ('changeset.py', 'get_changes'),
-        ('changeset.py', '_render_html')
-        ]
-    traceLevels = 5
-    
-    def settrace(self):
-        """
-        Call this method to start tracing. If you're using threads, you must
-        call it within the same thread whose execution you want to trace.
-        """
-        sys.settrace(self.trace)
-        self.isTracing = True
-
-    def trace(self, frame, event, arg):
-        """
-        This is the actual trace function.
-        """
-        def msg(level):
-            values = ["." * level]
-            values.extend([
-                getattr(frame.f_code, "co_%s" % x)
-                for x in ('filename', 'firstlineno', 'name')])
-            if values != getattr(self, '_prevMsgValues', None):
-                self._prevMsgValues = values
-                print "%s %s (%04d): %s" % tuple(values)
-
-        def isTraceEntry(k, thisFrame):
-            if thisFrame.f_code.co_name == self.traceStack[k][1]:
-                tail = "/%s" % self.traceStack[k][0]
-                if thisFrame.f_code.co_filename.endswith(tail):
-                    return True
-
-        def frameGenerator(N):
-            nextFrame = frame
-            for k in xrange(N):
-                yield k, nextFrame
-                nextFrame = nextFrame.f_back
-
-        if not self.isTracing:
-            return
-        if event == 'call':
-            level = 1
-            if self.traceFrame is None:
-                N = len(self.traceStack)
-                for k, thisFrame in frameGenerator(N):
-                    if not isTraceEntry(k, thisFrame):
-                        return
-                else:
-                    print "-" * 40
-                    self.traceFrame = frame
-            else:
-                for k, thisFrame in frameGenerator(self.traceLevels):
-                    level += 1
-                    if thisFrame in (None, self.traceFrame):
-                        break
-                else:
-                    return
-            msg(level)
-            return self.trace
-        elif event == 'return' and frame == self.traceFrame:
-            self.traceFrame = None
-            print "->", arg
-
-