Skip to content

Fix "Consecutive" Event Logs in Performance Track #34659

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

Merged
merged 3 commits into from
Oct 1, 2025
+29 −25
Merged

Fix "Consecutive" Event Logs in Performance Track #34659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1d4c82
Reset EventTime when clearing timers
sebmarkbage Sep 30, 2025
f9dfbe1
copypasta
sebmarkbage Sep 30, 2025
a7f364d
Update ReactProfilerTimer.js
rickhanlonii Oct 1, 2025
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
12 changes: 6 additions & 6 deletions packages/react-reconciler/src/ReactFiberWorkLoop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ import {
blockingUpdateComponentName,
blockingEventTime,
blockingEventType,
blockingEventIsRepeat,
blockingEventRepeatTime,
blockingSuspendedTime,
gestureClampTime,
gestureUpdateTime,
Expand All @@ -291,7 +291,7 @@ import {
gestureUpdateComponentName,
gestureEventTime,
gestureEventType,
gestureEventIsRepeat,
gestureEventRepeatTime,
gestureSuspendedTime,
transitionClampTime,
transitionStartTime,
Expand All @@ -302,7 +302,7 @@ import {
transitionUpdateComponentName,
transitionEventTime,
transitionEventType,
transitionEventIsRepeat,
transitionEventRepeatTime,
transitionSuspendedTime,
clearBlockingTimers,
clearGestureTimers,
Expand Down Expand Up @@ -2017,7 +2017,7 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
clampedUpdateTime,
clampedEventTime,
gestureEventType,
gestureEventIsRepeat,
gestureEventRepeatTime > 0,
gestureUpdateType === PINGED_UPDATE,
renderStartTime,
gestureUpdateTask,
Expand Down Expand Up @@ -2065,7 +2065,7 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
clampedUpdateTime,
clampedEventTime,
blockingEventType,
blockingEventIsRepeat,
blockingEventRepeatTime > 0,
blockingUpdateType === SPAWNED_UPDATE,
blockingUpdateType === PINGED_UPDATE,
renderStartTime,
Expand Down Expand Up @@ -2119,7 +2119,7 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
clampedUpdateTime,
clampedEventTime,
transitionEventType,
transitionEventIsRepeat,
transitionEventRepeatTime > 0,
transitionUpdateType === PINGED_UPDATE,
renderStartTime,
transitionUpdateTask,
Expand Down
42 changes: 23 additions & 19 deletions packages/react-reconciler/src/ReactProfilerTimer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export let blockingUpdateMethodName: null | string = null; // The name of the me
export let blockingUpdateComponentName: null | string = null; // The name of the component where first sync update happened.
export let blockingEventTime: number = -1.1; // Event timeStamp of the first setState.
export let blockingEventType: null | string = null; // Event type of the first setState.
export let blockingEventIsRepeat: boolean = false;
export let blockingEventRepeatTime: number = -1.1;
export let blockingSuspendedTime: number = -1.1;

export let gestureClampTime: number = -0;
Expand All @@ -84,7 +84,7 @@ export let gestureUpdateMethodName: null | string = null; // The name of the met
export let gestureUpdateComponentName: null | string = null; // The name of the component where first gesture update happened.
export let gestureEventTime: number = -1.1; // Event timeStamp of the first setState.
export let gestureEventType: null | string = null; // Event type of the first setState.
export let gestureEventIsRepeat: boolean = false;
export let gestureEventRepeatTime: number = -1.1;
export let gestureSuspendedTime: number = -1.1;

// TODO: This should really be one per Transition lane.
Expand All @@ -97,7 +97,7 @@ export let transitionUpdateMethodName: null | string = null; // The name of the
export let transitionUpdateComponentName: null | string = null; // The name of the component where first transition update happened.
export let transitionEventTime: number = -1.1; // Event timeStamp of the first transition.
export let transitionEventType: null | string = null; // Event type of the first transition.
export let transitionEventIsRepeat: boolean = false;
export let transitionEventRepeatTime: number = -1.1;
export let transitionSuspendedTime: number = -1.1;

export let retryClampTime: number = -0;
Expand Down Expand Up @@ -136,10 +136,10 @@ export function startUpdateTimerByLane(
const newEventTime = resolveEventTimeStamp();
const newEventType = resolveEventType();
if (
newEventTime !== gestureEventTime ||
newEventTime !== gestureEventRepeatTime ||
newEventType !== gestureEventType
) {
gestureEventIsRepeat = false;
gestureEventRepeatTime = -1.1;
}
gestureEventTime = newEventTime;
gestureEventType = newEventType;
Expand All @@ -158,10 +158,10 @@ export function startUpdateTimerByLane(
const newEventTime = resolveEventTimeStamp();
const newEventType = resolveEventType();
if (
newEventTime !== blockingEventTime ||
newEventTime !== blockingEventRepeatTime ||
newEventType !== blockingEventType
) {
blockingEventIsRepeat = false;
blockingEventRepeatTime = -1.1;
} else if (newEventType !== null) {
// If this is a second update in the same event, we treat it as a spawned update.
// This might be a microtask spawned from useEffect, multiple flushSync or
Expand All @@ -183,10 +183,10 @@ export function startUpdateTimerByLane(
const newEventTime = resolveEventTimeStamp();
const newEventType = resolveEventType();
if (
newEventTime !== transitionEventTime ||
newEventTime !== transitionEventRepeatTime ||
newEventType !== transitionEventType
) {
transitionEventIsRepeat = false;
transitionEventRepeatTime = -1.1;
}
transitionEventTime = newEventTime;
transitionEventType = newEventType;
Expand All @@ -211,10 +211,10 @@ export function startHostActionTimer(fiber: Fiber): void {
const newEventTime = resolveEventTimeStamp();
const newEventType = resolveEventType();
if (
newEventTime !== blockingEventTime ||
newEventTime !== blockingEventRepeatTime ||
newEventType !== blockingEventType
) {
blockingEventIsRepeat = false;
blockingEventRepeatTime = -1.1;
} else if (newEventType !== null) {
// If this is a second update in the same event, we treat it as a spawned update.
// This might be a microtask spawned from useEffect, multiple flushSync or
Expand All @@ -232,10 +232,10 @@ export function startHostActionTimer(fiber: Fiber): void {
const newEventTime = resolveEventTimeStamp();
const newEventType = resolveEventType();
if (
newEventTime !== transitionEventTime ||
newEventTime !== transitionEventRepeatTime ||
newEventType !== transitionEventType
) {
transitionEventIsRepeat = false;
transitionEventRepeatTime = -1.1;
}
transitionEventTime = newEventTime;
transitionEventType = newEventType;
Expand Down Expand Up @@ -290,7 +290,8 @@ export function clearBlockingTimers(): void {
blockingUpdateMethodName = null;
blockingUpdateComponentName = null;
blockingSuspendedTime = -1.1;
blockingEventIsRepeat = true;
blockingEventRepeatTime = blockingEventTime;
blockingEventTime = -1.1;
blockingClampTime = now();
}

Expand All @@ -303,10 +304,10 @@ export function startAsyncTransitionTimer(): void {
const newEventTime = resolveEventTimeStamp();
const newEventType = resolveEventType();
if (
newEventTime !== transitionEventTime ||
newEventTime !== transitionEventRepeatTime ||
newEventType !== transitionEventType
) {
transitionEventIsRepeat = false;
transitionEventRepeatTime = -1.1;
}
transitionEventTime = newEventTime;
transitionEventType = newEventType;
Expand All @@ -327,7 +328,8 @@ export function clearTransitionTimers(): void {
transitionUpdateTime = -1.1;
transitionUpdateType = 0;
transitionSuspendedTime = -1.1;
transitionEventIsRepeat = true;
transitionEventRepeatTime = transitionEventTime;
transitionEventTime = -1.1;
transitionClampTime = now();
}

Expand All @@ -340,7 +342,8 @@ export function clearGestureTimers(): void {
gestureUpdateTime = -1.1;
gestureUpdateType = 0;
gestureSuspendedTime = -1.1;
gestureEventIsRepeat = true;
gestureEventRepeatTime = gestureEventTime;
gestureEventTime = -1.1;
gestureClampTime = now();
}

Expand All @@ -350,7 +353,8 @@ export function clearGestureUpdates(): void {
gestureUpdateTime = -1.1;
gestureUpdateType = 0;
gestureSuspendedTime = -1.1;
gestureEventIsRepeat = true;
gestureEventRepeatTime = gestureEventTime;
gestureEventTime = -1.1;
}

export function clampBlockingTimers(finalTime: number): void {
Expand Down
Loading