Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-31 14:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 674767: Use double conversion macros for jsvals, squash windows double r=glandium

Browse Source
This commit is contained in:
Taras Glek 2011-08-01 13:17:47 -07:00
parent c868f40629
commit 885cb19429
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/components/telemetry/Telemetry.cpp
View File

@ -177,7 +177,7 @@ ReflectHistogramSnapshot(JSContext *cx, JSObject *obj, Histogram *h)
if (!(JS_DefineProperty(cx, obj, "min", INT_TO_JSVAL(h->declared_min()), NULL, NULL, JSPROP_ENUMERATE)
&& JS_DefineProperty(cx, obj, "max", INT_TO_JSVAL(h->declared_max()), NULL, NULL, JSPROP_ENUMERATE)
&& JS_DefineProperty(cx, obj, "histogram_type", INT_TO_JSVAL(h->histogram_type()), NULL, NULL, JSPROP_ENUMERATE)
&& JS_DefineProperty(cx, obj, "sum", INT_TO_JSVAL(ss.sum()), NULL, NULL, JSPROP_ENUMERATE)
&& JS_DefineProperty(cx, obj, "sum", DOUBLE_TO_JSVAL(ss.sum()), NULL, NULL, JSPROP_ENUMERATE)
&& (rarray = JS_NewArrayObject(cx, count, NULL))
&& JS_DefineProperty(cx, obj, "ranges", OBJECT_TO_JSVAL(rarray), NULL, NULL, JSPROP_ENUMERATE)
&& FillRanges(cx, rarray, h)

2
toolkit/components/telemetry/Telemetry.h
View File

@ -72,7 +72,7 @@ public:
}
~AutoTimer() {
Accumulate(id, (TimeStamp::Now() - start).ToMilliseconds());
Accumulate(id, static_cast<PRUint32>((TimeStamp::Now() - start).ToMilliseconds()));
}
private:

3
toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
View File

@ -4,6 +4,7 @@
const Cc = Components.classes;
const Ci = Components.interfaces;
const Cu = Components.utils;
const INT_MAX = 0x7FFFFFFF;
const Telemetry = Cc["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry);
Cu.import("resource://gre/modules/Services.jsm");
@ -106,7 +107,7 @@ function run_test()
{
let kinds = [Telemetry.HISTOGRAM_EXPONENTIAL, Telemetry.HISTOGRAM_LINEAR]
for each (let histogram_type in kinds) {
let [min, max, bucket_count] = [1, 10000, 10]
let [min, max, bucket_count] = [1, INT_MAX - 1, 10]
test_histogram(histogram_type, "test::"+histogram_type, min, max, bucket_count);
const nh = Telemetry.newHistogram;