author | Phil Ringnalda <philringnalda@gmail.com> |
Tue, 09 Dec 2014 23:00:05 -0800 | |
changeset 218984 | 219d81afdd503110fd28def92d7a2076b715f78c |
parent 218983 | 712e8ba1ec6fd6d5c10b6c866d0fd325ab70a387 |
child 218985 | 5b01216f97f863236eccee5227abbc18319d4ab1 |
child 219029 | e0bcde09cbeb2cf2e8cc36d1087e9330944221b4 |
push id | 27950 |
push user | cbook@mozilla.com |
push date | Wed, 10 Dec 2014 10:58:50 +0000 |
treeherder | autoland@5b01216f97f8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1096666 |
milestone | 37.0a1 |
backs out | a7221c06e193aa90d8164851e29cc85e8f6f0d78 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
js/src/jscompartment.cpp | file | annotate | diff | comparison | revisions | |
js/src/jscompartment.h | file | annotate | diff | comparison | revisions |
--- a/js/src/jscompartment.cpp +++ b/js/src/jscompartment.cpp @@ -46,17 +46,16 @@ JSCompartment::JSCompartment(Zone *zone, isSelfHosting(false), marked(true), addonId(options.addonIdOrNull()), #ifdef DEBUG firedOnNewGlobalObject(false), #endif global_(nullptr), enterCompartmentDepth(0), - totalTime(0), data(nullptr), objectMetadataCallback(nullptr), lastAnimationTime(0), regExps(runtime_), globalWriteBarriered(false), neuteredTypedObjects(0), propertyTree(thisForCtor()), selfHostingScriptSource(nullptr),
--- a/js/src/jscompartment.h +++ b/js/src/jscompartment.h @@ -9,17 +9,16 @@ #include "mozilla/MemoryReporting.h" #include "builtin/RegExp.h" #include "gc/Zone.h" #include "vm/GlobalObject.h" #include "vm/PIC.h" #include "vm/SavedStacks.h" -#include "prmjtime.h" namespace js { namespace jit { class JitCompartment; } namespace gc { @@ -162,32 +161,20 @@ struct JSCompartment private: friend struct JSRuntime; friend struct JSContext; friend class js::ExclusiveContext; js::ReadBarrieredGlobalObject global_; unsigned enterCompartmentDepth; - int64_t startInterval; public: - int64_t totalTime; - void enter() { - if (addonId && !enterCompartmentDepth) { - startInterval = PRMJ_Now(); - } - enterCompartmentDepth++; - } - void leave() { - enterCompartmentDepth--; - if (addonId && !enterCompartmentDepth) { - totalTime += (PRMJ_Now() - startInterval); - } - } + void enter() { enterCompartmentDepth++; } + void leave() { enterCompartmentDepth--; } bool hasBeenEntered() { return !!enterCompartmentDepth; } JS::Zone *zone() { return zone_; } const JS::Zone *zone() const { return zone_; } JS::CompartmentOptions &options() { return options_; } const JS::CompartmentOptions &options() const { return options_; } JSRuntime *runtimeFromMainThread() {