Refactor TraceEvent format#48269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hoxyq wants to merge 1 commit into from
Closed

Refactor TraceEvent format #48269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 76 additions & 45 deletions packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,11 @@ bool PerformanceTracer::stopTracingAndCollectEvents(

tracing_ = false;
if (buffer_.empty()) {
customTrackIdMap_.clear();
return true;
}

auto traceEvents = folly::dynamic::array();
auto savedBuffer = std::move(buffer_);
buffer_.clear();

// Register "Main" process
traceEvents.push_back(folly::dynamic::object(
Expand All@@ -69,27 +68,29 @@ bool PerformanceTracer::stopTracingAndCollectEvents(
"cat", "__metadata")("name", "thread_name")("ph", "M")("pid", PID)(
"tid", USER_TIMINGS_DEFAULT_TRACK)("ts", 0));

auto customTrackIdMap = getCustomTracks(savedBuffer);
for (const auto& [trackName, trackId] : customTrackIdMap) {
for (const auto& [trackName, trackId] : customTrackIdMap_) {
// Register custom tracks
traceEvents.push_back(folly::dynamic::object(
"args", folly::dynamic::object("name", trackName))("cat", "__metadata")(
"name", "thread_name")("ph", "M")("pid", PID)("tid", trackId)("ts", 0));
}

for (auto& event : savedBuffer) {
for (auto event : buffer_) {
// Emit trace events
traceEvents.push_back(serializeTraceEvent(event, customTrackIdMap));
traceEvents.push_back(serializeTraceEvent(event));

if (traceEvents.size() >= 1000) {
resultCallback(traceEvents);
traceEvents = folly::dynamic::array();
}
}
customTrackIdMap_.clear();
buffer_.clear();

if (traceEvents.size() >= 1) {
resultCallback(traceEvents);
}

return true;
}

Expand All@@ -100,8 +101,15 @@ void PerformanceTracer::reportMark(
if (!tracing_) {
return;
}
buffer_.push_back(TraceEvent{
.type = TraceEventType::MARK, .name = std::string(name), .start = start});

TraceEventBase* event = new InstantTraceEvent{
std::string(name),
std::vector{TraceEventCategory::UserTiming},
start,
PID, // FIXME: This should be real process ID.
USER_TIMINGS_DEFAULT_TRACK, // FIXME: This should be real thread ID.
};
buffer_.push_back(event);
}

void PerformanceTracer::reportMeasure(
Expand All@@ -114,62 +122,85 @@ void PerformanceTracer::reportMeasure(
return;
}

std::optional<std::string> track;
uint64_t threadId =
USER_TIMINGS_DEFAULT_TRACK; // FIXME: This should be real thread ID.
if (trackMetadata.has_value()) {
track = trackMetadata.value().track;
std::string trackName = trackMetadata.value().track;

if (!customTrackIdMap_.contains(trackName)) {
uint64_t trackId =
USER_TIMINGS_DEFAULT_TRACK + customTrackIdMap_.size() + 1;
threadId = trackId;

customTrackIdMap_.emplace(trackName, trackId);
}
}

buffer_.push_back(TraceEvent{
.type = TraceEventType::MEASURE,
.name = std::string(name),
.start = start,
.duration = duration,
.track = track});
TraceEventBase* event = new CompleteTraceEvent{
std::string(name),
std::vector{TraceEventCategory::UserTiming},
start,
PID, // FIXME: This should be real process ID.
threadId, // FIXME: This should be real thread ID.
duration};
buffer_.push_back(event);
}

std::unordered_map<std::string, uint32_t> PerformanceTracer::getCustomTracks(
std::vector<TraceEvent>& events) {
std::unordered_map<std::string, uint32_t> trackIdMap;

uint32_t nextTrack = USER_TIMINGS_DEFAULT_TRACK + 1;
for (auto& event : events) {
// Custom tracks are only supported by User Timing "measure" events
if (event.type != TraceEventType::MEASURE) {
continue;
std::string PerformanceTracer::serializeTraceEventCategories(
TraceEventBase* event) const {
std::string result;

for (const auto& category : event->categories) {
switch (category) {
case TraceEventCategory::UserTiming:
result += "blink.user_timing";
break;
case TraceEventCategory::TimelineEvent:
result += "disabled-by-default-devtools.timeline";
break;

default:
throw std::runtime_error("Unknown trace event category");
}

if (event.track.has_value() && !trackIdMap.contains(event.track.value())) {
auto trackId = nextTrack++;
trackIdMap[event.track.value()] = trackId;
}
result += ",";
}

return trackIdMap;
if (result.length() > 0) {
result.pop_back();
}

return result;
}

folly::dynamic PerformanceTracer::serializeTraceEvent(
TraceEvent& event,
std::unordered_map<std::string, uint32_t>& customTrackIdMap) const {
TraceEventBase* event) const {
folly::dynamic result = folly::dynamic::object;

result["args"] = folly::dynamic::object();
result["cat"] = "blink.user_timing";
result["name"] = event.name;
result["pid"] = PID;
result["ts"] = event.start;
result["name"] = event->name;
result["cat"] = serializeTraceEventCategories(event);
result["args"] = event->args;
result["ts"] = event->timestamp;
result["pid"] = event->processId;
result["tid"] = event->threadId;

switch (event.type) {
case TraceEventType::MARK:
switch (event->type) {
case TraceEventType::Instant:
result["ph"] = "I";
result["tid"] = USER_TIMINGS_DEFAULT_TRACK;

break;
case TraceEventType::MEASURE:
result["dur"] = event.duration;

case TraceEventType::Complete: {
result["ph"] = "X";
result["tid"] = event.track.has_value()
? customTrackIdMap[event.track.value()]
: USER_TIMINGS_DEFAULT_TRACK;

auto completeEvent = static_cast<CompleteTraceEvent*>(event);
result["dur"] = completeEvent->duration;

break;
}

default:
throw std::runtime_error("Unknown trace event type");
}

return result;
Expand Down
86 changes: 73 additions & 13 deletions packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,78 @@ namespace facebook::react::jsinspector_modern {
// design is copied from earlier FuseboxTracer prototype).

enum class TraceEventType {
MARK = 1,
MEASURE = 2,
Instant,
Complete,
};

struct TraceEvent {
TraceEventType type;
enum class TraceEventCategory {
UserTiming,
TimelineEvent,
};

/*
* Based on the out-of-date "Trace Event Format" document from Google and our
* findings while reverse engineering the contract between Chrome and Chrome
* DevTools.

* https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview?pli=1&tab=t.0#heading=h.yr4qxyxotyw
*/
struct TraceEventBase {
std::string name;
uint64_t start;
uint64_t duration = 0;
std::optional<std::string> track;
std::vector<TraceEventCategory> categories;
TraceEventType type;
uint64_t timestamp;
uint64_t processId;
uint64_t threadId;
folly::dynamic args = folly::dynamic::object();
};

template <TraceEventType T>
struct TraceEvent : public TraceEventBase {
TraceEvent(
std::string name,
std::vector<TraceEventCategory> categories,
uint64_t timestamp,
uint64_t processId,
uint64_t threadId)
: TraceEventBase{
std::move(name),
std::move(categories),
T,
timestamp,
processId,
threadId} {}
};

struct CompleteTraceEvent : public TraceEvent<TraceEventType::Complete> {
uint64_t duration;

CompleteTraceEvent(
std::string name,
std::vector<TraceEventCategory> categories,
uint64_t timestamp,
uint64_t processId,
uint64_t threadId,
uint64_t duration)
: TraceEvent<
TraceEventType::
Complete>{std::move(name), std::move(categories), timestamp, processId, threadId},
duration(duration) {}
};

struct InstantTraceEvent : public TraceEvent<TraceEventType::Instant> {
InstantTraceEvent(
std::string name,
std::vector<TraceEventCategory> categories,
uint64_t timestamp,
uint64_t processId,
uint64_t threadId)
: TraceEvent<TraceEventType::Instant>{
std::move(name),
std::move(categories),
timestamp,
processId,
threadId} {}
};

/**
Expand DownExpand Up@@ -83,14 +145,12 @@ class PerformanceTracer {
PerformanceTracer& operator=(const PerformanceTracer&) = delete;
~PerformanceTracer() = default;

std::unordered_map<std::string, uint32_t> getCustomTracks(
std::vector<TraceEvent>& events);
folly::dynamic serializeTraceEvent(
TraceEvent& event,
std::unordered_map<std::string, uint32_t>& customTrackIdMap) const;
std::string serializeTraceEventCategories(TraceEventBase* event) const;
folly::dynamic serializeTraceEvent(TraceEventBase* event) const;

bool tracing_{false};
std::vector<TraceEvent> buffer_;
std::unordered_map<std::string, uint64_t> customTrackIdMap_;
std::vector<TraceEventBase*> buffer_;
std::mutex mutex_;
};

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Refactor TraceEvent format#48269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

hoxyq
wants to merge
1
commit into

from

 Closed


Refactor TraceEvent format
#48269
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


121 changes: 76 additions & 45 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,11 @@ bool PerformanceTracer::stopTracingAndCollectEvents(

 tracing_ = false;
 if (buffer_.empty()) {
 customTrackIdMap_.clear();
 return true;
 }

 auto traceEvents = folly::dynamic::array();
 auto savedBuffer = std::move(buffer_);
 buffer_.clear();

 // Register "Main" process
 traceEvents.push_back(folly::dynamic::object(
Expand All@@ -69,27 +68,29 @@ bool PerformanceTracer::stopTracingAndCollectEvents(
 "cat", "__metadata")("name", "thread_name")("ph", "M")("pid", PID)(
 "tid", USER_TIMINGS_DEFAULT_TRACK)("ts", 0));

 auto customTrackIdMap = getCustomTracks(savedBuffer);
 for (const auto& [trackName, trackId] : customTrackIdMap) {
 for (const auto& [trackName, trackId] : customTrackIdMap_) {
 // Register custom tracks
 traceEvents.push_back(folly::dynamic::object(
 "args", folly::dynamic::object("name", trackName))("cat", "__metadata")(
 "name", "thread_name")("ph", "M")("pid", PID)("tid", trackId)("ts", 0));
 }

 for (auto& event : savedBuffer) {
 for (auto event : buffer_) {
 // Emit trace events
 traceEvents.push_back(serializeTraceEvent(event, customTrackIdMap));
 traceEvents.push_back(serializeTraceEvent(event));

 if (traceEvents.size() >= 1000) {
 resultCallback(traceEvents);
 traceEvents = folly::dynamic::array();
 }
 }
 customTrackIdMap_.clear();
 buffer_.clear();

 if (traceEvents.size() >= 1) {
 resultCallback(traceEvents);
 }

 return true;
}

Expand All@@ -100,8 +101,15 @@ void PerformanceTracer::reportMark(
 if (!tracing_) {
 return;
 }
 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MARK, .name = std::string(name), .start = start});

 TraceEventBase* event = new InstantTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 USER_TIMINGS_DEFAULT_TRACK, // FIXME: This should be real thread ID.
 };
 buffer_.push_back(event);
}

void PerformanceTracer::reportMeasure(
Expand All@@ -114,62 +122,85 @@ void PerformanceTracer::reportMeasure(
 return;
 }

 std::optional<std::string> track;
 uint64_t threadId =
 USER_TIMINGS_DEFAULT_TRACK; // FIXME: This should be real thread ID.
 if (trackMetadata.has_value()) {
 track = trackMetadata.value().track;
 std::string trackName = trackMetadata.value().track;

 if (!customTrackIdMap_.contains(trackName)) {
 uint64_t trackId =
 USER_TIMINGS_DEFAULT_TRACK + customTrackIdMap_.size() + 1;
 threadId = trackId;

 customTrackIdMap_.emplace(trackName, trackId);
 }
 }

 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MEASURE,
 .name = std::string(name),
 .start = start,
 .duration = duration,
 .track = track});
 TraceEventBase* event = new CompleteTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 threadId, // FIXME: This should be real thread ID.
 duration};
 buffer_.push_back(event);
}

std::unordered_map<std::string, uint32_t> PerformanceTracer::getCustomTracks(
 std::vector<TraceEvent>& events) {
 std::unordered_map<std::string, uint32_t> trackIdMap;

 uint32_t nextTrack = USER_TIMINGS_DEFAULT_TRACK + 1;
 for (auto& event : events) {
 // Custom tracks are only supported by User Timing "measure" events
 if (event.type != TraceEventType::MEASURE) {
 continue;
std::string PerformanceTracer::serializeTraceEventCategories(
 TraceEventBase* event) const {
 std::string result;

 for (const auto& category : event->categories) {
 switch (category) {
 case TraceEventCategory::UserTiming:
 result += "blink.user_timing";
 break;
 case TraceEventCategory::TimelineEvent:
 result += "disabled-by-default-devtools.timeline";
 break;

 default:
 throw std::runtime_error("Unknown trace event category");
 }

 if (event.track.has_value() && !trackIdMap.contains(event.track.value())) {
 auto trackId = nextTrack++;
 trackIdMap[event.track.value()] = trackId;
 }
 result += ",";
 }

 return trackIdMap;
 if (result.length() > 0) {
 result.pop_back();
 }

 return result;
}

folly::dynamic PerformanceTracer::serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const {
 TraceEventBase* event) const {
 folly::dynamic result = folly::dynamic::object;

 result["args"] = folly::dynamic::object();
 result["cat"] = "blink.user_timing";
 result["name"] = event.name;
 result["pid"] = PID;
 result["ts"] = event.start;
 result["name"] = event->name;
 result["cat"] = serializeTraceEventCategories(event);
 result["args"] = event->args;
 result["ts"] = event->timestamp;
 result["pid"] = event->processId;
 result["tid"] = event->threadId;

 switch (event.type) {
 case TraceEventType::MARK:
 switch (event->type) {
 case TraceEventType::Instant:
 result["ph"] = "I";
 result["tid"] = USER_TIMINGS_DEFAULT_TRACK;

 break;
 case TraceEventType::MEASURE:
 result["dur"] = event.duration;

case TraceEventType::Complete: {
 result["ph"] = "X";
 result["tid"] = event.track.has_value()
 ? customTrackIdMap[event.track.value()]
 : USER_TIMINGS_DEFAULT_TRACK;

 auto completeEvent = static_cast<CompleteTraceEvent*>(event);
 result["dur"] = completeEvent->duration;

 break;
 }

 default:
 throw std::runtime_error("Unknown trace event type");
 }

 return result;
Expand Down

86 changes: 73 additions & 13 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,78 @@ namespace facebook::react::jsinspector_modern {
// design is copied from earlier FuseboxTracer prototype).

enum class TraceEventType {
MARK = 1,
MEASURE = 2,
Instant,
Complete,
};

struct TraceEvent {
 TraceEventType type;
enum class TraceEventCategory {
 UserTiming,
 TimelineEvent,
};

/*
 * Based on the out-of-date "Trace Event Format" document from Google and our
 * findings while reverse engineering the contract between Chrome and Chrome
 * DevTools.

 * https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview?pli=1&tab=t.0#heading=h.yr4qxyxotyw
*/
struct TraceEventBase {
 std::string name;
 uint64_t start;
 uint64_t duration = 0;
 std::optional<std::string> track;
 std::vector<TraceEventCategory> categories;
 TraceEventType type;
 uint64_t timestamp;
 uint64_t processId;
 uint64_t threadId;
 folly::dynamic args = folly::dynamic::object();
};

template <TraceEventType T>
struct TraceEvent : public TraceEventBase {
 TraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEventBase{
 std::move(name),
 std::move(categories),
 T,
 timestamp,
 processId,
 threadId} {}
};

struct CompleteTraceEvent : public TraceEvent<TraceEventType::Complete> {
 uint64_t duration;

 CompleteTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId,
 uint64_t duration)
 : TraceEvent<
 TraceEventType::
 Complete>{std::move(name), std::move(categories), timestamp, processId, threadId},
 duration(duration) {}
};

struct InstantTraceEvent : public TraceEvent<TraceEventType::Instant> {
 InstantTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEvent<TraceEventType::Instant>{
 std::move(name),
 std::move(categories),
 timestamp,
 processId,
 threadId} {}
};

/**
Expand DownExpand Up@@ -83,14 +145,12 @@ class PerformanceTracer {
 PerformanceTracer& operator=(const PerformanceTracer&) = delete;
 ~PerformanceTracer() = default;

 std::unordered_map<std::string, uint32_t> getCustomTracks(
 std::vector<TraceEvent>& events);
 folly::dynamic serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const;
 std::string serializeTraceEventCategories(TraceEventBase* event) const;
 folly::dynamic serializeTraceEvent(TraceEventBase* event) const;

 bool tracing_{false};
 std::vector<TraceEvent> buffer_;
 std::unordered_map<std::string, uint64_t> customTrackIdMap_;
 std::vector<TraceEventBase*> buffer_;
 std::mutex mutex_;
};

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor TraceEvent format#48269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

hoxyq
wants to merge
1
commit into

from

 Closed


Refactor TraceEvent format
#48269
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


121 changes: 76 additions & 45 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,11 @@ bool PerformanceTracer::stopTracingAndCollectEvents(

 tracing_ = false;
 if (buffer_.empty()) {
 customTrackIdMap_.clear();
 return true;
 }

 auto traceEvents = folly::dynamic::array();
 auto savedBuffer = std::move(buffer_);
 buffer_.clear();

 // Register "Main" process
 traceEvents.push_back(folly::dynamic::object(
Expand All@@ -69,27 +68,29 @@ bool PerformanceTracer::stopTracingAndCollectEvents(
 "cat", "__metadata")("name", "thread_name")("ph", "M")("pid", PID)(
 "tid", USER_TIMINGS_DEFAULT_TRACK)("ts", 0));

 auto customTrackIdMap = getCustomTracks(savedBuffer);
 for (const auto& [trackName, trackId] : customTrackIdMap) {
 for (const auto& [trackName, trackId] : customTrackIdMap_) {
 // Register custom tracks
 traceEvents.push_back(folly::dynamic::object(
 "args", folly::dynamic::object("name", trackName))("cat", "__metadata")(
 "name", "thread_name")("ph", "M")("pid", PID)("tid", trackId)("ts", 0));
 }

 for (auto& event : savedBuffer) {
 for (auto event : buffer_) {
 // Emit trace events
 traceEvents.push_back(serializeTraceEvent(event, customTrackIdMap));
 traceEvents.push_back(serializeTraceEvent(event));

 if (traceEvents.size() >= 1000) {
 resultCallback(traceEvents);
 traceEvents = folly::dynamic::array();
 }
 }
 customTrackIdMap_.clear();
 buffer_.clear();

 if (traceEvents.size() >= 1) {
 resultCallback(traceEvents);
 }

 return true;
}

Expand All@@ -100,8 +101,15 @@ void PerformanceTracer::reportMark(
 if (!tracing_) {
 return;
 }
 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MARK, .name = std::string(name), .start = start});

 TraceEventBase* event = new InstantTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 USER_TIMINGS_DEFAULT_TRACK, // FIXME: This should be real thread ID.
 };
 buffer_.push_back(event);
}

void PerformanceTracer::reportMeasure(
Expand All@@ -114,62 +122,85 @@ void PerformanceTracer::reportMeasure(
 return;
 }

 std::optional<std::string> track;
 uint64_t threadId =
 USER_TIMINGS_DEFAULT_TRACK; // FIXME: This should be real thread ID.
 if (trackMetadata.has_value()) {
 track = trackMetadata.value().track;
 std::string trackName = trackMetadata.value().track;

 if (!customTrackIdMap_.contains(trackName)) {
 uint64_t trackId =
 USER_TIMINGS_DEFAULT_TRACK + customTrackIdMap_.size() + 1;
 threadId = trackId;

 customTrackIdMap_.emplace(trackName, trackId);
 }
 }

 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MEASURE,
 .name = std::string(name),
 .start = start,
 .duration = duration,
 .track = track});
 TraceEventBase* event = new CompleteTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 threadId, // FIXME: This should be real thread ID.
 duration};
 buffer_.push_back(event);
}

std::unordered_map<std::string, uint32_t> PerformanceTracer::getCustomTracks(
 std::vector<TraceEvent>& events) {
 std::unordered_map<std::string, uint32_t> trackIdMap;

 uint32_t nextTrack = USER_TIMINGS_DEFAULT_TRACK + 1;
 for (auto& event : events) {
 // Custom tracks are only supported by User Timing "measure" events
 if (event.type != TraceEventType::MEASURE) {
 continue;
std::string PerformanceTracer::serializeTraceEventCategories(
 TraceEventBase* event) const {
 std::string result;

 for (const auto& category : event->categories) {
 switch (category) {
 case TraceEventCategory::UserTiming:
 result += "blink.user_timing";
 break;
 case TraceEventCategory::TimelineEvent:
 result += "disabled-by-default-devtools.timeline";
 break;

 default:
 throw std::runtime_error("Unknown trace event category");
 }

 if (event.track.has_value() && !trackIdMap.contains(event.track.value())) {
 auto trackId = nextTrack++;
 trackIdMap[event.track.value()] = trackId;
 }
 result += ",";
 }

 return trackIdMap;
 if (result.length() > 0) {
 result.pop_back();
 }

 return result;
}

folly::dynamic PerformanceTracer::serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const {
 TraceEventBase* event) const {
 folly::dynamic result = folly::dynamic::object;

 result["args"] = folly::dynamic::object();
 result["cat"] = "blink.user_timing";
 result["name"] = event.name;
 result["pid"] = PID;
 result["ts"] = event.start;
 result["name"] = event->name;
 result["cat"] = serializeTraceEventCategories(event);
 result["args"] = event->args;
 result["ts"] = event->timestamp;
 result["pid"] = event->processId;
 result["tid"] = event->threadId;

 switch (event.type) {
 case TraceEventType::MARK:
 switch (event->type) {
 case TraceEventType::Instant:
 result["ph"] = "I";
 result["tid"] = USER_TIMINGS_DEFAULT_TRACK;

 break;
 case TraceEventType::MEASURE:
 result["dur"] = event.duration;

case TraceEventType::Complete: {
 result["ph"] = "X";
 result["tid"] = event.track.has_value()
 ? customTrackIdMap[event.track.value()]
 : USER_TIMINGS_DEFAULT_TRACK;

 auto completeEvent = static_cast<CompleteTraceEvent*>(event);
 result["dur"] = completeEvent->duration;

 break;
 }

 default:
 throw std::runtime_error("Unknown trace event type");
 }

 return result;
Expand Down

86 changes: 73 additions & 13 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,78 @@ namespace facebook::react::jsinspector_modern {
// design is copied from earlier FuseboxTracer prototype).

enum class TraceEventType {
MARK = 1,
MEASURE = 2,
Instant,
Complete,
};

struct TraceEvent {
 TraceEventType type;
enum class TraceEventCategory {
 UserTiming,
 TimelineEvent,
};

/*
 * Based on the out-of-date "Trace Event Format" document from Google and our
 * findings while reverse engineering the contract between Chrome and Chrome
 * DevTools.

 * https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview?pli=1&tab=t.0#heading=h.yr4qxyxotyw
*/
struct TraceEventBase {
 std::string name;
 uint64_t start;
 uint64_t duration = 0;
 std::optional<std::string> track;
 std::vector<TraceEventCategory> categories;
 TraceEventType type;
 uint64_t timestamp;
 uint64_t processId;
 uint64_t threadId;
 folly::dynamic args = folly::dynamic::object();
};

template <TraceEventType T>
struct TraceEvent : public TraceEventBase {
 TraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEventBase{
 std::move(name),
 std::move(categories),
 T,
 timestamp,
 processId,
 threadId} {}
};

struct CompleteTraceEvent : public TraceEvent<TraceEventType::Complete> {
 uint64_t duration;

 CompleteTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId,
 uint64_t duration)
 : TraceEvent<
 TraceEventType::
 Complete>{std::move(name), std::move(categories), timestamp, processId, threadId},
 duration(duration) {}
};

struct InstantTraceEvent : public TraceEvent<TraceEventType::Instant> {
 InstantTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEvent<TraceEventType::Instant>{
 std::move(name),
 std::move(categories),
 timestamp,
 processId,
 threadId} {}
};

/**
Expand DownExpand Up@@ -83,14 +145,12 @@ class PerformanceTracer {
 PerformanceTracer& operator=(const PerformanceTracer&) = delete;
 ~PerformanceTracer() = default;

 std::unordered_map<std::string, uint32_t> getCustomTracks(
 std::vector<TraceEvent>& events);
 folly::dynamic serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const;
 std::string serializeTraceEventCategories(TraceEventBase* event) const;
 folly::dynamic serializeTraceEvent(TraceEventBase* event) const;

 bool tracing_{false};
 std::vector<TraceEvent> buffer_;
 std::unordered_map<std::string, uint64_t> customTrackIdMap_;
 std::vector<TraceEventBase*> buffer_;
 std::mutex mutex_;
};

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor TraceEvent format#48269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

hoxyq
wants to merge
1
commit into

from

 Closed


Refactor TraceEvent format
#48269
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


121 changes: 76 additions & 45 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,11 @@ bool PerformanceTracer::stopTracingAndCollectEvents(

 tracing_ = false;
 if (buffer_.empty()) {
 customTrackIdMap_.clear();
 return true;
 }

 auto traceEvents = folly::dynamic::array();
 auto savedBuffer = std::move(buffer_);
 buffer_.clear();

 // Register "Main" process
 traceEvents.push_back(folly::dynamic::object(
Expand All@@ -69,27 +68,29 @@ bool PerformanceTracer::stopTracingAndCollectEvents(
 "cat", "__metadata")("name", "thread_name")("ph", "M")("pid", PID)(
 "tid", USER_TIMINGS_DEFAULT_TRACK)("ts", 0));

 auto customTrackIdMap = getCustomTracks(savedBuffer);
 for (const auto& [trackName, trackId] : customTrackIdMap) {
 for (const auto& [trackName, trackId] : customTrackIdMap_) {
 // Register custom tracks
 traceEvents.push_back(folly::dynamic::object(
 "args", folly::dynamic::object("name", trackName))("cat", "__metadata")(
 "name", "thread_name")("ph", "M")("pid", PID)("tid", trackId)("ts", 0));
 }

 for (auto& event : savedBuffer) {
 for (auto event : buffer_) {
 // Emit trace events
 traceEvents.push_back(serializeTraceEvent(event, customTrackIdMap));
 traceEvents.push_back(serializeTraceEvent(event));

 if (traceEvents.size() >= 1000) {
 resultCallback(traceEvents);
 traceEvents = folly::dynamic::array();
 }
 }
 customTrackIdMap_.clear();
 buffer_.clear();

 if (traceEvents.size() >= 1) {
 resultCallback(traceEvents);
 }

 return true;
}

Expand All@@ -100,8 +101,15 @@ void PerformanceTracer::reportMark(
 if (!tracing_) {
 return;
 }
 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MARK, .name = std::string(name), .start = start});

 TraceEventBase* event = new InstantTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 USER_TIMINGS_DEFAULT_TRACK, // FIXME: This should be real thread ID.
 };
 buffer_.push_back(event);
}

void PerformanceTracer::reportMeasure(
Expand All@@ -114,62 +122,85 @@ void PerformanceTracer::reportMeasure(
 return;
 }

 std::optional<std::string> track;
 uint64_t threadId =
 USER_TIMINGS_DEFAULT_TRACK; // FIXME: This should be real thread ID.
 if (trackMetadata.has_value()) {
 track = trackMetadata.value().track;
 std::string trackName = trackMetadata.value().track;

 if (!customTrackIdMap_.contains(trackName)) {
 uint64_t trackId =
 USER_TIMINGS_DEFAULT_TRACK + customTrackIdMap_.size() + 1;
 threadId = trackId;

 customTrackIdMap_.emplace(trackName, trackId);
 }
 }

 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MEASURE,
 .name = std::string(name),
 .start = start,
 .duration = duration,
 .track = track});
 TraceEventBase* event = new CompleteTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 threadId, // FIXME: This should be real thread ID.
 duration};
 buffer_.push_back(event);
}

std::unordered_map<std::string, uint32_t> PerformanceTracer::getCustomTracks(
 std::vector<TraceEvent>& events) {
 std::unordered_map<std::string, uint32_t> trackIdMap;

 uint32_t nextTrack = USER_TIMINGS_DEFAULT_TRACK + 1;
 for (auto& event : events) {
 // Custom tracks are only supported by User Timing "measure" events
 if (event.type != TraceEventType::MEASURE) {
 continue;
std::string PerformanceTracer::serializeTraceEventCategories(
 TraceEventBase* event) const {
 std::string result;

 for (const auto& category : event->categories) {
 switch (category) {
 case TraceEventCategory::UserTiming:
 result += "blink.user_timing";
 break;
 case TraceEventCategory::TimelineEvent:
 result += "disabled-by-default-devtools.timeline";
 break;

 default:
 throw std::runtime_error("Unknown trace event category");
 }

 if (event.track.has_value() && !trackIdMap.contains(event.track.value())) {
 auto trackId = nextTrack++;
 trackIdMap[event.track.value()] = trackId;
 }
 result += ",";
 }

 return trackIdMap;
 if (result.length() > 0) {
 result.pop_back();
 }

 return result;
}

folly::dynamic PerformanceTracer::serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const {
 TraceEventBase* event) const {
 folly::dynamic result = folly::dynamic::object;

 result["args"] = folly::dynamic::object();
 result["cat"] = "blink.user_timing";
 result["name"] = event.name;
 result["pid"] = PID;
 result["ts"] = event.start;
 result["name"] = event->name;
 result["cat"] = serializeTraceEventCategories(event);
 result["args"] = event->args;
 result["ts"] = event->timestamp;
 result["pid"] = event->processId;
 result["tid"] = event->threadId;

 switch (event.type) {
 case TraceEventType::MARK:
 switch (event->type) {
 case TraceEventType::Instant:
 result["ph"] = "I";
 result["tid"] = USER_TIMINGS_DEFAULT_TRACK;

 break;
 case TraceEventType::MEASURE:
 result["dur"] = event.duration;

case TraceEventType::Complete: {
 result["ph"] = "X";
 result["tid"] = event.track.has_value()
 ? customTrackIdMap[event.track.value()]
 : USER_TIMINGS_DEFAULT_TRACK;

 auto completeEvent = static_cast<CompleteTraceEvent*>(event);
 result["dur"] = completeEvent->duration;

 break;
 }

 default:
 throw std::runtime_error("Unknown trace event type");
 }

 return result;
Expand Down

86 changes: 73 additions & 13 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,78 @@ namespace facebook::react::jsinspector_modern {
// design is copied from earlier FuseboxTracer prototype).

enum class TraceEventType {
MARK = 1,
MEASURE = 2,
Instant,
Complete,
};

struct TraceEvent {
 TraceEventType type;
enum class TraceEventCategory {
 UserTiming,
 TimelineEvent,
};

/*
 * Based on the out-of-date "Trace Event Format" document from Google and our
 * findings while reverse engineering the contract between Chrome and Chrome
 * DevTools.

 * https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview?pli=1&tab=t.0#heading=h.yr4qxyxotyw
*/
struct TraceEventBase {
 std::string name;
 uint64_t start;
 uint64_t duration = 0;
 std::optional<std::string> track;
 std::vector<TraceEventCategory> categories;
 TraceEventType type;
 uint64_t timestamp;
 uint64_t processId;
 uint64_t threadId;
 folly::dynamic args = folly::dynamic::object();
};

template <TraceEventType T>
struct TraceEvent : public TraceEventBase {
 TraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEventBase{
 std::move(name),
 std::move(categories),
 T,
 timestamp,
 processId,
 threadId} {}
};

struct CompleteTraceEvent : public TraceEvent<TraceEventType::Complete> {
 uint64_t duration;

 CompleteTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId,
 uint64_t duration)
 : TraceEvent<
 TraceEventType::
 Complete>{std::move(name), std::move(categories), timestamp, processId, threadId},
 duration(duration) {}
};

struct InstantTraceEvent : public TraceEvent<TraceEventType::Instant> {
 InstantTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEvent<TraceEventType::Instant>{
 std::move(name),
 std::move(categories),
 timestamp,
 processId,
 threadId} {}
};

/**
Expand DownExpand Up@@ -83,14 +145,12 @@ class PerformanceTracer {
 PerformanceTracer& operator=(const PerformanceTracer&) = delete;
 ~PerformanceTracer() = default;

 std::unordered_map<std::string, uint32_t> getCustomTracks(
 std::vector<TraceEvent>& events);
 folly::dynamic serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const;
 std::string serializeTraceEventCategories(TraceEventBase* event) const;
 folly::dynamic serializeTraceEvent(TraceEventBase* event) const;

 bool tracing_{false};
 std::vector<TraceEvent> buffer_;
 std::unordered_map<std::string, uint64_t> customTrackIdMap_;
 std::vector<TraceEventBase*> buffer_;
 std::mutex mutex_;
};

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Refactor TraceEvent format#48269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

hoxyq
wants to merge
1
commit into

from

 Closed


Refactor TraceEvent format
#48269
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


121 changes: 76 additions & 45 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,11 @@ bool PerformanceTracer::stopTracingAndCollectEvents(

 tracing_ = false;
 if (buffer_.empty()) {
 customTrackIdMap_.clear();
 return true;
 }

 auto traceEvents = folly::dynamic::array();
 auto savedBuffer = std::move(buffer_);
 buffer_.clear();

 // Register "Main" process
 traceEvents.push_back(folly::dynamic::object(
Expand All@@ -69,27 +68,29 @@ bool PerformanceTracer::stopTracingAndCollectEvents(
 "cat", "__metadata")("name", "thread_name")("ph", "M")("pid", PID)(
 "tid", USER_TIMINGS_DEFAULT_TRACK)("ts", 0));

 auto customTrackIdMap = getCustomTracks(savedBuffer);
 for (const auto& [trackName, trackId] : customTrackIdMap) {
 for (const auto& [trackName, trackId] : customTrackIdMap_) {
 // Register custom tracks
 traceEvents.push_back(folly::dynamic::object(
 "args", folly::dynamic::object("name", trackName))("cat", "__metadata")(
 "name", "thread_name")("ph", "M")("pid", PID)("tid", trackId)("ts", 0));
 }

 for (auto& event : savedBuffer) {
 for (auto event : buffer_) {
 // Emit trace events
 traceEvents.push_back(serializeTraceEvent(event, customTrackIdMap));
 traceEvents.push_back(serializeTraceEvent(event));

 if (traceEvents.size() >= 1000) {
 resultCallback(traceEvents);
 traceEvents = folly::dynamic::array();
 }
 }
 customTrackIdMap_.clear();
 buffer_.clear();

 if (traceEvents.size() >= 1) {
 resultCallback(traceEvents);
 }

 return true;
}

Expand All@@ -100,8 +101,15 @@ void PerformanceTracer::reportMark(
 if (!tracing_) {
 return;
 }
 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MARK, .name = std::string(name), .start = start});

 TraceEventBase* event = new InstantTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 USER_TIMINGS_DEFAULT_TRACK, // FIXME: This should be real thread ID.
 };
 buffer_.push_back(event);
}

void PerformanceTracer::reportMeasure(
Expand All@@ -114,62 +122,85 @@ void PerformanceTracer::reportMeasure(
 return;
 }

 std::optional<std::string> track;
 uint64_t threadId =
 USER_TIMINGS_DEFAULT_TRACK; // FIXME: This should be real thread ID.
 if (trackMetadata.has_value()) {
 track = trackMetadata.value().track;
 std::string trackName = trackMetadata.value().track;

 if (!customTrackIdMap_.contains(trackName)) {
 uint64_t trackId =
 USER_TIMINGS_DEFAULT_TRACK + customTrackIdMap_.size() + 1;
 threadId = trackId;

 customTrackIdMap_.emplace(trackName, trackId);
 }
 }

 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MEASURE,
 .name = std::string(name),
 .start = start,
 .duration = duration,
 .track = track});
 TraceEventBase* event = new CompleteTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 threadId, // FIXME: This should be real thread ID.
 duration};
 buffer_.push_back(event);
}

std::unordered_map<std::string, uint32_t> PerformanceTracer::getCustomTracks(
 std::vector<TraceEvent>& events) {
 std::unordered_map<std::string, uint32_t> trackIdMap;

 uint32_t nextTrack = USER_TIMINGS_DEFAULT_TRACK + 1;
 for (auto& event : events) {
 // Custom tracks are only supported by User Timing "measure" events
 if (event.type != TraceEventType::MEASURE) {
 continue;
std::string PerformanceTracer::serializeTraceEventCategories(
 TraceEventBase* event) const {
 std::string result;

 for (const auto& category : event->categories) {
 switch (category) {
 case TraceEventCategory::UserTiming:
 result += "blink.user_timing";
 break;
 case TraceEventCategory::TimelineEvent:
 result += "disabled-by-default-devtools.timeline";
 break;

 default:
 throw std::runtime_error("Unknown trace event category");
 }

 if (event.track.has_value() && !trackIdMap.contains(event.track.value())) {
 auto trackId = nextTrack++;
 trackIdMap[event.track.value()] = trackId;
 }
 result += ",";
 }

 return trackIdMap;
 if (result.length() > 0) {
 result.pop_back();
 }

 return result;
}

folly::dynamic PerformanceTracer::serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const {
 TraceEventBase* event) const {
 folly::dynamic result = folly::dynamic::object;

 result["args"] = folly::dynamic::object();
 result["cat"] = "blink.user_timing";
 result["name"] = event.name;
 result["pid"] = PID;
 result["ts"] = event.start;
 result["name"] = event->name;
 result["cat"] = serializeTraceEventCategories(event);
 result["args"] = event->args;
 result["ts"] = event->timestamp;
 result["pid"] = event->processId;
 result["tid"] = event->threadId;

 switch (event.type) {
 case TraceEventType::MARK:
 switch (event->type) {
 case TraceEventType::Instant:
 result["ph"] = "I";
 result["tid"] = USER_TIMINGS_DEFAULT_TRACK;

 break;
 case TraceEventType::MEASURE:
 result["dur"] = event.duration;

case TraceEventType::Complete: {
 result["ph"] = "X";
 result["tid"] = event.track.has_value()
 ? customTrackIdMap[event.track.value()]
 : USER_TIMINGS_DEFAULT_TRACK;

 auto completeEvent = static_cast<CompleteTraceEvent*>(event);
 result["dur"] = completeEvent->duration;

 break;
 }

 default:
 throw std::runtime_error("Unknown trace event type");
 }

 return result;
Expand Down

86 changes: 73 additions & 13 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,78 @@ namespace facebook::react::jsinspector_modern {
// design is copied from earlier FuseboxTracer prototype).

enum class TraceEventType {
MARK = 1,
MEASURE = 2,
Instant,
Complete,
};

struct TraceEvent {
 TraceEventType type;
enum class TraceEventCategory {
 UserTiming,
 TimelineEvent,
};

/*
 * Based on the out-of-date "Trace Event Format" document from Google and our
 * findings while reverse engineering the contract between Chrome and Chrome
 * DevTools.

 * https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview?pli=1&tab=t.0#heading=h.yr4qxyxotyw
*/
struct TraceEventBase {
 std::string name;
 uint64_t start;
 uint64_t duration = 0;
 std::optional<std::string> track;
 std::vector<TraceEventCategory> categories;
 TraceEventType type;
 uint64_t timestamp;
 uint64_t processId;
 uint64_t threadId;
 folly::dynamic args = folly::dynamic::object();
};

template <TraceEventType T>
struct TraceEvent : public TraceEventBase {
 TraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEventBase{
 std::move(name),
 std::move(categories),
 T,
 timestamp,
 processId,
 threadId} {}
};

struct CompleteTraceEvent : public TraceEvent<TraceEventType::Complete> {
 uint64_t duration;

 CompleteTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId,
 uint64_t duration)
 : TraceEvent<
 TraceEventType::
 Complete>{std::move(name), std::move(categories), timestamp, processId, threadId},
 duration(duration) {}
};

struct InstantTraceEvent : public TraceEvent<TraceEventType::Instant> {
 InstantTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEvent<TraceEventType::Instant>{
 std::move(name),
 std::move(categories),
 timestamp,
 processId,
 threadId} {}
};

/**
Expand DownExpand Up@@ -83,14 +145,12 @@ class PerformanceTracer {
 PerformanceTracer& operator=(const PerformanceTracer&) = delete;
 ~PerformanceTracer() = default;

 std::unordered_map<std::string, uint32_t> getCustomTracks(
 std::vector<TraceEvent>& events);
 folly::dynamic serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const;
 std::string serializeTraceEventCategories(TraceEventBase* event) const;
 folly::dynamic serializeTraceEvent(TraceEventBase* event) const;

 bool tracing_{false};
 std::vector<TraceEvent> buffer_;
 std::unordered_map<std::string, uint64_t> customTrackIdMap_;
 std::vector<TraceEventBase*> buffer_;
 std::mutex mutex_;
};

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor TraceEvent format#48269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

hoxyq
wants to merge
1
commit into

from

 Closed


Refactor TraceEvent format
#48269
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


121 changes: 76 additions & 45 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,11 @@ bool PerformanceTracer::stopTracingAndCollectEvents(

 tracing_ = false;
 if (buffer_.empty()) {
 customTrackIdMap_.clear();
 return true;
 }

 auto traceEvents = folly::dynamic::array();
 auto savedBuffer = std::move(buffer_);
 buffer_.clear();

 // Register "Main" process
 traceEvents.push_back(folly::dynamic::object(
Expand All@@ -69,27 +68,29 @@ bool PerformanceTracer::stopTracingAndCollectEvents(
 "cat", "__metadata")("name", "thread_name")("ph", "M")("pid", PID)(
 "tid", USER_TIMINGS_DEFAULT_TRACK)("ts", 0));

 auto customTrackIdMap = getCustomTracks(savedBuffer);
 for (const auto& [trackName, trackId] : customTrackIdMap) {
 for (const auto& [trackName, trackId] : customTrackIdMap_) {
 // Register custom tracks
 traceEvents.push_back(folly::dynamic::object(
 "args", folly::dynamic::object("name", trackName))("cat", "__metadata")(
 "name", "thread_name")("ph", "M")("pid", PID)("tid", trackId)("ts", 0));
 }

 for (auto& event : savedBuffer) {
 for (auto event : buffer_) {
 // Emit trace events
 traceEvents.push_back(serializeTraceEvent(event, customTrackIdMap));
 traceEvents.push_back(serializeTraceEvent(event));

 if (traceEvents.size() >= 1000) {
 resultCallback(traceEvents);
 traceEvents = folly::dynamic::array();
 }
 }
 customTrackIdMap_.clear();
 buffer_.clear();

 if (traceEvents.size() >= 1) {
 resultCallback(traceEvents);
 }

 return true;
}

Expand All@@ -100,8 +101,15 @@ void PerformanceTracer::reportMark(
 if (!tracing_) {
 return;
 }
 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MARK, .name = std::string(name), .start = start});

 TraceEventBase* event = new InstantTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 USER_TIMINGS_DEFAULT_TRACK, // FIXME: This should be real thread ID.
 };
 buffer_.push_back(event);
}

void PerformanceTracer::reportMeasure(
Expand All@@ -114,62 +122,85 @@ void PerformanceTracer::reportMeasure(
 return;
 }

 std::optional<std::string> track;
 uint64_t threadId =
 USER_TIMINGS_DEFAULT_TRACK; // FIXME: This should be real thread ID.
 if (trackMetadata.has_value()) {
 track = trackMetadata.value().track;
 std::string trackName = trackMetadata.value().track;

 if (!customTrackIdMap_.contains(trackName)) {
 uint64_t trackId =
 USER_TIMINGS_DEFAULT_TRACK + customTrackIdMap_.size() + 1;
 threadId = trackId;

 customTrackIdMap_.emplace(trackName, trackId);
 }
 }

 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MEASURE,
 .name = std::string(name),
 .start = start,
 .duration = duration,
 .track = track});
 TraceEventBase* event = new CompleteTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 threadId, // FIXME: This should be real thread ID.
 duration};
 buffer_.push_back(event);
}

std::unordered_map<std::string, uint32_t> PerformanceTracer::getCustomTracks(
 std::vector<TraceEvent>& events) {
 std::unordered_map<std::string, uint32_t> trackIdMap;

 uint32_t nextTrack = USER_TIMINGS_DEFAULT_TRACK + 1;
 for (auto& event : events) {
 // Custom tracks are only supported by User Timing "measure" events
 if (event.type != TraceEventType::MEASURE) {
 continue;
std::string PerformanceTracer::serializeTraceEventCategories(
 TraceEventBase* event) const {
 std::string result;

 for (const auto& category : event->categories) {
 switch (category) {
 case TraceEventCategory::UserTiming:
 result += "blink.user_timing";
 break;
 case TraceEventCategory::TimelineEvent:
 result += "disabled-by-default-devtools.timeline";
 break;

 default:
 throw std::runtime_error("Unknown trace event category");
 }

 if (event.track.has_value() && !trackIdMap.contains(event.track.value())) {
 auto trackId = nextTrack++;
 trackIdMap[event.track.value()] = trackId;
 }
 result += ",";
 }

 return trackIdMap;
 if (result.length() > 0) {
 result.pop_back();
 }

 return result;
}

folly::dynamic PerformanceTracer::serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const {
 TraceEventBase* event) const {
 folly::dynamic result = folly::dynamic::object;

 result["args"] = folly::dynamic::object();
 result["cat"] = "blink.user_timing";
 result["name"] = event.name;
 result["pid"] = PID;
 result["ts"] = event.start;
 result["name"] = event->name;
 result["cat"] = serializeTraceEventCategories(event);
 result["args"] = event->args;
 result["ts"] = event->timestamp;
 result["pid"] = event->processId;
 result["tid"] = event->threadId;

 switch (event.type) {
 case TraceEventType::MARK:
 switch (event->type) {
 case TraceEventType::Instant:
 result["ph"] = "I";
 result["tid"] = USER_TIMINGS_DEFAULT_TRACK;

 break;
 case TraceEventType::MEASURE:
 result["dur"] = event.duration;

case TraceEventType::Complete: {
 result["ph"] = "X";
 result["tid"] = event.track.has_value()
 ? customTrackIdMap[event.track.value()]
 : USER_TIMINGS_DEFAULT_TRACK;

 auto completeEvent = static_cast<CompleteTraceEvent*>(event);
 result["dur"] = completeEvent->duration;

 break;
 }

 default:
 throw std::runtime_error("Unknown trace event type");
 }

 return result;
Expand Down

86 changes: 73 additions & 13 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,78 @@ namespace facebook::react::jsinspector_modern {
// design is copied from earlier FuseboxTracer prototype).

enum class TraceEventType {
MARK = 1,
MEASURE = 2,
Instant,
Complete,
};

struct TraceEvent {
 TraceEventType type;
enum class TraceEventCategory {
 UserTiming,
 TimelineEvent,
};

/*
 * Based on the out-of-date "Trace Event Format" document from Google and our
 * findings while reverse engineering the contract between Chrome and Chrome
 * DevTools.

 * https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview?pli=1&tab=t.0#heading=h.yr4qxyxotyw
*/
struct TraceEventBase {
 std::string name;
 uint64_t start;
 uint64_t duration = 0;
 std::optional<std::string> track;
 std::vector<TraceEventCategory> categories;
 TraceEventType type;
 uint64_t timestamp;
 uint64_t processId;
 uint64_t threadId;
 folly::dynamic args = folly::dynamic::object();
};

template <TraceEventType T>
struct TraceEvent : public TraceEventBase {
 TraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEventBase{
 std::move(name),
 std::move(categories),
 T,
 timestamp,
 processId,
 threadId} {}
};

struct CompleteTraceEvent : public TraceEvent<TraceEventType::Complete> {
 uint64_t duration;

 CompleteTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId,
 uint64_t duration)
 : TraceEvent<
 TraceEventType::
 Complete>{std::move(name), std::move(categories), timestamp, processId, threadId},
 duration(duration) {}
};

struct InstantTraceEvent : public TraceEvent<TraceEventType::Instant> {
 InstantTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEvent<TraceEventType::Instant>{
 std::move(name),
 std::move(categories),
 timestamp,
 processId,
 threadId} {}
};

/**
Expand DownExpand Up@@ -83,14 +145,12 @@ class PerformanceTracer {
 PerformanceTracer& operator=(const PerformanceTracer&) = delete;
 ~PerformanceTracer() = default;

 std::unordered_map<std::string, uint32_t> getCustomTracks(
 std::vector<TraceEvent>& events);
 folly::dynamic serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const;
 std::string serializeTraceEventCategories(TraceEventBase* event) const;
 folly::dynamic serializeTraceEvent(TraceEventBase* event) const;

 bool tracing_{false};
 std::vector<TraceEvent> buffer_;
 std::unordered_map<std::string, uint64_t> customTrackIdMap_;
 std::vector<TraceEventBase*> buffer_;
 std::mutex mutex_;
};

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor TraceEvent format#48269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

hoxyq
wants to merge
1
commit into

from

 Closed


Refactor TraceEvent format
#48269
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


121 changes: 76 additions & 45 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,11 @@ bool PerformanceTracer::stopTracingAndCollectEvents(

 tracing_ = false;
 if (buffer_.empty()) {
 customTrackIdMap_.clear();
 return true;
 }

 auto traceEvents = folly::dynamic::array();
 auto savedBuffer = std::move(buffer_);
 buffer_.clear();

 // Register "Main" process
 traceEvents.push_back(folly::dynamic::object(
Expand All@@ -69,27 +68,29 @@ bool PerformanceTracer::stopTracingAndCollectEvents(
 "cat", "__metadata")("name", "thread_name")("ph", "M")("pid", PID)(
 "tid", USER_TIMINGS_DEFAULT_TRACK)("ts", 0));

 auto customTrackIdMap = getCustomTracks(savedBuffer);
 for (const auto& [trackName, trackId] : customTrackIdMap) {
 for (const auto& [trackName, trackId] : customTrackIdMap_) {
 // Register custom tracks
 traceEvents.push_back(folly::dynamic::object(
 "args", folly::dynamic::object("name", trackName))("cat", "__metadata")(
 "name", "thread_name")("ph", "M")("pid", PID)("tid", trackId)("ts", 0));
 }

 for (auto& event : savedBuffer) {
 for (auto event : buffer_) {
 // Emit trace events
 traceEvents.push_back(serializeTraceEvent(event, customTrackIdMap));
 traceEvents.push_back(serializeTraceEvent(event));

 if (traceEvents.size() >= 1000) {
 resultCallback(traceEvents);
 traceEvents = folly::dynamic::array();
 }
 }
 customTrackIdMap_.clear();
 buffer_.clear();

 if (traceEvents.size() >= 1) {
 resultCallback(traceEvents);
 }

 return true;
}

Expand All@@ -100,8 +101,15 @@ void PerformanceTracer::reportMark(
 if (!tracing_) {
 return;
 }
 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MARK, .name = std::string(name), .start = start});

 TraceEventBase* event = new InstantTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 USER_TIMINGS_DEFAULT_TRACK, // FIXME: This should be real thread ID.
 };
 buffer_.push_back(event);
}

void PerformanceTracer::reportMeasure(
Expand All@@ -114,62 +122,85 @@ void PerformanceTracer::reportMeasure(
 return;
 }

 std::optional<std::string> track;
 uint64_t threadId =
 USER_TIMINGS_DEFAULT_TRACK; // FIXME: This should be real thread ID.
 if (trackMetadata.has_value()) {
 track = trackMetadata.value().track;
 std::string trackName = trackMetadata.value().track;

 if (!customTrackIdMap_.contains(trackName)) {
 uint64_t trackId =
 USER_TIMINGS_DEFAULT_TRACK + customTrackIdMap_.size() + 1;
 threadId = trackId;

 customTrackIdMap_.emplace(trackName, trackId);
 }
 }

 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MEASURE,
 .name = std::string(name),
 .start = start,
 .duration = duration,
 .track = track});
 TraceEventBase* event = new CompleteTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 threadId, // FIXME: This should be real thread ID.
 duration};
 buffer_.push_back(event);
}

std::unordered_map<std::string, uint32_t> PerformanceTracer::getCustomTracks(
 std::vector<TraceEvent>& events) {
 std::unordered_map<std::string, uint32_t> trackIdMap;

 uint32_t nextTrack = USER_TIMINGS_DEFAULT_TRACK + 1;
 for (auto& event : events) {
 // Custom tracks are only supported by User Timing "measure" events
 if (event.type != TraceEventType::MEASURE) {
 continue;
std::string PerformanceTracer::serializeTraceEventCategories(
 TraceEventBase* event) const {
 std::string result;

 for (const auto& category : event->categories) {
 switch (category) {
 case TraceEventCategory::UserTiming:
 result += "blink.user_timing";
 break;
 case TraceEventCategory::TimelineEvent:
 result += "disabled-by-default-devtools.timeline";
 break;

 default:
 throw std::runtime_error("Unknown trace event category");
 }

 if (event.track.has_value() && !trackIdMap.contains(event.track.value())) {
 auto trackId = nextTrack++;
 trackIdMap[event.track.value()] = trackId;
 }
 result += ",";
 }

 return trackIdMap;
 if (result.length() > 0) {
 result.pop_back();
 }

 return result;
}

folly::dynamic PerformanceTracer::serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const {
 TraceEventBase* event) const {
 folly::dynamic result = folly::dynamic::object;

 result["args"] = folly::dynamic::object();
 result["cat"] = "blink.user_timing";
 result["name"] = event.name;
 result["pid"] = PID;
 result["ts"] = event.start;
 result["name"] = event->name;
 result["cat"] = serializeTraceEventCategories(event);
 result["args"] = event->args;
 result["ts"] = event->timestamp;
 result["pid"] = event->processId;
 result["tid"] = event->threadId;

 switch (event.type) {
 case TraceEventType::MARK:
 switch (event->type) {
 case TraceEventType::Instant:
 result["ph"] = "I";
 result["tid"] = USER_TIMINGS_DEFAULT_TRACK;

 break;
 case TraceEventType::MEASURE:
 result["dur"] = event.duration;

case TraceEventType::Complete: {
 result["ph"] = "X";
 result["tid"] = event.track.has_value()
 ? customTrackIdMap[event.track.value()]
 : USER_TIMINGS_DEFAULT_TRACK;

 auto completeEvent = static_cast<CompleteTraceEvent*>(event);
 result["dur"] = completeEvent->duration;

 break;
 }

 default:
 throw std::runtime_error("Unknown trace event type");
 }

 return result;
Expand Down

86 changes: 73 additions & 13 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,78 @@ namespace facebook::react::jsinspector_modern {
// design is copied from earlier FuseboxTracer prototype).

enum class TraceEventType {
MARK = 1,
MEASURE = 2,
Instant,
Complete,
};

struct TraceEvent {
 TraceEventType type;
enum class TraceEventCategory {
 UserTiming,
 TimelineEvent,
};

/*
 * Based on the out-of-date "Trace Event Format" document from Google and our
 * findings while reverse engineering the contract between Chrome and Chrome
 * DevTools.

 * https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview?pli=1&tab=t.0#heading=h.yr4qxyxotyw
*/
struct TraceEventBase {
 std::string name;
 uint64_t start;
 uint64_t duration = 0;
 std::optional<std::string> track;
 std::vector<TraceEventCategory> categories;
 TraceEventType type;
 uint64_t timestamp;
 uint64_t processId;
 uint64_t threadId;
 folly::dynamic args = folly::dynamic::object();
};

template <TraceEventType T>
struct TraceEvent : public TraceEventBase {
 TraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEventBase{
 std::move(name),
 std::move(categories),
 T,
 timestamp,
 processId,
 threadId} {}
};

struct CompleteTraceEvent : public TraceEvent<TraceEventType::Complete> {
 uint64_t duration;

 CompleteTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId,
 uint64_t duration)
 : TraceEvent<
 TraceEventType::
 Complete>{std::move(name), std::move(categories), timestamp, processId, threadId},
 duration(duration) {}
};

struct InstantTraceEvent : public TraceEvent<TraceEventType::Instant> {
 InstantTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEvent<TraceEventType::Instant>{
 std::move(name),
 std::move(categories),
 timestamp,
 processId,
 threadId} {}
};

/**
Expand DownExpand Up@@ -83,14 +145,12 @@ class PerformanceTracer {
 PerformanceTracer& operator=(const PerformanceTracer&) = delete;
 ~PerformanceTracer() = default;

 std::unordered_map<std::string, uint32_t> getCustomTracks(
 std::vector<TraceEvent>& events);
 folly::dynamic serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const;
 std::string serializeTraceEventCategories(TraceEventBase* event) const;
 folly::dynamic serializeTraceEvent(TraceEventBase* event) const;

 bool tracing_{false};
 std::vector<TraceEvent> buffer_;
 std::unordered_map<std::string, uint64_t> customTrackIdMap_;
 std::vector<TraceEventBase*> buffer_;
 std::mutex mutex_;
};

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Refactor TraceEvent format#48269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

hoxyq
wants to merge
1
commit into

from

 Closed


Refactor TraceEvent format
#48269
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


121 changes: 76 additions & 45 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,11 @@ bool PerformanceTracer::stopTracingAndCollectEvents(

 tracing_ = false;
 if (buffer_.empty()) {
 customTrackIdMap_.clear();
 return true;
 }

 auto traceEvents = folly::dynamic::array();
 auto savedBuffer = std::move(buffer_);
 buffer_.clear();

 // Register "Main" process
 traceEvents.push_back(folly::dynamic::object(
Expand All@@ -69,27 +68,29 @@ bool PerformanceTracer::stopTracingAndCollectEvents(
 "cat", "__metadata")("name", "thread_name")("ph", "M")("pid", PID)(
 "tid", USER_TIMINGS_DEFAULT_TRACK)("ts", 0));

 auto customTrackIdMap = getCustomTracks(savedBuffer);
 for (const auto& [trackName, trackId] : customTrackIdMap) {
 for (const auto& [trackName, trackId] : customTrackIdMap_) {
 // Register custom tracks
 traceEvents.push_back(folly::dynamic::object(
 "args", folly::dynamic::object("name", trackName))("cat", "__metadata")(
 "name", "thread_name")("ph", "M")("pid", PID)("tid", trackId)("ts", 0));
 }

 for (auto& event : savedBuffer) {
 for (auto event : buffer_) {
 // Emit trace events
 traceEvents.push_back(serializeTraceEvent(event, customTrackIdMap));
 traceEvents.push_back(serializeTraceEvent(event));

 if (traceEvents.size() >= 1000) {
 resultCallback(traceEvents);
 traceEvents = folly::dynamic::array();
 }
 }
 customTrackIdMap_.clear();
 buffer_.clear();

 if (traceEvents.size() >= 1) {
 resultCallback(traceEvents);
 }

 return true;
}

Expand All@@ -100,8 +101,15 @@ void PerformanceTracer::reportMark(
 if (!tracing_) {
 return;
 }
 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MARK, .name = std::string(name), .start = start});

 TraceEventBase* event = new InstantTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 USER_TIMINGS_DEFAULT_TRACK, // FIXME: This should be real thread ID.
 };
 buffer_.push_back(event);
}

void PerformanceTracer::reportMeasure(
Expand All@@ -114,62 +122,85 @@ void PerformanceTracer::reportMeasure(
 return;
 }

 std::optional<std::string> track;
 uint64_t threadId =
 USER_TIMINGS_DEFAULT_TRACK; // FIXME: This should be real thread ID.
 if (trackMetadata.has_value()) {
 track = trackMetadata.value().track;
 std::string trackName = trackMetadata.value().track;

 if (!customTrackIdMap_.contains(trackName)) {
 uint64_t trackId =
 USER_TIMINGS_DEFAULT_TRACK + customTrackIdMap_.size() + 1;
 threadId = trackId;

 customTrackIdMap_.emplace(trackName, trackId);
 }
 }

 buffer_.push_back(TraceEvent{
 .type = TraceEventType::MEASURE,
 .name = std::string(name),
 .start = start,
 .duration = duration,
 .track = track});
 TraceEventBase* event = new CompleteTraceEvent{
 std::string(name),
 std::vector{TraceEventCategory::UserTiming},
 start,
 PID, // FIXME: This should be real process ID.
 threadId, // FIXME: This should be real thread ID.
 duration};
 buffer_.push_back(event);
}

std::unordered_map<std::string, uint32_t> PerformanceTracer::getCustomTracks(
 std::vector<TraceEvent>& events) {
 std::unordered_map<std::string, uint32_t> trackIdMap;

 uint32_t nextTrack = USER_TIMINGS_DEFAULT_TRACK + 1;
 for (auto& event : events) {
 // Custom tracks are only supported by User Timing "measure" events
 if (event.type != TraceEventType::MEASURE) {
 continue;
std::string PerformanceTracer::serializeTraceEventCategories(
 TraceEventBase* event) const {
 std::string result;

 for (const auto& category : event->categories) {
 switch (category) {
 case TraceEventCategory::UserTiming:
 result += "blink.user_timing";
 break;
 case TraceEventCategory::TimelineEvent:
 result += "disabled-by-default-devtools.timeline";
 break;

 default:
 throw std::runtime_error("Unknown trace event category");
 }

 if (event.track.has_value() && !trackIdMap.contains(event.track.value())) {
 auto trackId = nextTrack++;
 trackIdMap[event.track.value()] = trackId;
 }
 result += ",";
 }

 return trackIdMap;
 if (result.length() > 0) {
 result.pop_back();
 }

 return result;
}

folly::dynamic PerformanceTracer::serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const {
 TraceEventBase* event) const {
 folly::dynamic result = folly::dynamic::object;

 result["args"] = folly::dynamic::object();
 result["cat"] = "blink.user_timing";
 result["name"] = event.name;
 result["pid"] = PID;
 result["ts"] = event.start;
 result["name"] = event->name;
 result["cat"] = serializeTraceEventCategories(event);
 result["args"] = event->args;
 result["ts"] = event->timestamp;
 result["pid"] = event->processId;
 result["tid"] = event->threadId;

 switch (event.type) {
 case TraceEventType::MARK:
 switch (event->type) {
 case TraceEventType::Instant:
 result["ph"] = "I";
 result["tid"] = USER_TIMINGS_DEFAULT_TRACK;

 break;
 case TraceEventType::MEASURE:
 result["dur"] = event.duration;

case TraceEventType::Complete: {
 result["ph"] = "X";
 result["tid"] = event.track.has_value()
 ? customTrackIdMap[event.track.value()]
 : USER_TIMINGS_DEFAULT_TRACK;

 auto completeEvent = static_cast<CompleteTraceEvent*>(event);
 result["dur"] = completeEvent->duration;

 break;
 }

 default:
 throw std::runtime_error("Unknown trace event type");
 }

 return result;
Expand Down

86 changes: 73 additions & 13 deletions
packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,78 @@ namespace facebook::react::jsinspector_modern {
// design is copied from earlier FuseboxTracer prototype).

enum class TraceEventType {
MARK = 1,
MEASURE = 2,
Instant,
Complete,
};

struct TraceEvent {
 TraceEventType type;
enum class TraceEventCategory {
 UserTiming,
 TimelineEvent,
};

/*
 * Based on the out-of-date "Trace Event Format" document from Google and our
 * findings while reverse engineering the contract between Chrome and Chrome
 * DevTools.

 * https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview?pli=1&tab=t.0#heading=h.yr4qxyxotyw
*/
struct TraceEventBase {
 std::string name;
 uint64_t start;
 uint64_t duration = 0;
 std::optional<std::string> track;
 std::vector<TraceEventCategory> categories;
 TraceEventType type;
 uint64_t timestamp;
 uint64_t processId;
 uint64_t threadId;
 folly::dynamic args = folly::dynamic::object();
};

template <TraceEventType T>
struct TraceEvent : public TraceEventBase {
 TraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEventBase{
 std::move(name),
 std::move(categories),
 T,
 timestamp,
 processId,
 threadId} {}
};

struct CompleteTraceEvent : public TraceEvent<TraceEventType::Complete> {
 uint64_t duration;

 CompleteTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId,
 uint64_t duration)
 : TraceEvent<
 TraceEventType::
 Complete>{std::move(name), std::move(categories), timestamp, processId, threadId},
 duration(duration) {}
};

struct InstantTraceEvent : public TraceEvent<TraceEventType::Instant> {
 InstantTraceEvent(
 std::string name,
 std::vector<TraceEventCategory> categories,
 uint64_t timestamp,
 uint64_t processId,
 uint64_t threadId)
 : TraceEvent<TraceEventType::Instant>{
 std::move(name),
 std::move(categories),
 timestamp,
 processId,
 threadId} {}
};

/**
Expand DownExpand Up@@ -83,14 +145,12 @@ class PerformanceTracer {
 PerformanceTracer& operator=(const PerformanceTracer&) = delete;
 ~PerformanceTracer() = default;

 std::unordered_map<std::string, uint32_t> getCustomTracks(
 std::vector<TraceEvent>& events);
 folly::dynamic serializeTraceEvent(
 TraceEvent& event,
 std::unordered_map<std::string, uint32_t>& customTrackIdMap) const;
 std::string serializeTraceEventCategories(TraceEventBase* event) const;
 folly::dynamic serializeTraceEvent(TraceEventBase* event) const;

 bool tracing_{false};
 std::vector<TraceEvent> buffer_;
 std::unordered_map<std::string, uint64_t> customTrackIdMap_;
 std::vector<TraceEventBase*> buffer_;
 std::mutex mutex_;
};

Expand Down