corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 27f8690ebc50 (bug 1803751) for causing xpcshell failures on test_feature_mainthreadio.js. CLOSED TREE

Browse Source
This commit is contained in:
Iulian Moraru
2022-12-12 17:43:23 +02:00
parent 9941db39af
commit 94985653c4
13 changed files with 19 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dom/animation/AnimationEventDispatcher.h
View File

@@ -58,8 +58,7 @@ struct CSSAnimationMarker {
static MarkerSchema MarkerTypeDisplay() {
using MS = MarkerSchema;
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
schema.AddKeyFormatSearchable("Name", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyFormat("Name", MS::Format::String);
schema.AddKeyLabelFormat("properties", "Animated Properties",
MS::Format::String);
schema.AddKeyLabelFormat("oncompositor", "Can Run on Compositor",

8
dom/events/EventDispatcher.cpp
View File

@@ -1089,14 +1089,10 @@ nsresult EventDispatcher::Dispatch(nsISupports* aTarget,
schema.SetTooltipLabel("{marker.data.eventType} - DOMEvent");
schema.SetTableLabel(
"{marker.data.eventType} - {marker.data.target}");
schema.AddKeyLabelFormatSearchable("target", "Event Target",
MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormat("target", "Event Target",
MS::Format::String);
schema.AddKeyLabelFormat("latency", "Latency",
MS::Format::Duration);
schema.AddKeyLabelFormatSearchable("eventType", "Event Type",
MS::Format::String,
MS::Searchable::Searchable);
return schema;
}
};

4
dom/media/AsyncLogger.h
View File

@@ -217,9 +217,7 @@ class AsyncLogger {
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
schema.SetChartLabel("{marker.data.name}");
schema.SetTableLabel("{marker.name} - {marker.data.name}");
schema.AddKeyLabelFormatSearchable("name", "Comment",
MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormat("name", "Comment", MS::Format::String);
return schema;
}
};

3
dom/performance/Performance.cpp
View File

@@ -335,8 +335,7 @@ struct UserTimingMarker {
schema.SetAllLabels("{marker.data.name}");
schema.AddStaticLabelValue("Marker", "UserTiming");
schema.AddKeyLabelFormat("entryType", "Entry Type", MS::Format::String);
schema.AddKeyLabelFormatSearchable("name", "Name", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormat("name", "Name", MS::Format::String);
schema.AddKeyLabelFormat("startMark", "Start Mark", MS::Format::String);
schema.AddKeyLabelFormat("endMark", "End Mark", MS::Format::String);
schema.AddStaticLabelValue("Description",

3
modules/libpref/Preferences.cpp
View File

@@ -4618,8 +4618,7 @@ struct Internals {
static MarkerSchema MarkerTypeDisplay() {
using MS = MarkerSchema;
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
schema.AddKeyLabelFormatSearchable("prefName", "Name", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormat("prefName", "Name", MS::Format::String);
schema.AddKeyLabelFormat("prefKind", "Kind", MS::Format::String);
schema.AddKeyLabelFormat("prefType", "Type", MS::Format::String);
schema.AddKeyLabelFormat("prefValue", "Value", MS::Format::String);

2
mozglue/baseprofiler/core/platform.cpp
View File

@@ -1841,7 +1841,7 @@ static void StreamMetaJSCustomObject(PSLockRef aLock,
bool aIsShuttingDown) {
MOZ_RELEASE_ASSERT(CorePS::Exists() && ActivePS::Exists(aLock));
aWriter.IntProperty("version", 26);
aWriter.IntProperty("version", 25);
// The "startTime" field holds the number of milliseconds since midnight
// January 1, 1970 GMT. This grotty code computes (Now - (Now -

6
mozglue/baseprofiler/public/BaseProfilerMarkers.h
View File

@@ -148,8 +148,7 @@ struct TextMarker {
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
schema.SetChartLabel("{marker.data.name}");
schema.SetTableLabel("{marker.name} - {marker.data.name}");
schema.AddKeyLabelFormatSearchable("name", "Details", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormat("name", "Details", MS::Format::String);
return schema;
}
};
@@ -170,8 +169,7 @@ struct Tracing {
using MS = MarkerSchema;
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable,
MS::Location::TimelineOverview};
schema.AddKeyLabelFormatSearchable("category", "Type", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormat("category", "Type", MS::Format::String);
return schema;
}
};

12
tools/profiler/core/MicroGeckoProfiler.cpp
View File

@@ -78,14 +78,10 @@ struct TraceMarker {
schema.SetTableLabel(
"{marker.name} {marker.data.name1} {marker.data.val1} "
"{marker.data.name2} {marker.data.val2}");
schema.AddKeyLabelFormatSearchable("name1", "Key 1", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormatSearchable("val1", "Value 1", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormatSearchable("name2", "Key 2", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormatSearchable("val2", "Value 2", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormat("name1", "Key 1", MS::Format::String);
schema.AddKeyLabelFormat("val1", "Value 1", MS::Format::String);
schema.AddKeyLabelFormat("name2", "Key 2", MS::Format::String);
schema.AddKeyLabelFormat("val2", "Value 2", MS::Format::String);
return schema;
}
};

5
tools/profiler/core/platform.cpp
View File

@@ -2804,7 +2804,7 @@ static void StreamMetaJSCustomObject(
const PreRecordedMetaInformation& aPreRecordedMetaInformation) {
MOZ_RELEASE_ASSERT(CorePS::Exists() && ActivePS::Exists(aLock));
aWriter.IntProperty("version", 26);
aWriter.IntProperty("version", 25);
// The "startTime" field holds the number of milliseconds since midnight
// January 1, 1970 GMT. This grotty code computes (Now - (Now -
@@ -3055,8 +3055,7 @@ struct JavaMarkerWithDetails {
schema.SetTooltipLabel("{marker.name}");
schema.SetChartLabel("{marker.data.name}");
schema.SetTableLabel("{marker.name} - {marker.data.name}");
schema.AddKeyLabelFormatSearchable("name", "Details", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormat("name", "Details", MS::Format::String);
return schema;
}
};

3
tools/profiler/gecko/ProfilerIOInterposeObserver.cpp
View File

@@ -50,9 +50,6 @@ struct FileIOMarker {
schema.AddKeyLabelFormatSearchable("filename", "Filename",
MS::Format::FilePath,
MS::Searchable::Searchable);
schema.AddKeyLabelFormatSearchable("threadId", "Thread ID",
MS::Format::String,
MS::Searchable::Searchable);
return schema;
}
};

7
xpcom/base/Logging.cpp
View File

@@ -632,11 +632,8 @@ class LogModuleManager {
using MS = MarkerSchema;
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
schema.SetTableLabel("({marker.data.module}) {marker.data.name}");
schema.AddKeyLabelFormatSearchable("module", "Module",
MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormatSearchable("name", "Name", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormat("module", "Module", MS::Format::String);
schema.AddKeyLabelFormat("name", "Name", MS::Format::String);
return schema;
}
};

3
xpcom/threads/TaskController.cpp
View File

@@ -75,8 +75,7 @@ struct TaskMarker {
schema.SetTableLabel(
"{marker.name} - {marker.data.name} - priority: "
"{marker.data.priorityName} ({marker.data.priority})");
schema.AddKeyLabelFormatSearchable("name", "Task Name", MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormat("name", "Task Name", MS::Format::String);
schema.AddKeyLabelFormat("priorityName", "Priority Name",
MS::Format::String);
schema.AddKeyLabelFormat("priority", "Priority level", MS::Format::Integer);

4
xpcom/threads/nsThread.cpp
View File

@@ -1577,9 +1577,7 @@ void PerformanceCounterState::MaybeReportAccumulatedTime(TimeStamp aNow) {
static MarkerSchema MarkerTypeDisplay() {
using MS = MarkerSchema;
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
schema.AddKeyLabelFormatSearchable("category", "Type",
MS::Format::String,
MS::Searchable::Searchable);
schema.AddKeyLabelFormat("category", "Type", MS::Format::String);
return schema;
}
};