@@ -37,33 +37,6 @@ std::vector<PerformanceEntryType> getSupportedEntryTypesInternal() {
3737 return supportedEntryTypes;
3838}
3939
40- #if defined(__clang__)
41- #define NO_DESTROY [[clang::no_destroy]]
42- #else
43- #define NO_DESTROY
44- #endif
45-
46- NO_DESTROY const std::string TRACK_PREFIX = " Track:" ;
47-
48- std::tuple<std::optional<std::string>, std::string_view> parseTrackName (
49- const std::string& name) {
50- // Until there's a standard way to pass through track information, parse it
51- // manually, e.g., "Track:Foo:Event name"
52- // https://github.com/w3c/user-timing/issues/109
53- std::optional<std::string> trackName;
54- std::string_view eventName (name);
55- if (name.starts_with (TRACK_PREFIX)) {
56- const auto trackNameDelimiter = name.find (' :' , TRACK_PREFIX.length ());
57- if (trackNameDelimiter != std::string::npos) {
58- trackName = name.substr (
59- TRACK_PREFIX.length (), trackNameDelimiter - TRACK_PREFIX.length ());
60- eventName = std::string_view (name).substr (trackNameDelimiter + 1 );
61- }
62- }
63-
64- return std::make_tuple (trackName, eventName);
65- }
66-
6740} // namespace
6841
6942std::shared_ptr<PerformanceEntryReporter>&
@@ -300,14 +273,12 @@ void PerformanceEntryReporter::traceMark(const PerformanceMark& entry) const {
300273 auto & performanceTracer =
301274 jsinspector_modern::tracing::PerformanceTracer::getInstance ();
302275 if (ReactPerfettoLogger::isTracing () || performanceTracer.isTracing ()) {
303- auto [trackName, eventName] = parseTrackName (entry.name );
304-
305276 if (performanceTracer.isTracing ()) {
306277 performanceTracer.reportMark (entry.name , entry.startTime );
307278 }
308279
309280 if (ReactPerfettoLogger::isTracing ()) {
310- ReactPerfettoLogger::mark (eventName , entry.startTime , trackName );
281+ ReactPerfettoLogger::mark (entry. name , entry.startTime );
311282 }
312283 }
313284}
@@ -317,25 +288,14 @@ void PerformanceEntryReporter::traceMeasure(
317288 auto & performanceTracer =
318289 jsinspector_modern::tracing::PerformanceTracer::getInstance ();
319290 if (performanceTracer.isTracing () || ReactPerfettoLogger::isTracing ()) {
320- auto [trackName, eventName] = parseTrackName (entry.name );
321-
322291 if (performanceTracer.isTracing ()) {
323- std::optional<jsinspector_modern::DevToolsTrackEntryPayload>
324- trackMetadata;
325-
326- if (trackName.has_value ()) {
327- trackMetadata = {.track = trackName.value ()};
328- }
329292 performanceTracer.reportMeasure (
330- eventName , entry.startTime , entry.duration , trackMetadata );
293+ entry. name , entry.startTime , entry.duration );
331294 }
332295
333296 if (ReactPerfettoLogger::isTracing ()) {
334297 ReactPerfettoLogger::measure (
335- eventName,
336- entry.startTime ,
337- entry.startTime + entry.duration ,
338- trackName);
298+ entry.name , entry.startTime , entry.startTime + entry.duration );
339299 }
340300 }
341301}
0 commit comments