From d771ad99651405d54ba2b3b6b94378fa8ac58590 Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sebastian@calyptus.eu>
Date: Mon, 16 Sep 2024 23:44:23 -0400
Subject: [PATCH] Track self time and color the track entry by the self time

---
 .../src/ReactFiberCommitWork.js               |  5 ++
 .../src/ReactFiberPerformanceTrack.js         | 46 +++++++++++--------
 .../src/ReactProfilerTimer.js                 |  3 ++
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js
index 4c66470342c89..5965dbe8db0a8 100644
--- a/packages/react-reconciler/src/ReactFiberCommitWork.js
+++ b/packages/react-reconciler/src/ReactFiberCommitWork.js
@@ -109,6 +109,7 @@ import {
   popComponentEffectStart,
   componentEffectStartTime,
   componentEffectEndTime,
+  componentEffectDuration,
 } from './ReactProfilerTimer';
 import {
   logComponentRender,
@@ -608,6 +609,7 @@ function commitLayoutEffectOnFiber(
       finishedWork,
       componentEffectStartTime,
       componentEffectEndTime,
+      componentEffectDuration,
     );
   }
 
@@ -2105,6 +2107,7 @@ function commitMutationEffectsOnFiber(
       finishedWork,
       componentEffectStartTime,
       componentEffectEndTime,
+      componentEffectDuration,
     );
   }
 
@@ -2926,6 +2929,7 @@ function commitPassiveMountOnFiber(
       finishedWork,
       componentEffectStartTime,
       componentEffectEndTime,
+      componentEffectDuration,
     );
   }
 
@@ -3444,6 +3448,7 @@ function commitPassiveUnmountOnFiber(finishedWork: Fiber): void {
       finishedWork,
       componentEffectStartTime,
       componentEffectEndTime,
+      componentEffectDuration,
     );
   }
 
diff --git a/packages/react-reconciler/src/ReactFiberPerformanceTrack.js b/packages/react-reconciler/src/ReactFiberPerformanceTrack.js
index 9c6c7ff8a80d3..82d086c7adec5 100644
--- a/packages/react-reconciler/src/ReactFiberPerformanceTrack.js
+++ b/packages/react-reconciler/src/ReactFiberPerformanceTrack.js
@@ -38,24 +38,9 @@ const reusableComponentOptions = {
   },
 };
 
-const reusableComponentEffectDevToolDetails = {
-  dataType: 'track-entry',
-  color: 'secondary',
-  track: 'Blocking', // Lane
-  trackGroup: TRACK_GROUP,
-};
-const reusableComponentEffectOptions = {
-  start: -0,
-  end: -0,
-  detail: {
-    devtools: reusableComponentEffectDevToolDetails,
-  },
-};
-
 export function setCurrentTrackFromLanes(lanes: number): void {
-  reusableComponentEffectDevToolDetails.track =
-    reusableComponentDevToolDetails.track =
-      getGroupNameOfHighestPriorityLane(lanes);
+  reusableComponentDevToolDetails.track =
+    getGroupNameOfHighestPriorityLane(lanes);
 }
 
 export function logComponentRender(
@@ -69,6 +54,18 @@ export function logComponentRender(
     return;
   }
   if (supportsUserTiming) {
+    let selfTime: number = (fiber.actualDuration: any);
+    for (let child = fiber.child; child !== null; child = child.sibling) {
+      selfTime -= (child.actualDuration: any);
+    }
+    reusableComponentDevToolDetails.color =
+      selfTime < 0.5
+        ? 'primary-light'
+        : selfTime < 10
+          ? 'primary'
+          : selfTime < 100
+            ? 'primary-dark'
+            : 'error';
     reusableComponentOptions.start = startTime;
     reusableComponentOptions.end = endTime;
     performance.measure(name, reusableComponentOptions);
@@ -79,6 +76,7 @@ export function logComponentEffect(
   fiber: Fiber,
   startTime: number,
   endTime: number,
+  selfTime: number,
 ): void {
   const name = getComponentNameFromFiber(fiber);
   if (name === null) {
@@ -86,8 +84,16 @@ export function logComponentEffect(
     return;
   }
   if (supportsUserTiming) {
-    reusableComponentEffectOptions.start = startTime;
-    reusableComponentEffectOptions.end = endTime;
-    performance.measure(name, reusableComponentEffectOptions);
+    reusableComponentDevToolDetails.color =
+      selfTime < 1
+        ? 'secondary-light'
+        : selfTime < 100
+          ? 'secondary'
+          : selfTime < 500
+            ? 'secondary-dark'
+            : 'error';
+    reusableComponentOptions.start = startTime;
+    reusableComponentOptions.end = endTime;
+    performance.measure(name, reusableComponentOptions);
   }
 }
diff --git a/packages/react-reconciler/src/ReactProfilerTimer.js b/packages/react-reconciler/src/ReactProfilerTimer.js
index da450d7f28f52..d65ca0a7544ee 100644
--- a/packages/react-reconciler/src/ReactProfilerTimer.js
+++ b/packages/react-reconciler/src/ReactProfilerTimer.js
@@ -25,6 +25,7 @@ export let completeTime: number = -0;
 export let commitTime: number = -0;
 export let profilerStartTime: number = -1.1;
 export let profilerEffectDuration: number = -0;
+export let componentEffectDuration: number = -0;
 export let componentEffectStartTime: number = -1.1;
 export let componentEffectEndTime: number = -1.1;
 
@@ -72,6 +73,7 @@ export function pushComponentEffectStart(): number {
   }
   const prevEffectStart = componentEffectStartTime;
   componentEffectStartTime = -1.1; // Track the next start.
+  componentEffectDuration = -0; // Reset component level duration.
   return prevEffectStart;
 }
 
@@ -211,6 +213,7 @@ export function recordEffectDuration(fiber: Fiber): void {
     // Store duration on the next nearest Profiler ancestor
     // Or the root (for the DevTools Profiler to read)
     profilerEffectDuration += elapsedTime;
+    componentEffectDuration += elapsedTime;
 
     // Keep track of the last end time of the effects.
     componentEffectEndTime = endTime;