Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2024-06-25 20:29:33 +00:00
Code Issues Projects Releases Wiki Activity

#334: remove Telemetry from JS-DOM-XPConnect runtime

Browse Source
This commit is contained in:
Cameron Kaiser 2018-09-23 19:12:58 -07:00
parent 8f342c3271
commit b95f6e9680
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/base/nsJSEnvironment.cpp
View File

@ -1684,6 +1684,7 @@ nsJSContext::EndCycleCollectionCallback(CycleCollectorResults &aResults)
endCCTime = PR_Now(); endCCTime = PR_Now();
} }
#if(0)
// Log information about the CC via telemetry, JSON and the console. // Log information about the CC via telemetry, JSON and the console.
Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR_FINISH_IGC, gCCStats.mAnyLockedOut); Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR_FINISH_IGC, gCCStats.mAnyLockedOut);
Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR_SYNC_SKIPPABLE, gCCStats.mRanSyncForgetSkippable); Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR_SYNC_SKIPPABLE, gCCStats.mRanSyncForgetSkippable);
@ -1695,10 +1696,11 @@ nsJSContext::EndCycleCollectionCallback(CycleCollectorResults &aResults)
uint32_t timeBetween = TimeBetween(sLastCCEndTime, gCCStats.mBeginTime) / 1000; uint32_t timeBetween = TimeBetween(sLastCCEndTime, gCCStats.mBeginTime) / 1000;
Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR_TIME_BETWEEN, timeBetween); Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR_TIME_BETWEEN, timeBetween);
} }
#endif
sLastCCEndTime = endCCTimeStamp; sLastCCEndTime = endCCTimeStamp;
Telemetry::Accumulate(Telemetry::FORGET_SKIPPABLE_MAX, // Telemetry::Accumulate(Telemetry::FORGET_SKIPPABLE_MAX,
sMaxForgetSkippableTime / PR_USEC_PER_MSEC); // sMaxForgetSkippableTime / PR_USEC_PER_MSEC);
PRTime delta = GetCollectionTimeDelta(); PRTime delta = GetCollectionTimeDelta();

10
js/xpconnect/src/XPCJSRuntime.cpp
View File

@ -144,10 +144,10 @@ class AsyncFreeSnowWhite : public nsRunnable
public: public:
NS_IMETHOD Run() NS_IMETHOD Run()
{ {
TimeStamp start = TimeStamp::Now(); //TimeStamp start = TimeStamp::Now();
bool hadSnowWhiteObjects = nsCycleCollector_doDeferredDeletion(); bool hadSnowWhiteObjects = nsCycleCollector_doDeferredDeletion();
Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR_ASYNC_SNOW_WHITE_FREEING, //Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR_ASYNC_SNOW_WHITE_FREEING,
uint32_t((TimeStamp::Now() - start).ToMilliseconds())); // uint32_t((TimeStamp::Now() - start).ToMilliseconds()));
if (hadSnowWhiteObjects && !mContinuation) { if (hadSnowWhiteObjects && !mContinuation) {
mContinuation = true; mContinuation = true;
if (NS_FAILED(NS_DispatchToCurrentThread(this))) { if (NS_FAILED(NS_DispatchToCurrentThread(this))) {
@ -3096,6 +3096,7 @@ JSSizeOfTab(JSObject* objArg, size_t* jsObjectsSize, size_t* jsStringsSize,
static void static void
AccumulateTelemetryCallback(int id, uint32_t sample, const char* key) AccumulateTelemetryCallback(int id, uint32_t sample, const char* key)
{ {
#if(0)
switch (id) { switch (id) {
case JS_TELEMETRY_GC_REASON: case JS_TELEMETRY_GC_REASON:
Telemetry::Accumulate(Telemetry::GC_REASON_2, sample); Telemetry::Accumulate(Telemetry::GC_REASON_2, sample);
@ -3172,6 +3173,7 @@ AccumulateTelemetryCallback(int id, uint32_t sample, const char* key)
default: default:
MOZ_ASSERT_UNREACHABLE("Unexpected JS_TELEMETRY id"); MOZ_ASSERT_UNREACHABLE("Unexpected JS_TELEMETRY id");
} }
#endif
} }
static void static void
@ -3491,7 +3493,7 @@ XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect)
if (PseudoStack* stack = mozilla_get_pseudo_stack()) if (PseudoStack* stack = mozilla_get_pseudo_stack())
stack->sampleRuntime(runtime); stack->sampleRuntime(runtime);
#endif #endif
JS_SetAccumulateTelemetryCallback(runtime, AccumulateTelemetryCallback); //JS_SetAccumulateTelemetryCallback(runtime, AccumulateTelemetryCallback);
js::SetScriptEnvironmentPreparer(runtime, &mEnvironmentPreparer); js::SetScriptEnvironmentPreparer(runtime, &mEnvironmentPreparer);
js::SetActivityCallback(runtime, ActivityCallback, this); js::SetActivityCallback(runtime, ActivityCallback, this);
JS_SetInterruptCallback(runtime, InterruptCallback); JS_SetInterruptCallback(runtime, InterruptCallback);