Improve tracing + include setTimeout and setInterval in dynamic scrip…

…t list
firebug · Mar 11, 2014 · f2f4cdb · f2f4cdb
1 parent 7e90952
commit f2f4cdb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/extension/content/firebug/debugger/breakpoints/breakpointTool.js b/extension/content/firebug/debugger/breakpoints/breakpointTool.js
@@ -5,10 +5,11 @@ define([
     "firebug/lib/trace",
     "firebug/lib/object",
     "firebug/chrome/tool",
+    "firebug/debugger/debuggerLib",
     "firebug/debugger/breakpoints/breakpointStore",
     "firebug/remoting/debuggerClient",
 ],
-function (Firebug, FBTrace, Obj, Tool, BreakpointStore, DebuggerClient) {
+function (Firebug, FBTrace, Obj, Tool, DebuggerLib, BreakpointStore, DebuggerClient) {
 
 // ********************************************************************************************* //
 // Constants
@@ -256,8 +257,18 @@ BreakpointTool.prototype = Obj.extend(new Tool(),
             return;
         }
 
-        Trace.sysout("breakpointTool.setBreakpoint; " + url + " (" + lineNumber + ") " +
-            "thread state: " + thread.state);
+        if (Trace.active)
+        {
+            Trace.sysout("breakpointTool.setBreakpoint; " + url + " (" + lineNumber + ") " +
+                "thread client state: " + thread.state);
+
+            // xxxHonza: I have experienced a problem where the client side state
+            // was set to "paused", but the server side still failed to set a breakpoint
+            // due to debugger not being in pause state.
+            var threadActor = DebuggerLib.getThreadActor(this.context.browser);
+            Trace.sysout("breakpointTool.setBreakpoint; thread actor state: " +
+                threadActor.state);
+        }
 
         // Do not create two server side breakpoints at the same line.
         var bpClient = this.getBreakpointClient(url, lineNumber);

diff --git a/extension/content/firebug/debugger/script/sourceTool.js b/extension/content/firebug/debugger/script/sourceTool.js
@@ -53,8 +53,8 @@ var dynamicTypesMap = {
     "Function": CompilationUnit.EVAL,
     "eventHandler": CompilationUnit.BROWSER_GENERATED,
     "scriptElement": CompilationUnit.EVAL,
-    //"setTimeout": CompilationUnit.EVAL,
-    //"setInterval": CompilationUnit.EVAL
+    "setTimeout": CompilationUnit.EVAL,
+    "setInterval": CompilationUnit.EVAL
 };
 
 // ********************************************************************************************* //
@@ -488,8 +488,6 @@ var originalBuildStackFrame = StackFrame.buildStackFrame;
  */
 function buildStackFrame(frame, context)
 {
-    Trace.sysout("sourceTool.buildStackFrame;", frame);
-
     var stackFrame = originalBuildStackFrame(frame, context);
 
     var threadActor = DebuggerLib.getThreadActor(context.browser);
@@ -504,8 +502,6 @@ function buildStackFrame(frame, context)
     if (!sourceFile)
         return stackFrame;
 
-    Trace.sysout("sourceTool.buildStackFrame; SourceFile", sourceFile);
-
     if (sourceFile)
     {
         // Use proper source file that corresponds to the current frame.