Unify startEffectTimer and recordEffectDuration

We infer if this was layout or passive duration when we propagate the number in the phase.

We can also just use the same start timer as for render since they don't overlap.

Author: sebmarkbage

packages/react-reconciler/src/ReactFiberCommitEffects.js

@@ -31,10 +31,8 @@ import {NoFlags} from './ReactFiberFlags';
 import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFromFiber';
 import {resolveClassComponentProps} from './ReactFiberClassComponent';
 import {
-  recordLayoutEffectDuration,
-  startLayoutEffectTimer,
-  recordPassiveEffectDuration,
-  startPassiveEffectTimer,
+  recordEffectDuration,
+  startEffectTimer,
   isCurrentUpdateNested,
 } from './ReactProfilerTimer';
 import {NoMode, ProfileMode} from './ReactTypeOfMode';
@@ -91,9 +89,9 @@ export function commitHookLayoutEffects(
   // e.g. a destroy function in one component should never override a ref set
   // by a create function in another component during the same commit.
   if (shouldProfile(finishedWork)) {
-    startLayoutEffectTimer();
+    startEffectTimer();
     commitHookEffectListMount(hookFlags, finishedWork);
-    recordLayoutEffectDuration(finishedWork);
+    recordEffectDuration(finishedWork);
   } else {
     commitHookEffectListMount(hookFlags, finishedWork);
   }
@@ -110,13 +108,13 @@ export function commitHookLayoutUnmountEffects(
   // e.g. a destroy function in one component should never override a ref set
   // by a create function in another component during the same commit.
   if (shouldProfile(finishedWork)) {
-    startLayoutEffectTimer();
+    startEffectTimer();
     commitHookEffectListUnmount(
       hookFlags,
       finishedWork,
       nearestMountedAncestor,
     );
-    recordLayoutEffectDuration(finishedWork);
+    recordEffectDuration(finishedWork);
   } else {
     commitHookEffectListUnmount(
       hookFlags,
@@ -292,9 +290,9 @@ export function commitHookPassiveMountEffects(
   hookFlags: HookFlags,
 ) {
   if (shouldProfile(finishedWork)) {
-    startPassiveEffectTimer();
+    startEffectTimer();
     commitHookEffectListMount(hookFlags, finishedWork);
-    recordPassiveEffectDuration(finishedWork);
+    recordEffectDuration(finishedWork);
   } else {
     commitHookEffectListMount(hookFlags, finishedWork);
   }
@@ -306,13 +304,13 @@ export function commitHookPassiveUnmountEffects(
   hookFlags: HookFlags,
 ) {
   if (shouldProfile(finishedWork)) {
-    startPassiveEffectTimer();
+    startEffectTimer();
     commitHookEffectListUnmount(
       hookFlags,
       finishedWork,
       nearestMountedAncestor,
     );
-    recordPassiveEffectDuration(finishedWork);
+    recordEffectDuration(finishedWork);
   } else {
     commitHookEffectListUnmount(
       hookFlags,
@@ -360,7 +358,7 @@ export function commitClassLayoutLifecycles(
       }
     }
     if (shouldProfile(finishedWork)) {
-      startLayoutEffectTimer();
+      startEffectTimer();
       if (__DEV__) {
         runWithFiberInDEV(
           finishedWork,
@@ -375,7 +373,7 @@ export function commitClassLayoutLifecycles(
           captureCommitPhaseError(finishedWork, finishedWork.return, error);
         }
       }
-      recordLayoutEffectDuration(finishedWork);
+      recordEffectDuration(finishedWork);
     } else {
       if (__DEV__) {
         runWithFiberInDEV(
@@ -431,7 +429,7 @@ export function commitClassLayoutLifecycles(
       }
     }
     if (shouldProfile(finishedWork)) {
-      startLayoutEffectTimer();
+      startEffectTimer();
       if (__DEV__) {
         runWithFiberInDEV(
           finishedWork,
@@ -453,7 +451,7 @@ export function commitClassLayoutLifecycles(
           captureCommitPhaseError(finishedWork, finishedWork.return, error);
         }
       }
-      recordLayoutEffectDuration(finishedWork);
+      recordEffectDuration(finishedWork);
     } else {
       if (__DEV__) {
         runWithFiberInDEV(
@@ -706,7 +704,7 @@ export function safelyCallComponentWillUnmount(
   );
   instance.state = current.memoizedState;
   if (shouldProfile(current)) {
-    startLayoutEffectTimer();
+    startEffectTimer();
     if (__DEV__) {
       runWithFiberInDEV(
         current,
@@ -722,7 +720,7 @@ export function safelyCallComponentWillUnmount(
         captureCommitPhaseError(current, nearestMountedAncestor, error);
       }
     }
-    recordLayoutEffectDuration(current);
+    recordEffectDuration(current);
   } else {
     if (__DEV__) {
       runWithFiberInDEV(
@@ -763,10 +761,10 @@ function commitAttachRef(finishedWork: Fiber) {
     if (typeof ref === 'function') {
       if (shouldProfile(finishedWork)) {
         try {
-          startLayoutEffectTimer();
+          startEffectTimer();
           finishedWork.refCleanup = ref(instanceToUse);
         } finally {
-          recordLayoutEffectDuration(finishedWork);
+          recordEffectDuration(finishedWork);
         }
       } else {
         finishedWork.refCleanup = ref(instanceToUse);
@@ -820,14 +818,14 @@ export function safelyDetachRef(
       try {
         if (shouldProfile(current)) {
           try {
-            startLayoutEffectTimer();
+            startEffectTimer();
             if (__DEV__) {
               runWithFiberInDEV(current, refCleanup);
             } else {
               refCleanup();
             }
           } finally {
-            recordLayoutEffectDuration(current);
+            recordEffectDuration(current);
           }
         } else {
           if (__DEV__) {
@@ -850,14 +848,14 @@ export function safelyDetachRef(
       try {
         if (shouldProfile(current)) {
           try {
-            startLayoutEffectTimer();
+            startEffectTimer();
             if (__DEV__) {
               (runWithFiberInDEV(current, ref, null): void);
             } else {
               ref(null);
             }
           } finally {
-            recordLayoutEffectDuration(current);
+            recordEffectDuration(current);
           }
         } else {
           if (__DEV__) {

packages/react-reconciler/src/ReactProfilerTimer.js

@@ -37,8 +37,6 @@ export type ProfilerTimer = {
 let completeTime: number = -0;
 let commitTime: number = -0;
 let profilerStartTime: number = -1.1;
-let layoutEffectStartTime: number = -1.1;
-let passiveEffectStartTime: number = -1.1;
 let profilerEffectDuration: number = -0;
 
 function pushNestedEffectDurations(): number {
@@ -181,50 +179,27 @@ function stopProfilerTimerIfRunningAndRecordIncompleteDuration(
   }
 }
 
-function recordLayoutEffectDuration(fiber: Fiber): void {
+function recordEffectDuration(fiber: Fiber): void {
   if (!enableProfilerTimer || !enableProfilerCommitHooks) {
     return;
   }
 
-  if (layoutEffectStartTime >= 0) {
-    const elapsedTime = now() - layoutEffectStartTime;
-
-    layoutEffectStartTime = -1;
-
-    // Store duration on the next nearest Profiler ancestor
-    // Or the root (for the DevTools Profiler to read)
-    profilerEffectDuration += elapsedTime;
-  }
-}
-
-function recordPassiveEffectDuration(fiber: Fiber): void {
-  if (!enableProfilerTimer || !enableProfilerCommitHooks) {
-    return;
-  }
-
-  if (passiveEffectStartTime >= 0) {
-    const elapsedTime = now() - passiveEffectStartTime;
+  if (profilerStartTime >= 0) {
+    const elapsedTime = now() - profilerStartTime;
 
-    passiveEffectStartTime = -1;
+    profilerStartTime = -1;
 
     // Store duration on the next nearest Profiler ancestor
     // Or the root (for the DevTools Profiler to read)
     profilerEffectDuration += elapsedTime;
   }
 }
 
-function startLayoutEffectTimer(): void {
-  if (!enableProfilerTimer || !enableProfilerCommitHooks) {
-    return;
-  }
-  layoutEffectStartTime = now();
-}
-
-function startPassiveEffectTimer(): void {
+function startEffectTimer(): void {
   if (!enableProfilerTimer || !enableProfilerCommitHooks) {
     return;
   }
-  passiveEffectStartTime = now();
+  profilerStartTime = now();
 }
 
 function transferActualDuration(fiber: Fiber): void {
@@ -246,11 +221,9 @@ export {
   recordCommitTime,
   isCurrentUpdateNested,
   markNestedUpdateScheduled,
-  recordLayoutEffectDuration,
-  recordPassiveEffectDuration,
+  recordEffectDuration,
   resetNestedUpdateFlag,
-  startLayoutEffectTimer,
-  startPassiveEffectTimer,
+  startEffectTimer,
   startProfilerTimer,
   stopProfilerTimerIfRunning,
   stopProfilerTimerIfRunningAndRecordDuration,