diff --git a/dom/animation/AnimationEventDispatcher.h b/dom/animation/AnimationEventDispatcher.h
index e0e5259b07bd84622ef6c58b79064d26c0f5caf4..c591758c8359f2aea41504ff64c6dace52040e61 100644
--- a/dom/animation/AnimationEventDispatcher.h
+++ b/dom/animation/AnimationEventDispatcher.h
@@ -58,7 +58,8 @@ struct CSSAnimationMarker {
static MarkerSchema MarkerTypeDisplay() {
using MS = MarkerSchema;
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
- schema.AddKeyFormat("Name", MS::Format::String);
+ schema.AddKeyFormatSearchable("Name", MS::Format::String,
+ MS::Searchable::Searchable);
schema.AddKeyLabelFormat("properties", "Animated Properties",
MS::Format::String);
schema.AddKeyLabelFormat("oncompositor", "Can Run on Compositor",
diff --git a/dom/events/EventDispatcher.cpp b/dom/events/EventDispatcher.cpp
index ca2ef06c8cc4b1e49b868356a50aea024aa1fb5d..7ec36a97864de2b0d377fe6492d5090723aa492c 100644
--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -1089,10 +1089,14 @@ nsresult EventDispatcher::Dispatch(nsISupports* aTarget,
schema.SetTooltipLabel("{marker.data.eventType} - DOMEvent");
schema.SetTableLabel(
"{marker.data.eventType} - {marker.data.target}");
- schema.AddKeyLabelFormat("target", "Event Target",
- MS::Format::String);
+ schema.AddKeyLabelFormatSearchable("target", "Event Target",
+ MS::Format::String,
+ MS::Searchable::Searchable);
schema.AddKeyLabelFormat("latency", "Latency",
MS::Format::Duration);
+ schema.AddKeyLabelFormatSearchable("eventType", "Event Type",
+ MS::Format::String,
+ MS::Searchable::Searchable);
return schema;
}
};
diff --git a/dom/media/AsyncLogger.h b/dom/media/AsyncLogger.h
index e377910638d1b1a580c9cfad409093f016936e07..adc41013822fc9f17c03847ceece747c3bffaaa6 100644
--- a/dom/media/AsyncLogger.h
+++ b/dom/media/AsyncLogger.h
@@ -217,7 +217,9 @@ class AsyncLogger {
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
schema.SetChartLabel("{marker.data.name}");
schema.SetTableLabel("{marker.name} - {marker.data.name}");
- schema.AddKeyLabelFormat("name", "Comment", MS::Format::String);
+ schema.AddKeyLabelFormatSearchable("name", "Comment",
+ MS::Format::String,
+ MS::Searchable::Searchable);
return schema;
}
};
diff --git a/dom/performance/Performance.cpp b/dom/performance/Performance.cpp
index e041b5093d0b31258b3ee1627a5f014926d54bd8..d6a4101502ae815e71529cfaefd77a57639465f5 100644
--- a/dom/performance/Performance.cpp
+++ b/dom/performance/Performance.cpp
@@ -335,7 +335,8 @@ struct UserTimingMarker {
schema.SetAllLabels("{marker.data.name}");
schema.AddStaticLabelValue("Marker", "UserTiming");
schema.AddKeyLabelFormat("entryType", "Entry Type", MS::Format::String);
- schema.AddKeyLabelFormat("name", "Name", MS::Format::String);
+ schema.AddKeyLabelFormatSearchable("name", "Name", MS::Format::String,
+ MS::Searchable::Searchable);
schema.AddKeyLabelFormat("startMark", "Start Mark", MS::Format::String);
schema.AddKeyLabelFormat("endMark", "End Mark", MS::Format::String);
schema.AddStaticLabelValue("Description",
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
index 7b4fa2a6adab0f3a23c10b9fa02e17560ae752b8..a6cdb89aea75570a4c45ee269fc12299f0db0791 100644
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -4618,7 +4618,8 @@ struct Internals {
static MarkerSchema MarkerTypeDisplay() {
using MS = MarkerSchema;
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
- schema.AddKeyLabelFormat("prefName", "Name", MS::Format::String);
+ schema.AddKeyLabelFormatSearchable("prefName", "Name", MS::Format::String,
+ MS::Searchable::Searchable);
schema.AddKeyLabelFormat("prefKind", "Kind", MS::Format::String);
schema.AddKeyLabelFormat("prefType", "Type", MS::Format::String);
schema.AddKeyLabelFormat("prefValue", "Value", MS::Format::String);
diff --git a/mozglue/baseprofiler/core/platform.cpp b/mozglue/baseprofiler/core/platform.cpp
index 99d2d11dab78316f4258476c9f3b84057d2c7a4f..267589a96936492f6693374dae42411c0cb2b63f 100644
--- a/mozglue/baseprofiler/core/platform.cpp
+++ b/mozglue/baseprofiler/core/platform.cpp
@@ -1841,7 +1841,7 @@ static void StreamMetaJSCustomObject(PSLockRef aLock,
bool aIsShuttingDown) {
MOZ_RELEASE_ASSERT(CorePS::Exists() && ActivePS::Exists(aLock));
- aWriter.IntProperty("version", 25);
+ aWriter.IntProperty("version", 26);
// The "startTime" field holds the number of milliseconds since midnight
// January 1, 1970 GMT. This grotty code computes (Now - (Now -
diff --git a/mozglue/baseprofiler/public/BaseProfilerMarkers.h b/mozglue/baseprofiler/public/BaseProfilerMarkers.h
index 406bf019833ec915cb79c2cc34478393e804cdcc..5821997e7cbb85bf0a911a011f4cd82751774c95 100644
--- a/mozglue/baseprofiler/public/BaseProfilerMarkers.h
+++ b/mozglue/baseprofiler/public/BaseProfilerMarkers.h
@@ -148,7 +148,8 @@ struct TextMarker {
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
schema.SetChartLabel("{marker.data.name}");
schema.SetTableLabel("{marker.name} - {marker.data.name}");
- schema.AddKeyLabelFormat("name", "Details", MS::Format::String);
+ schema.AddKeyLabelFormatSearchable("name", "Details", MS::Format::String,
+ MS::Searchable::Searchable);
return schema;
}
};
@@ -169,7 +170,8 @@ struct Tracing {
using MS = MarkerSchema;
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable,
MS::Location::TimelineOverview};
- schema.AddKeyLabelFormat("category", "Type", MS::Format::String);
+ schema.AddKeyLabelFormatSearchable("category", "Type", MS::Format::String,
+ MS::Searchable::Searchable);
return schema;
}
};
diff --git a/tools/profiler/core/MicroGeckoProfiler.cpp b/tools/profiler/core/MicroGeckoProfiler.cpp
index a045793485bb97c70546a523f321ffac612c996b..bedb75574220f272a1ff2c9f61087fc3930092e3 100644
--- a/tools/profiler/core/MicroGeckoProfiler.cpp
+++ b/tools/profiler/core/MicroGeckoProfiler.cpp
@@ -78,10 +78,14 @@ struct TraceMarker {
schema.SetTableLabel(
"{marker.name} {marker.data.name1} {marker.data.val1} "
"{marker.data.name2} {marker.data.val2}");
- 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);
+ 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);
return schema;
}
};
diff --git a/tools/profiler/core/platform.cpp b/tools/profiler/core/platform.cpp
index d411378fcdc445e2b739bb6a47294ebc17d22aae..b080a4b2df4c8cd943a6352834391c12effa5152 100644
--- a/tools/profiler/core/platform.cpp
+++ b/tools/profiler/core/platform.cpp
@@ -2804,7 +2804,7 @@ static void StreamMetaJSCustomObject(
const PreRecordedMetaInformation& aPreRecordedMetaInformation) {
MOZ_RELEASE_ASSERT(CorePS::Exists() && ActivePS::Exists(aLock));
- aWriter.IntProperty("version", 25);
+ aWriter.IntProperty("version", 26);
// The "startTime" field holds the number of milliseconds since midnight
// January 1, 1970 GMT. This grotty code computes (Now - (Now -
@@ -3055,7 +3055,8 @@ struct JavaMarkerWithDetails {
schema.SetTooltipLabel("{marker.name}");
schema.SetChartLabel("{marker.data.name}");
schema.SetTableLabel("{marker.name} - {marker.data.name}");
- schema.AddKeyLabelFormat("name", "Details", MS::Format::String);
+ schema.AddKeyLabelFormatSearchable("name", "Details", MS::Format::String,
+ MS::Searchable::Searchable);
return schema;
}
};
diff --git a/tools/profiler/gecko/ProfilerIOInterposeObserver.cpp b/tools/profiler/gecko/ProfilerIOInterposeObserver.cpp
index cda053d90e9defee1c2cdf1ebc7cd4e049558a8b..d675c87b5dd517e05821af021f333c234cf63140 100644
--- a/tools/profiler/gecko/ProfilerIOInterposeObserver.cpp
+++ b/tools/profiler/gecko/ProfilerIOInterposeObserver.cpp
@@ -50,6 +50,9 @@ 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;
}
};
diff --git a/tools/profiler/tests/xpcshell/test_feature_mainthreadio.js b/tools/profiler/tests/xpcshell/test_feature_mainthreadio.js
index ad6c11257450c8ae5551ead153a5be6f6167a159..8ff5c9206dc75c5bdcaf89ef6c21ac2e9c83d999 100644
--- a/tools/profiler/tests/xpcshell/test_feature_mainthreadio.js
+++ b/tools/profiler/tests/xpcshell/test_feature_mainthreadio.js
@@ -39,6 +39,12 @@ add_task(async () => {
format: "file-path",
searchable: true,
},
+ {
+ key: "threadId",
+ label: "Thread ID",
+ format: "string",
+ searchable: true,
+ },
],
});
}
diff --git a/xpcom/base/Logging.cpp b/xpcom/base/Logging.cpp
index e2a11532002f362490b907f356ece670e49059a1..44f74686a90b3436b13d1764519ad98729724153 100644
--- a/xpcom/base/Logging.cpp
+++ b/xpcom/base/Logging.cpp
@@ -632,8 +632,11 @@ class LogModuleManager {
using MS = MarkerSchema;
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
schema.SetTableLabel("({marker.data.module}) {marker.data.name}");
- schema.AddKeyLabelFormat("module", "Module", MS::Format::String);
- schema.AddKeyLabelFormat("name", "Name", MS::Format::String);
+ schema.AddKeyLabelFormatSearchable("module", "Module",
+ MS::Format::String,
+ MS::Searchable::Searchable);
+ schema.AddKeyLabelFormatSearchable("name", "Name", MS::Format::String,
+ MS::Searchable::Searchable);
return schema;
}
};
diff --git a/xpcom/threads/TaskController.cpp b/xpcom/threads/TaskController.cpp
index 7359583fd7fe60110128d0b3971057096e760706..54da04b8a2637518d91de438904f443b4f8aeb85 100644
--- a/xpcom/threads/TaskController.cpp
+++ b/xpcom/threads/TaskController.cpp
@@ -75,7 +75,8 @@ struct TaskMarker {
schema.SetTableLabel(
"{marker.name} - {marker.data.name} - priority: "
"{marker.data.priorityName} ({marker.data.priority})");
- schema.AddKeyLabelFormat("name", "Task Name", MS::Format::String);
+ schema.AddKeyLabelFormatSearchable("name", "Task Name", MS::Format::String,
+ MS::Searchable::Searchable);
schema.AddKeyLabelFormat("priorityName", "Priority Name",
MS::Format::String);
schema.AddKeyLabelFormat("priority", "Priority level", MS::Format::Integer);
diff --git a/xpcom/threads/nsThread.cpp b/xpcom/threads/nsThread.cpp
index d38c0121585d71430056968ab6450d375be241c5..ea85c59765ba300450068006f4ddd2cbf75a481b 100644
--- a/xpcom/threads/nsThread.cpp
+++ b/xpcom/threads/nsThread.cpp
@@ -1577,7 +1577,9 @@ void PerformanceCounterState::MaybeReportAccumulatedTime(TimeStamp aNow) {
static MarkerSchema MarkerTypeDisplay() {
using MS = MarkerSchema;
MS schema{MS::Location::MarkerChart, MS::Location::MarkerTable};
- schema.AddKeyLabelFormat("category", "Type", MS::Format::String);
+ schema.AddKeyLabelFormatSearchable("category", "Type",
+ MS::Format::String,
+ MS::Searchable::Searchable);
return schema;
}
};