Remove unused import from Stats.java.
Fix incorrectly-computed stats RPC event names.
Patch by: jaimeyap, jat
Review by: bobv
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@2123 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/Stats.java b/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/Stats.java
index 09fcd12..baf6b7e 100644
--- a/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/Stats.java
+++ b/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/Stats.java
@@ -16,7 +16,6 @@
package com.google.gwt.lang;
import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.dev.jjs.JavaToJavaScriptCompiler;
/**
* Provides access to the statistics collector function as an intrinsic for use
@@ -44,4 +43,4 @@
JavaScriptObject data) /*-{
return $stats(moduleName, system, event, data);
}-*/;
-}
\ No newline at end of file
+}
diff --git a/user/src/com/google/gwt/user/client/rpc/impl/RequestCallbackAdapter.java b/user/src/com/google/gwt/user/client/rpc/impl/RequestCallbackAdapter.java
index 9e29661..fe77f9c 100644
--- a/user/src/com/google/gwt/user/client/rpc/impl/RequestCallbackAdapter.java
+++ b/user/src/com/google/gwt/user/client/rpc/impl/RequestCallbackAdapter.java
@@ -139,7 +139,7 @@
* Used for stats recording.
*/
private final String methodName;
-
+
/**
* Used for stats recording.
*/
@@ -183,9 +183,9 @@
String encodedResponse = response.getText();
boolean toss = RemoteServiceProxy.isStatsAvailable()
- && RemoteServiceProxy.stats(methodName + ":responseReceived",
- RemoteServiceProxy.bytesStat(methodName, requestId,
- encodedResponse.length()));
+ && RemoteServiceProxy.stats(methodName + ":" + requestId
+ + ":responseReceived", RemoteServiceProxy.bytesStat(methodName,
+ requestId, encodedResponse.length()));
if (RemoteServiceProxy.isReturnValue(encodedResponse)) {
result = (T) responseReader.read(streamFactory.createStreamReader(encodedResponse));
@@ -200,8 +200,9 @@
caught = e;
} finally {
boolean toss = RemoteServiceProxy.isStatsAvailable()
- && RemoteServiceProxy.stats(methodName + ":responseDeserialized",
- RemoteServiceProxy.timeStat(methodName, requestId));
+ && RemoteServiceProxy.stats(methodName + ":" + requestId
+ + ":responseDeserialized", RemoteServiceProxy.timeStat(
+ methodName, requestId));
}
try {
@@ -212,8 +213,9 @@
}
} finally {
boolean toss = RemoteServiceProxy.isStatsAvailable()
- && RemoteServiceProxy.stats(methodName + ":responseCallbackDone",
- RemoteServiceProxy.timeStat(methodName, requestId));
+ && RemoteServiceProxy.stats(methodName + ":" + requestId
+ + ":responseCallbackDone", RemoteServiceProxy.timeStat(
+ methodName, requestId));
}
}
-}
\ No newline at end of file
+}
diff --git a/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java b/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java
index 4a78505..3372e3d 100644
--- a/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java
+++ b/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java
@@ -248,8 +248,8 @@
String statsMethodExpr = getProxySimpleName() + "." + syncMethod.getName()
+ ":\" + getRequestId() + \"";
w.println("boolean toss = isStatsAvailable() && stats(\"" + statsMethodExpr
- + ":requestStart\", timeStat(\"" + statsMethodExpr
- + "\", getRequestId()));");
+ + ":requestStart\", timeStat(\"" + getProxySimpleName() + "."
+ + syncMethod.getName() + "\", getRequestId()));");
w.print(ClientSerializationStreamWriter.class.getSimpleName());
w.print(" ");
@@ -313,13 +313,15 @@
w.println("boolean toss2 = isStatsAvailable() && stats(\""
+ statsMethodExpr + ":requestSerialized\", timeStat(\""
- + statsMethodExpr + "\", getRequestId()));");
+ + getProxySimpleName() + "." + syncMethod.getName()
+ + "\", getRequestId()));");
// Call the doInvoke method to actually send the request.
w.print("doInvoke(");
JType returnType = syncMethod.getReturnType();
w.print("ResponseReader." + getResponseReaderFor(returnType).name());
- w.print(", \"" + statsMethodExpr + "\", getRequestId(), payload, ");
+ w.print(", \"" + getProxySimpleName() + "." + syncMethod.getName()
+ + "\", getRequestId(), payload, ");
w.println(callbackName + ");");
w.outdent();
w.println("}");
