@@ -168,10 +164,10 @@ const tabsWithSchedulingProfiler = [
...tabs,
null, // Divider/separator
{
- id: 'scheduling-profiler',
- icon: 'scheduling-profiler',
- label: 'Scheduling',
- title: 'Scheduling Profiler',
+ id: 'timeline',
+ icon: 'timeline',
+ label: 'Timeline',
+ title: 'Timeline',
},
];
diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilerContext.js b/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilerContext.js
index d5e43dc6a3d2..6e486091e141 100644
--- a/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilerContext.js
+++ b/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilerContext.js
@@ -19,8 +19,8 @@ import {StoreContext} from '../context';
import type {ProfilingDataFrontend} from './types';
-// TODO (scheduling profiler) Should this be its own context?
-export type TabID = 'flame-chart' | 'ranked-chart' | 'scheduling-profiler';
+// TODO (timeline) Should this be its own context?
+export type TabID = 'flame-chart' | 'ranked-chart' | 'timeline';
export type Context = {|
// Which tab is selected in the Profiler UI?
diff --git a/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilingImportExportButtons.js b/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilingImportExportButtons.js
index 94cd201d4575..0e294ffe29cb 100644
--- a/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilingImportExportButtons.js
+++ b/packages/react-devtools-shared/src/devtools/views/Profiler/ProfilingImportExportButtons.js
@@ -123,7 +123,7 @@ export default function ProfilingImportExportButtons() {
className={styles.Input}
type="file"
onChange={
- selectedTabID === 'scheduling-profiler'
+ selectedTabID === 'timeline'
? importSchedulingProfilerDataWrapper
: importProfilerData
}
@@ -140,7 +140,7 @@ export default function ProfilingImportExportButtons() {
disabled={
isProfiling ||
!profilerStore.didRecordCommits ||
- selectedTabID === 'scheduling-profiler'
+ selectedTabID === 'timeline'
}
onClick={downloadData}
title="Save profile...">
diff --git a/packages/react-devtools-shared/src/dynamicImportCache.js b/packages/react-devtools-shared/src/dynamicImportCache.js
index 72c0aa708db5..b31d9602c6b8 100644
--- a/packages/react-devtools-shared/src/dynamicImportCache.js
+++ b/packages/react-devtools-shared/src/dynamicImportCache.js
@@ -74,7 +74,7 @@ export function loadModule(moduleLoaderFunction: ModuleLoaderFunction): Module {
callbacks.add(callback);
},
- // Optional property used by Scheduling Profiler:
+ // Optional property used by Timeline:
displayName: `Loading module "${moduleLoaderFunction.name}"`,
};
diff --git a/packages/react-devtools-shared/src/hookNamesCache.js b/packages/react-devtools-shared/src/hookNamesCache.js
index eee340844fe0..c992f64cf97b 100644
--- a/packages/react-devtools-shared/src/hookNamesCache.js
+++ b/packages/react-devtools-shared/src/hookNamesCache.js
@@ -93,7 +93,7 @@ export function loadHookNames(
callbacks.add(callback);
},
- // Optional property used by Scheduling Profiler:
+ // Optional property used by Timeline:
displayName: `Loading hook names for ${element.displayName || 'Unknown'}`,
};
diff --git a/packages/react-devtools-shared/src/inspectedElementCache.js b/packages/react-devtools-shared/src/inspectedElementCache.js
index 6442a84b0be6..b7f08ffa523a 100644
--- a/packages/react-devtools-shared/src/inspectedElementCache.js
+++ b/packages/react-devtools-shared/src/inspectedElementCache.js
@@ -95,7 +95,7 @@ export function inspectElement(
callbacks.add(callback);
},
- // Optional property used by Scheduling Profiler:
+ // Optional property used by Timeline:
displayName: `Inspecting ${element.displayName || 'Unknown'}`,
};
diff --git a/packages/react-reconciler/src/ReactFiberLane.new.js b/packages/react-reconciler/src/ReactFiberLane.new.js
index 7e1461c7a722..beaf66d0192b 100644
--- a/packages/react-reconciler/src/ReactFiberLane.new.js
+++ b/packages/react-reconciler/src/ReactFiberLane.new.js
@@ -78,7 +78,7 @@ export const IdleLane: Lanes = /* */ 0b0100000000000000000
export const OffscreenLane: Lane = /* */ 0b1000000000000000000000000000000;
-// This function is used for the experimental scheduling profiler (react-devtools-scheduling-profiler)
+// This function is used for the experimental timeline (react-devtools-scheduling-profiler)
// It should be kept in sync with the Lanes values above.
export function getLabelForLane(lane: Lane): string | void {
if (enableSchedulingProfiler) {
diff --git a/packages/react-reconciler/src/ReactFiberLane.old.js b/packages/react-reconciler/src/ReactFiberLane.old.js
index 6b4be15e649f..4923f607eb8e 100644
--- a/packages/react-reconciler/src/ReactFiberLane.old.js
+++ b/packages/react-reconciler/src/ReactFiberLane.old.js
@@ -78,7 +78,7 @@ export const IdleLane: Lanes = /* */ 0b0100000000000000000
export const OffscreenLane: Lane = /* */ 0b1000000000000000000000000000000;
-// This function is used for the experimental scheduling profiler (react-devtools-scheduling-profiler)
+// This function is used for the experimental timeline (react-devtools-scheduling-profiler)
// It should be kept in sync with the Lanes values above.
export function getLabelForLane(lane: Lane): string | void {
if (enableSchedulingProfiler) {
diff --git a/packages/react-reconciler/src/SchedulingProfiler.js b/packages/react-reconciler/src/SchedulingProfiler.js
index acfb2c3f976d..58d61067acbf 100644
--- a/packages/react-reconciler/src/SchedulingProfiler.js
+++ b/packages/react-reconciler/src/SchedulingProfiler.js
@@ -147,7 +147,7 @@ export function markComponentRenderStarted(fiber: Fiber): void {
if (enableSchedulingProfiler) {
if (supportsUserTimingV3) {
const componentName = getComponentNameFromFiber(fiber) || 'Unknown';
- // TODO (scheduling profiler) Add component stack id
+ // TODO (timeline) Add component stack id
markAndClear(`--component-render-start-${componentName}`);
}
}
@@ -165,7 +165,7 @@ export function markComponentPassiveEffectMountStarted(fiber: Fiber): void {
if (enableSchedulingProfiler) {
if (supportsUserTimingV3) {
const componentName = getComponentNameFromFiber(fiber) || 'Unknown';
- // TODO (scheduling profiler) Add component stack id
+ // TODO (timeline) Add component stack id
markAndClear(`--component-passive-effect-mount-start-${componentName}`);
}
}
@@ -183,7 +183,7 @@ export function markComponentPassiveEffectUnmountStarted(fiber: Fiber): void {
if (enableSchedulingProfiler) {
if (supportsUserTimingV3) {
const componentName = getComponentNameFromFiber(fiber) || 'Unknown';
- // TODO (scheduling profiler) Add component stack id
+ // TODO (timeline) Add component stack id
markAndClear(`--component-passive-effect-unmount-start-${componentName}`);
}
}
@@ -201,7 +201,7 @@ export function markComponentLayoutEffectMountStarted(fiber: Fiber): void {
if (enableSchedulingProfiler) {
if (supportsUserTimingV3) {
const componentName = getComponentNameFromFiber(fiber) || 'Unknown';
- // TODO (scheduling profiler) Add component stack id
+ // TODO (timeline) Add component stack id
markAndClear(`--component-layout-effect-mount-start-${componentName}`);
}
}
@@ -219,7 +219,7 @@ export function markComponentLayoutEffectUnmountStarted(fiber: Fiber): void {
if (enableSchedulingProfiler) {
if (supportsUserTimingV3) {
const componentName = getComponentNameFromFiber(fiber) || 'Unknown';
- // TODO (scheduling profiler) Add component stack id
+ // TODO (timeline) Add component stack id
markAndClear(`--component-layout-effect-unmount-start-${componentName}`);
}
}
@@ -254,7 +254,7 @@ export function markComponentErrored(
message = thrownValue;
}
- // TODO (scheduling profiler) Add component stack id
+ // TODO (timeline) Add component stack id
markAndClear(`--error-${componentName}-${phase}-${message}`);
}
}
@@ -287,10 +287,10 @@ export function markComponentSuspended(
// Following the non-standard fn.displayName convention,
// frameworks like Relay may also annotate Promises with a displayName,
// describing what operation/data the thrown Promise is related to.
- // When this is available we should pass it along to the Scheduling Profiler.
+ // When this is available we should pass it along to the Timeline.
const displayName = (wakeable: any).displayName || '';
- // TODO (scheduling profiler) Add component stack id
+ // TODO (timeline) Add component stack id
markAndClear(
`--suspense-${eventType}-${id}-${componentName}-${phase}-${lanes}-${displayName}`,
);
@@ -370,7 +370,7 @@ export function markForceUpdateScheduled(fiber: Fiber, lane: Lane): void {
if (enableSchedulingProfiler) {
if (supportsUserTimingV3) {
const componentName = getComponentNameFromFiber(fiber) || 'Unknown';
- // TODO (scheduling profiler) Add component stack id
+ // TODO (timeline) Add component stack id
markAndClear(`--schedule-forced-update-${lane}-${componentName}`);
}
}
@@ -380,7 +380,7 @@ export function markStateUpdateScheduled(fiber: Fiber, lane: Lane): void {
if (enableSchedulingProfiler) {
if (supportsUserTimingV3) {
const componentName = getComponentNameFromFiber(fiber) || 'Unknown';
- // TODO (scheduling profiler) Add component stack id
+ // TODO (timeline) Add component stack id
markAndClear(`--schedule-state-update-${lane}-${componentName}`);
}
}
diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
index 112c2d10f2cb..ede13f2c2e8d 100644
--- a/packages/shared/ReactFeatureFlags.js
+++ b/packages/shared/ReactFeatureFlags.js
@@ -16,7 +16,7 @@ export const enableFilterEmptyStringAttributesDOM = false;
export const enableDebugTracing = false;
// Adds user timing marks for e.g. state updates, suspense, and work loop stuff,
-// for an experimental scheduling profiler tool.
+// for an experimental timeline tool.
export const enableSchedulingProfiler = __PROFILE__;
// Helps identify side effects in render-phase lifecycle hooks and setState
diff --git a/scripts/rollup/wrappers.js b/scripts/rollup/wrappers.js
index c83ecc0fbdb9..3a3556e8d90e 100644
--- a/scripts/rollup/wrappers.js
+++ b/scripts/rollup/wrappers.js
@@ -360,7 +360,7 @@ function wrapBundle(
case RN_FB_DEV:
case RN_FB_PROFILING:
// Certain DEV and Profiling bundles should self-register their own module boundaries with DevTools.
- // This allows the Scheduling Profiler to de-emphasize (dim) internal stack frames.
+ // This allows the Timeline to de-emphasize (dim) internal stack frames.
source = `
${registerInternalModuleStart(globalName)}
${source}