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 xpcom

Browse Source
This commit is contained in:
Cameron Kaiser 2017-09-01 22:34:31 -07:00
parent 19a2166287
commit 71b8c3d256
4 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xpcom/base/CycleCollectedJSRuntime.cpp
View File

@ -60,7 +60,6 @@
#include "mozilla/AutoRestore.h" #include "mozilla/AutoRestore.h"
#include "mozilla/MemoryReporting.h" #include "mozilla/MemoryReporting.h"
#include "mozilla/Snprintf.h" #include "mozilla/Snprintf.h"
#include "mozilla/Telemetry.h"
#include "mozilla/DebuggerOnGCRunnable.h" #include "mozilla/DebuggerOnGCRunnable.h"
#include "mozilla/dom/DOMJSClass.h" #include "mozilla/dom/DOMJSClass.h"
#include "mozilla/dom/Promise.h" #include "mozilla/dom/Promise.h"
@ -1241,7 +1240,6 @@ IncrementalFinalizeRunnable::Run()
} }
uint32_t duration = (uint32_t)((TimeStamp::Now() - start).ToMilliseconds()); uint32_t duration = (uint32_t)((TimeStamp::Now() - start).ToMilliseconds());
Telemetry::Accumulate(Telemetry::DEFERRED_FINALIZE_ASYNC, duration);
return NS_OK; return NS_OK;
} }

20
xpcom/base/nsCycleCollector.cpp
View File

@ -185,7 +185,6 @@
#include "mozilla/AutoGlobalTimelineMarker.h" #include "mozilla/AutoGlobalTimelineMarker.h"
#include "mozilla/Likely.h" #include "mozilla/Likely.h"
#include "mozilla/PoisonIOInterposer.h" #include "mozilla/PoisonIOInterposer.h"
#include "mozilla/Telemetry.h"
#include "mozilla/ThreadLocal.h" #include "mozilla/ThreadLocal.h"
using namespace mozilla; using namespace mozilla;
@ -528,15 +527,6 @@ public:
#define CC_GRAPH_ASSERT(b) #define CC_GRAPH_ASSERT(b)
#endif #endif
#define CC_TELEMETRY(_name, _value) \
PR_BEGIN_MACRO \
if (NS_IsMainThread()) { \
Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR##_name, _value); \
} else { \
Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR_WORKER##_name, _value); \
} \
PR_END_MACRO
enum NodeColor { black, white, grey }; enum NodeColor { black, white, grey };
// This structure should be kept as small as possible; we may expect // This structure should be kept as small as possible; we may expect
@ -2951,7 +2941,6 @@ nsCycleCollector::ScanWeakMaps()
if (failed) { if (failed) {
MOZ_ASSERT(false, "Ran out of memory in ScanWeakMaps"); MOZ_ASSERT(false, "Ran out of memory in ScanWeakMaps");
CC_TELEMETRY(_OOM, true);
} }
} }
@ -3094,7 +3083,6 @@ nsCycleCollector::ScanIncrementalRoots()
if (failed) { if (failed) {
NS_ASSERTION(false, "Ran out of memory in ScanIncrementalRoots"); NS_ASSERTION(false, "Ran out of memory in ScanIncrementalRoots");
CC_TELEMETRY(_OOM, true);
} }
} }
@ -3155,7 +3143,6 @@ nsCycleCollector::ScanBlackNodes()
if (failed) { if (failed) {
NS_ASSERTION(false, "Ran out of memory in ScanBlackNodes"); NS_ASSERTION(false, "Ran out of memory in ScanBlackNodes");
CC_TELEMETRY(_OOM, true);
} }
} }
@ -3480,7 +3467,6 @@ nsCycleCollector::FixGrayBits(bool aForceGC, TimeLog& aTimeLog)
bool needGC = !mJSRuntime->AreGCGrayBitsValid(); bool needGC = !mJSRuntime->AreGCGrayBitsValid();
// Only do a telemetry ping for non-shutdown CCs. // Only do a telemetry ping for non-shutdown CCs.
CC_TELEMETRY(_NEED_GC, needGC);
if (!needGC) { if (!needGC) {
return; return;
} }
@ -3532,12 +3518,6 @@ nsCycleCollector::CleanupAfterCollection()
printf(".\ncc: \n"); printf(".\ncc: \n");
#endif #endif
CC_TELEMETRY( , interval);
CC_TELEMETRY(_VISITED_REF_COUNTED, mResults.mVisitedRefCounted);
CC_TELEMETRY(_VISITED_GCED, mResults.mVisitedGCed);
CC_TELEMETRY(_COLLECTED, mWhiteNodeCount);
timeLog.Checkpoint("CleanupAfterCollection::telemetry");
if (mJSRuntime) { if (mJSRuntime) {
mJSRuntime->FinalizeDeferredThings(mResults.mAnyManual mJSRuntime->FinalizeDeferredThings(mResults.mAnyManual
? CycleCollectedJSRuntime::FinalizeNow ? CycleCollectedJSRuntime::FinalizeNow

2
xpcom/base/nsMemoryReporterManager.cpp
View File

@ -26,7 +26,6 @@
#include "mozilla/Preferences.h" #include "mozilla/Preferences.h"
#include "mozilla/Scoped.h" #include "mozilla/Scoped.h"
#include "mozilla/Services.h" #include "mozilla/Services.h"
#include "mozilla/Telemetry.h"
#include "mozilla/dom/PMemoryReportRequestParent.h" // for dom::MemoryReport #include "mozilla/dom/PMemoryReportRequestParent.h" // for dom::MemoryReport
#include "mozilla/dom/ContentParent.h" #include "mozilla/dom/ContentParent.h"
#include "mozilla/ipc/FileDescriptorUtils.h" #include "mozilla/ipc/FileDescriptorUtils.h"
@ -439,7 +438,6 @@ ResidentDistinguishedAmountHelper(int64_t* aN, bool aDoPurge)
#ifdef HAVE_JEMALLOC_STATS #ifdef HAVE_JEMALLOC_STATS
#ifndef MOZ_JEMALLOC4 #ifndef MOZ_JEMALLOC4
if (aDoPurge) { if (aDoPurge) {
Telemetry::AutoTimer<Telemetry::MEMORY_FREE_PURGED_PAGES_MS> timer;
jemalloc_purge_freed_pages(); jemalloc_purge_freed_pages();
} }
#endif #endif

4
xpcom/threads/BackgroundHangMonitor.cpp
View File

@ -214,6 +214,9 @@ BackgroundHangManager::BackgroundHangManager()
, mLock("BackgroundHangManager") , mLock("BackgroundHangManager")
, mIntervalNow(0) , mIntervalNow(0)
{ {
#if(0)
// The BackgroundHangMonitor is irrelevant in TenFourFox since we don't
// have telemetry or anything useful to collect from it.
// Lock so we don't race against the new monitor thread // Lock so we don't race against the new monitor thread
MonitorAutoLock autoLock(mLock); MonitorAutoLock autoLock(mLock);
mHangMonitorThread = PR_CreateThread( mHangMonitorThread = PR_CreateThread(
@ -221,6 +224,7 @@ BackgroundHangManager::BackgroundHangManager()
PR_PRIORITY_LOW, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); PR_PRIORITY_LOW, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
MOZ_ASSERT(mHangMonitorThread, "Failed to create monitor thread"); MOZ_ASSERT(mHangMonitorThread, "Failed to create monitor thread");
#endif
} }
BackgroundHangManager::~BackgroundHangManager() BackgroundHangManager::~BackgroundHangManager()