[gwt-contrib] Records names of JSNI calls and callbacks in SpeedTracer events. (issue1356806)

[tobyr]

Reviewers: zundel, jbrosenberg,

Description:
Records names of JSNI calls and callbacks in SpeedTracer events.

Please review this at http://gwt-code-reviews.appspot.com/1356806/show

Affected files:
  M dev/core/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java
  M dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java
  M  
dev/core/src/com/google/gwt/dev/util/log/speedtracer/SpeedTracerLogger.java


Index: dev/core/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java
===================================================================
--- dev/core/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java	(revision  
9706)
+++ dev/core/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java	(working  
copy)
@@ -110,6 +110,9 @@
         "Invoke native method " + name, null);
     Event javaToJsCallEvent =
         SpeedTracerLogger.start(DevModeEventType.JAVA_TO_JS_CALL);
+    if (SpeedTracerLogger.jsniCallLoggingEnabled()) {
+      javaToJsCallEvent.addData("name", name);
+    }

     CompilingClassLoader isolatedClassLoader = getIsolatedClassLoader();
     JsValueOOPHM jsthis = new JsValueOOPHM();
Index: dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java
===================================================================
--- dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java	 
(revision 9706)
+++ dev/core/src/com/google/gwt/dev/shell/OophmSessionHandler.java	(working  
copy)
@@ -115,6 +115,16 @@
     JsValueOOPHM jsThis = new JsValueOOPHM();
     channel.convertToJsValue(cl, localObjects, thisVal, jsThis);

+    if (SpeedTracerLogger.jsniCallLoggingEnabled()) {
+      DispatchClassInfo clsInfo =  
cl.getClassInfoByDispId(methodDispatchId);
+      if (clsInfo != null) {
+        Member member = clsInfo.getMember(methodDispatchId);
+        if (member != null) {
+          jsToJavaCallEvent.addData("name", member.toString());
+        }
+      }
+    }
+
     TreeLogger branch = TreeLogger.NULL;
     if (logger.isLoggable(TreeLogger.SPAM)) {
       StringBuffer logMsg = new StringBuffer();
Index:  
dev/core/src/com/google/gwt/dev/util/log/speedtracer/SpeedTracerLogger.java
===================================================================
---  
dev/core/src/com/google/gwt/dev/util/log/speedtracer/SpeedTracerLogger.java	 
(revision 9706)
+++  
dev/core/src/com/google/gwt/dev/util/log/speedtracer/SpeedTracerLogger.java	 
(working copy)
@@ -74,6 +74,11 @@
   // Turn on logging estimating overhead used for speedtracer logging.
   private static final boolean logOverheadTime =
     getBooleanProperty("gwt.speedtracer.logOverheadTime");
+
+  // Disable logging of JSNI calls and callbacks to reduce memory usage  
where
+  // the heap is already tight.
+  private static final boolean jsniCallLoggingEnabled =
+      !getBooleanProperty("gwt.speedtracer.disableJsniLogging");

   /**
    * Represents a node in a tree of SpeedTracer events.
@@ -430,6 +435,13 @@
   }

   /**
+   * Returns true if JSNI calls and callbacks are being logged.
+   */
+  public static boolean jsniCallLoggingEnabled() {
+    return jsniCallLoggingEnabled;
+  }
+
+  /**
    * Adds a LOG_MESSAGE SpeedTracer event to the log. This represents a  
single
    * point in time and has a special representation in the SpeedTracer UI.
    */


--
http://groups.google.com/group/Google-Web-Toolkit-Contributors