mirror of
https://github.com/classilla/tenfourfox.git
synced 2024-10-25 06:28:30 +00:00
#334: get around a Telemetry stub crash by disabling MOAR TELEMETRY
This commit is contained in:
parent
8403e67e7b
commit
e3663e02b4
@ -3882,6 +3882,8 @@ SetHistogramRecordingEnabled(ID aID, bool aEnabled)
|
|||||||
void
|
void
|
||||||
Accumulate(ID aHistogram, uint32_t aSample)
|
Accumulate(ID aHistogram, uint32_t aSample)
|
||||||
{
|
{
|
||||||
|
return;
|
||||||
|
/*
|
||||||
if (!TelemetryImpl::CanRecordBase()) {
|
if (!TelemetryImpl::CanRecordBase()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -3890,11 +3892,14 @@ Accumulate(ID aHistogram, uint32_t aSample)
|
|||||||
if (NS_SUCCEEDED(rv)) {
|
if (NS_SUCCEEDED(rv)) {
|
||||||
HistogramAdd(*h, aSample, gHistograms[aHistogram].dataset);
|
HistogramAdd(*h, aSample, gHistograms[aHistogram].dataset);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Accumulate(ID aID, const nsCString& aKey, uint32_t aSample)
|
Accumulate(ID aID, const nsCString& aKey, uint32_t aSample)
|
||||||
{
|
{
|
||||||
|
return;
|
||||||
|
/*
|
||||||
if (!TelemetryImpl::CanRecordBase()) {
|
if (!TelemetryImpl::CanRecordBase()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -3902,11 +3907,14 @@ Accumulate(ID aID, const nsCString& aKey, uint32_t aSample)
|
|||||||
KeyedHistogram* keyed = TelemetryImpl::GetKeyedHistogramById(nsDependentCString(th.id()));
|
KeyedHistogram* keyed = TelemetryImpl::GetKeyedHistogramById(nsDependentCString(th.id()));
|
||||||
MOZ_ASSERT(keyed);
|
MOZ_ASSERT(keyed);
|
||||||
keyed->Add(aKey, aSample);
|
keyed->Add(aKey, aSample);
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Accumulate(const char* name, uint32_t sample)
|
Accumulate(const char* name, uint32_t sample)
|
||||||
{
|
{
|
||||||
|
return;
|
||||||
|
/*
|
||||||
if (!TelemetryImpl::CanRecordBase()) {
|
if (!TelemetryImpl::CanRecordBase()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -3921,11 +3929,14 @@ Accumulate(const char* name, uint32_t sample)
|
|||||||
if (NS_SUCCEEDED(rv)) {
|
if (NS_SUCCEEDED(rv)) {
|
||||||
HistogramAdd(*h, sample, gHistograms[id].dataset);
|
HistogramAdd(*h, sample, gHistograms[id].dataset);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Accumulate(const char *name, const nsCString& key, uint32_t sample)
|
Accumulate(const char *name, const nsCString& key, uint32_t sample)
|
||||||
{
|
{
|
||||||
|
return;
|
||||||
|
/*
|
||||||
if (!TelemetryImpl::CanRecordBase()) {
|
if (!TelemetryImpl::CanRecordBase()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -3934,25 +3945,29 @@ Accumulate(const char *name, const nsCString& key, uint32_t sample)
|
|||||||
if (NS_SUCCEEDED(rv)) {
|
if (NS_SUCCEEDED(rv)) {
|
||||||
Accumulate(id, key, sample);
|
Accumulate(id, key, sample);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
AccumulateTimeDelta(ID aHistogram, TimeStamp start, TimeStamp end)
|
AccumulateTimeDelta(ID aHistogram, TimeStamp start, TimeStamp end)
|
||||||
{
|
{
|
||||||
|
return;
|
||||||
|
/*
|
||||||
Accumulate(aHistogram,
|
Accumulate(aHistogram,
|
||||||
static_cast<uint32_t>((end - start).ToMilliseconds()));
|
static_cast<uint32_t>((end - start).ToMilliseconds()));
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
CanRecordBase()
|
CanRecordBase()
|
||||||
{
|
{
|
||||||
return TelemetryImpl::CanRecordBase();
|
return false; // TelemetryImpl::CanRecordBase();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
CanRecordExtended()
|
CanRecordExtended()
|
||||||
{
|
{
|
||||||
return TelemetryImpl::CanRecordExtended();
|
return false; // TelemetryImpl::CanRecordExtended();
|
||||||
}
|
}
|
||||||
|
|
||||||
base::Histogram*
|
base::Histogram*
|
||||||
@ -3975,14 +3990,18 @@ RecordSlowSQLStatement(const nsACString &statement,
|
|||||||
const nsACString &dbName,
|
const nsACString &dbName,
|
||||||
uint32_t delay)
|
uint32_t delay)
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
TelemetryImpl::RecordSlowStatement(statement, dbName, delay);
|
TelemetryImpl::RecordSlowStatement(statement, dbName, delay);
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
RecordWebrtcIceCandidates(const uint32_t iceCandidateBitmask,
|
RecordWebrtcIceCandidates(const uint32_t iceCandidateBitmask,
|
||||||
const bool success, const bool loop)
|
const bool success, const bool loop)
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
TelemetryImpl::RecordIceCandidates(iceCandidateBitmask, success, loop);
|
TelemetryImpl::RecordIceCandidates(iceCandidateBitmask, success, loop);
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
void Init()
|
void Init()
|
||||||
@ -4348,7 +4367,7 @@ NSMODULE_DEFN(nsTelemetryModule) = &kTelemetryModule;
|
|||||||
void
|
void
|
||||||
XRE_TelemetryAccumulate(int aID, uint32_t aSample)
|
XRE_TelemetryAccumulate(int aID, uint32_t aSample)
|
||||||
{
|
{
|
||||||
mozilla::Telemetry::Accumulate((mozilla::Telemetry::ID) aID, aSample);
|
// mozilla::Telemetry::Accumulate((mozilla::Telemetry::ID) aID, aSample);
|
||||||
}
|
}
|
||||||
|
|
||||||
KeyedHistogram::KeyedHistogram(const nsACString &name, const nsACString &expiration,
|
KeyedHistogram::KeyedHistogram(const nsACString &name, const nsACString &expiration,
|
||||||
|
Loading…
Reference in New Issue
Block a user