diff options
| author | Pale Moon <git-repo@palemoon.org> | 2015-04-29 14:27:54 +0200 |
|---|---|---|
| committer | Pale Moon <git-repo@palemoon.org> | 2015-04-29 14:27:54 +0200 |
| commit | f74b1e6916b0b4ca216ed751cdadb6f59cba4a7c (patch) | |
| tree | a834ae886d5cef212c75576fb41e75609a3bc44b /b2g/app | |
| parent | f4e1a33943ace4f01834c49ef055afab0620eaa4 (diff) | |
| parent | 62379c84d7b7adeabacb3074480329a1778ac5ab (diff) | |
| download | palemoon-gre-f74b1e6916b0b4ca216ed751cdadb6f59cba4a7c.tar.gz | |
Merge branch 'master' into Harmony-work
Diffstat (limited to 'b2g/app')
| -rw-r--r-- | b2g/app/nsBrowserApp.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/b2g/app/nsBrowserApp.cpp b/b2g/app/nsBrowserApp.cpp index a9865d0a3..cfcff3b34 100644 --- a/b2g/app/nsBrowserApp.cpp +++ b/b2g/app/nsBrowserApp.cpp @@ -95,7 +95,6 @@ XRE_FreeAppDataType XRE_FreeAppData; #ifdef XRE_HAS_DLL_BLOCKLIST XRE_SetupDllBlocklistType XRE_SetupDllBlocklist; #endif -XRE_TelemetryAccumulateType XRE_TelemetryAccumulate; XRE_mainType XRE_main; static const nsDynamicFunctionLoad kXULFuncs[] = { @@ -231,30 +230,6 @@ int main(int argc, char* argv[]) XRE_SetupDllBlocklist(); #endif - if (gotCounters) { -#if defined(XP_WIN) - XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_READ_OPS, - int(ioCounters.ReadOperationCount)); - XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_READ_TRANSFER, - int(ioCounters.ReadTransferCount / 1024)); - IO_COUNTERS newIoCounters; - if (GetProcessIoCounters(GetCurrentProcess(), &newIoCounters)) { - XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_READ_OPS, - int(newIoCounters.ReadOperationCount - ioCounters.ReadOperationCount)); - XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_READ_TRANSFER, - int((newIoCounters.ReadTransferCount - ioCounters.ReadTransferCount) / 1024)); - } -#elif defined(XP_UNIX) - XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_HARD_FAULTS, - int(initialRUsage.ru_majflt)); - struct rusage newRUsage; - if (!getrusage(RUSAGE_SELF, &newRUsage)) { - XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_HARD_FAULTS, - int(newRUsage.ru_majflt - initialRUsage.ru_majflt)); - } -#endif - } - int result; { ScopedLogging log; |