From f36f828c00d595609f17350187f82beb894a0b20 Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Tue, 25 May 2021 17:14:46 -0400 Subject: [PATCH 1/2] Enabled Profiling feature flags for OSS release enableProfilerCommitHooks and enableProfilerNestedUpdatePhase --- packages/shared/ReactFeatureFlags.js | 4 ++-- packages/shared/forks/ReactFeatureFlags.native-fb.js | 4 ++-- packages/shared/forks/ReactFeatureFlags.native-oss.js | 4 ++-- packages/shared/forks/ReactFeatureFlags.test-renderer.js | 4 ++-- .../shared/forks/ReactFeatureFlags.test-renderer.native.js | 4 ++-- packages/shared/forks/ReactFeatureFlags.test-renderer.www.js | 4 ++-- packages/shared/forks/ReactFeatureFlags.testing.js | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index 500d995e69d..3fa8cf28426 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -42,10 +42,10 @@ export const warnAboutDeprecatedLifecycles = true; export const enableProfilerTimer = __PROFILE__; // Record durations for commit and passive effects phases. -export const enableProfilerCommitHooks = false; +export const enableProfilerCommitHooks = __PROFILE__; // Phase param passed to onRender callback differentiates between an "update" and a "cascading-update". -export const enableProfilerNestedUpdatePhase = false; +export const enableProfilerNestedUpdatePhase = __PROFILE__; // Profiler API accepts a function to be called when a nested update is scheduled. // This callback accepts the component type (class instance or function) the update is scheduled for. diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index f34657b052a..9f8fae58517 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -14,8 +14,8 @@ import typeof * as ExportsType from './ReactFeatureFlags.native-fb'; export const enableDebugTracing = false; export const enableSchedulingProfiler = false; export const enableProfilerTimer = __PROFILE__; -export const enableProfilerCommitHooks = false; -export const enableProfilerNestedUpdatePhase = false; +export const enableProfilerCommitHooks = __PROFILE__; +export const enableProfilerNestedUpdatePhase = __PROFILE__; export const enableProfilerNestedUpdateScheduledHook = false; export const enableUpdaterTracking = false; export const enableSuspenseServerRenderer = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index eb3a55187e7..f12ca5f4957 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -16,8 +16,8 @@ export const enableSchedulingProfiler = false; export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__; export const warnAboutDeprecatedLifecycles = true; export const enableProfilerTimer = __PROFILE__; -export const enableProfilerCommitHooks = false; -export const enableProfilerNestedUpdatePhase = false; +export const enableProfilerCommitHooks = __PROFILE__; +export const enableProfilerNestedUpdatePhase = __PROFILE__; export const enableProfilerNestedUpdateScheduledHook = false; export const enableUpdaterTracking = false; export const enableSuspenseServerRenderer = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js index 1a8a75a4c60..888bedb396d 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js @@ -16,8 +16,8 @@ export const enableSchedulingProfiler = false; export const warnAboutDeprecatedLifecycles = true; export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false; export const enableProfilerTimer = __PROFILE__; -export const enableProfilerCommitHooks = false; -export const enableProfilerNestedUpdatePhase = false; +export const enableProfilerCommitHooks = __PROFILE__; +export const enableProfilerNestedUpdatePhase = __PROFILE__; export const enableProfilerNestedUpdateScheduledHook = false; export const enableUpdaterTracking = false; export const enableSuspenseServerRenderer = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js index 240978a6133..7eb2c151d10 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js @@ -16,8 +16,8 @@ export const enableSchedulingProfiler = false; export const warnAboutDeprecatedLifecycles = true; export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false; export const enableProfilerTimer = __PROFILE__; -export const enableProfilerCommitHooks = false; -export const enableProfilerNestedUpdatePhase = false; +export const enableProfilerCommitHooks = __PROFILE__; +export const enableProfilerNestedUpdatePhase = __PROFILE__; export const enableProfilerNestedUpdateScheduledHook = false; export const enableUpdaterTracking = false; export const enableSuspenseServerRenderer = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js index 3829b61918b..7699c52b147 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js @@ -16,8 +16,8 @@ export const enableSchedulingProfiler = false; export const warnAboutDeprecatedLifecycles = true; export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false; export const enableProfilerTimer = __PROFILE__; -export const enableProfilerCommitHooks = false; -export const enableProfilerNestedUpdatePhase = false; +export const enableProfilerCommitHooks = __PROFILE__; +export const enableProfilerNestedUpdatePhase = __PROFILE__; export const enableProfilerNestedUpdateScheduledHook = false; export const enableUpdaterTracking = false; export const enableSuspenseServerRenderer = false; diff --git a/packages/shared/forks/ReactFeatureFlags.testing.js b/packages/shared/forks/ReactFeatureFlags.testing.js index d593aa3f9ce..7af17d70fa7 100644 --- a/packages/shared/forks/ReactFeatureFlags.testing.js +++ b/packages/shared/forks/ReactFeatureFlags.testing.js @@ -16,8 +16,8 @@ export const enableSchedulingProfiler = false; export const warnAboutDeprecatedLifecycles = true; export const replayFailedUnitOfWorkWithInvokeGuardedCallback = false; export const enableProfilerTimer = __PROFILE__; -export const enableProfilerCommitHooks = false; -export const enableProfilerNestedUpdatePhase = false; +export const enableProfilerCommitHooks = __PROFILE__; +export const enableProfilerNestedUpdatePhase = __PROFILE__; export const enableProfilerNestedUpdateScheduledHook = false; export const enableUpdaterTracking = false; export const enableSuspenseServerRenderer = false; From 63e125354268c83e707fdde3d4b9b5d43a436d20 Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Tue, 25 May 2021 17:26:02 -0400 Subject: [PATCH 2/2] Updated DevTools test snapshots --- .../__snapshots__/profilingCache-test.js.snap | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/react-devtools-shared/src/__tests__/__snapshots__/profilingCache-test.js.snap b/packages/react-devtools-shared/src/__tests__/__snapshots__/profilingCache-test.js.snap index 8f07adaaf4d..b27231efdff 100644 --- a/packages/react-devtools-shared/src/__tests__/__snapshots__/profilingCache-test.js.snap +++ b/packages/react-devtools-shared/src/__tests__/__snapshots__/profilingCache-test.js.snap @@ -113,7 +113,7 @@ Object { }, }, "duration": 3, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Map { 7 => 3, 3 => 3, @@ -122,7 +122,7 @@ Object { 7 => 3, 3 => 0, }, - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Immediate", "timestamp": 18, "updaters": Array [ @@ -286,7 +286,7 @@ Object { }, }, "duration": 10, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Map { 4 => 0, 2 => 10, @@ -297,7 +297,7 @@ Object { 2 => 10, 1 => 0, }, - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Immediate", "timestamp": 35, "updaters": Array [ @@ -326,7 +326,7 @@ Object { }, }, "duration": 10, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Map { 2 => 10, 1 => 10, @@ -335,7 +335,7 @@ Object { 2 => 10, 1 => 0, }, - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Immediate", "timestamp": 45, "updaters": Array [ @@ -587,7 +587,7 @@ Object { ], ], "duration": 10, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Array [ Array [ 4, @@ -616,7 +616,7 @@ Object { 0, ], ], - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Immediate", "timestamp": 35, "updaters": Array [ @@ -645,7 +645,7 @@ Object { ], ], "duration": 10, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Array [ Array [ 2, @@ -666,7 +666,7 @@ Object { 0, ], ], - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Immediate", "timestamp": 45, "updaters": Array [ @@ -1367,7 +1367,7 @@ Object { }, }, "duration": 10, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Map { 4 => 0, 2 => 10, @@ -1378,7 +1378,7 @@ Object { 2 => 10, 1 => 0, }, - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Immediate", "timestamp": 34, "updaters": Array [ @@ -1404,7 +1404,7 @@ Object { }, }, "duration": 10, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Map { 2 => 10, 1 => 10, @@ -1413,7 +1413,7 @@ Object { 2 => 10, 1 => 0, }, - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Immediate", "timestamp": 44, "updaters": Array [ @@ -1683,10 +1683,10 @@ Object { Object { "changeDescriptions": Map {}, "duration": 0, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Map {}, "fiberSelfDurations": Map {}, - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Normal", "timestamp": 34, "updaters": Array [ @@ -1900,7 +1900,7 @@ Object { ], ], "duration": 10, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Array [ Array [ 4, @@ -1929,7 +1929,7 @@ Object { 0, ], ], - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Immediate", "timestamp": 34, "updaters": Array [ @@ -1958,7 +1958,7 @@ Object { ], ], "duration": 10, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Array [ Array [ 2, @@ -1979,7 +1979,7 @@ Object { 0, ], ], - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Immediate", "timestamp": 44, "updaters": Array [ @@ -2306,10 +2306,10 @@ Object { Object { "changeDescriptions": Array [], "duration": 0, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Array [], "fiberSelfDurations": Array [], - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Normal", "timestamp": 34, "updaters": Array [ @@ -2494,7 +2494,7 @@ Object { }, }, "duration": 0, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Map { 1 => 0, 2 => 0, @@ -2505,7 +2505,7 @@ Object { 2 => 0, 3 => 0, }, - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Normal", "timestamp": 0, "updaters": Array [ @@ -2685,7 +2685,7 @@ Object { ], ], "duration": 0, - "effectDuration": null, + "effectDuration": 0, "fiberActualDurations": Array [ Array [ 1, @@ -2714,7 +2714,7 @@ Object { 0, ], ], - "passiveEffectDuration": null, + "passiveEffectDuration": 0, "priorityLevel": "Normal", "timestamp": 0, "updaters": Array [