Skip to content
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

Delete SyncBatchedLane #21061

Merged
merged 2 commits into from
Mar 24, 2021
Merged

Delete SyncBatchedLane #21061

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0ee779
Delete SyncBatchedLane
rickhanlonii Mar 23, 2021
7fe6a73
Go back to 31 lanes
rickhanlonii Mar 24, 2021
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
2 changes: 1 addition & 1 deletion packages/react-devtools-scheduling-profiler/src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ export {
COMPACT_LINE_HEIGHT,
} from 'react-devtools-shared/src/constants.js';

export const REACT_TOTAL_NUM_LANES = 31;
export const REACT_TOTAL_NUM_LANES = 30;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should always be 31. When we remove a lane, we re-allocate it to be either a TransitionLane or a RetryLane.

26 changes: 13 additions & 13 deletions ...-devtools-scheduling-profiler/src/import-worker/__tests__/preprocessData-test.internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe(getLanesFromTransportDecimalBitmask, () => {
it('should ignore lanes outside REACT_TOTAL_NUM_LANES', () => {
// Sanity check; this test may need to be updated when the no. of fiber
// lanes are changed.
expect(REACT_TOTAL_NUM_LANES).toBe(31);
expect(REACT_TOTAL_NUM_LANES).toBe(30);

expect(
getLanesFromTransportDecimalBitmask(
Expand Down Expand Up @@ -404,7 +404,7 @@ describe(preprocessData, () => {
{
componentStack: '',
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.005,
type: 'schedule-render',
},
Expand All @@ -413,7 +413,7 @@ describe(preprocessData, () => {
componentStack: '',
isCascading: false,
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.013,
type: 'schedule-state-update',
},
Expand All @@ -425,7 +425,7 @@ describe(preprocessData, () => {
depth: 0,
duration: 0.004999999999999999,
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.006,
type: 'render-idle',
},
Expand All @@ -434,7 +434,7 @@ describe(preprocessData, () => {
depth: 0,
duration: 0.001,
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.006,
type: 'render',
},
Expand All @@ -443,7 +443,7 @@ describe(preprocessData, () => {
depth: 0,
duration: 0.002999999999999999,
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.008,
type: 'commit',
},
Expand All @@ -452,7 +452,7 @@ describe(preprocessData, () => {
depth: 1,
duration: 0.0010000000000000009,
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.009,
type: 'layout-effects',
},
Expand All @@ -461,7 +461,7 @@ describe(preprocessData, () => {
depth: 0,
duration: 0.002,
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.012,
type: 'passive-effects',
},
Expand All @@ -470,7 +470,7 @@ describe(preprocessData, () => {
depth: 0,
duration: 0.005000000000000001,
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.015,
type: 'render-idle',
},
Expand All @@ -479,7 +479,7 @@ describe(preprocessData, () => {
depth: 0,
duration: 0.0010000000000000009,
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.015,
type: 'render',
},
Expand All @@ -488,7 +488,7 @@ describe(preprocessData, () => {
depth: 0,
duration: 0.002999999999999999,
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.017,
type: 'commit',
},
Expand All @@ -497,7 +497,7 @@ describe(preprocessData, () => {
depth: 1,
duration: 0.0010000000000000009,
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.018,
type: 'layout-effects',
},
Expand All @@ -506,7 +506,7 @@ describe(preprocessData, () => {
depth: 0,
duration: 0.0009999999999999974,
laneLabels: ['Default'],
lanes: [5],
lanes: [4],
timestamp: 0.021,
type: 'passive-effects',
},
Expand Down
98 changes: 43 additions & 55 deletions packages/react-reconciler/src/ReactFiberLane.new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ import {
NoPriority as NoSchedulerPriority,
} from './SchedulerWithReactIntegration.new';

export const SyncLanePriority: LanePriority = 13;
export const SyncBatchedLanePriority: LanePriority = 12;
export const SyncLanePriority: LanePriority = 12;

const InputContinuousHydrationLanePriority: LanePriority = 11;
export const InputContinuousLanePriority: LanePriority = 10;
Expand All @@ -72,55 +71,54 @@ export const NoLanePriority: LanePriority = 0;
// Lane values below should be kept in sync with getLabelsForLanes(), used by react-devtools-scheduling-profiler.
// If those values are changed that package should be rebuilt and redeployed.

export const TotalLanes = 31;

export const NoLanes: Lanes = /* */ 0b0000000000000000000000000000000;
export const NoLane: Lane = /* */ 0b0000000000000000000000000000000;

export const SyncLane: Lane = /* */ 0b0000000000000000000000000000001;
export const SyncBatchedLane: Lane = /* */ 0b0000000000000000000000000000010;

const InputContinuousHydrationLane: Lane = /* */ 0b0000000000000000000000000000100;
export const InputContinuousLane: Lanes = /* */ 0b0000000000000000000000000001000;

export const DefaultHydrationLane: Lane = /* */ 0b0000000000000000000000000010000;
export const DefaultLane: Lanes = /* */ 0b0000000000000000000000000100000;

const TransitionHydrationLane: Lane = /* */ 0b0000000000000000000000001000000;
const TransitionLanes: Lanes = /* */ 0b0000000011111111111111110000000;
const TransitionLane1: Lane = /* */ 0b0000000000000000000000010000000;
const TransitionLane2: Lane = /* */ 0b0000000000000000000000100000000;
const TransitionLane3: Lane = /* */ 0b0000000000000000000001000000000;
const TransitionLane4: Lane = /* */ 0b0000000000000000000010000000000;
const TransitionLane5: Lane = /* */ 0b0000000000000000000100000000000;
const TransitionLane6: Lane = /* */ 0b0000000000000000001000000000000;
const TransitionLane7: Lane = /* */ 0b0000000000000000010000000000000;
const TransitionLane8: Lane = /* */ 0b0000000000000000100000000000000;
const TransitionLane9: Lane = /* */ 0b0000000000000001000000000000000;
const TransitionLane10: Lane = /* */ 0b0000000000000010000000000000000;
const TransitionLane11: Lane = /* */ 0b0000000000000100000000000000000;
const TransitionLane12: Lane = /* */ 0b0000000000001000000000000000000;
const TransitionLane13: Lane = /* */ 0b0000000000010000000000000000000;
const TransitionLane14: Lane = /* */ 0b0000000000100000000000000000000;
const TransitionLane15: Lane = /* */ 0b0000000001000000000000000000000;
const TransitionLane16: Lane = /* */ 0b0000000010000000000000000000000;

const RetryLanes: Lanes = /* */ 0b0000111100000000000000000000000;
const RetryLane1: Lane = /* */ 0b0000000100000000000000000000000;
const RetryLane2: Lane = /* */ 0b0000001000000000000000000000000;
const RetryLane3: Lane = /* */ 0b0000010000000000000000000000000;
const RetryLane4: Lane = /* */ 0b0000100000000000000000000000000;
export const TotalLanes = 30;

export const NoLanes: Lanes = /* */ 0b000000000000000000000000000000;
export const NoLane: Lane = /* */ 0b000000000000000000000000000000;

export const SyncLane: Lane = /* */ 0b000000000000000000000000000001;

const InputContinuousHydrationLane: Lane = /* */ 0b000000000000000000000000000010;
export const InputContinuousLane: Lanes = /* */ 0b000000000000000000000000000100;

export const DefaultHydrationLane: Lane = /* */ 0b000000000000000000000000001000;
export const DefaultLane: Lanes = /* */ 0b000000000000000000000000010000;

const TransitionHydrationLane: Lane = /* */ 0b000000000000000000000000100000;
const TransitionLanes: Lanes = /* */ 0b000000001111111111111111000000;
const TransitionLane1: Lane = /* */ 0b000000000000000000000001000000;
const TransitionLane2: Lane = /* */ 0b000000000000000000000010000000;
const TransitionLane3: Lane = /* */ 0b000000000000000000000100000000;
const TransitionLane4: Lane = /* */ 0b000000000000000000001000000000;
const TransitionLane5: Lane = /* */ 0b000000000000000000010000000000;
const TransitionLane6: Lane = /* */ 0b000000000000000000100000000000;
const TransitionLane7: Lane = /* */ 0b000000000000000001000000000000;
const TransitionLane8: Lane = /* */ 0b000000000000000010000000000000;
const TransitionLane9: Lane = /* */ 0b000000000000000100000000000000;
const TransitionLane10: Lane = /* */ 0b000000000000001000000000000000;
const TransitionLane11: Lane = /* */ 0b000000000000010000000000000000;
const TransitionLane12: Lane = /* */ 0b000000000000100000000000000000;
const TransitionLane13: Lane = /* */ 0b000000000001000000000000000000;
const TransitionLane14: Lane = /* */ 0b000000000010000000000000000000;
const TransitionLane15: Lane = /* */ 0b000000000100000000000000000000;
const TransitionLane16: Lane = /* */ 0b000000001000000000000000000000;

const RetryLanes: Lanes = /* */ 0b000011110000000000000000000000;
const RetryLane1: Lane = /* */ 0b000000010000000000000000000000;
const RetryLane2: Lane = /* */ 0b000000100000000000000000000000;
const RetryLane3: Lane = /* */ 0b000001000000000000000000000000;
const RetryLane4: Lane = /* */ 0b000010000000000000000000000000;

export const SomeRetryLane: Lane = RetryLane1;

export const SelectiveHydrationLane: Lane = /* */ 0b0001000000000000000000000000000;
export const SelectiveHydrationLane: Lane = /* */ 0b000100000000000000000000000000;

const NonIdleLanes = /* */ 0b0001111111111111111111111111111;
const NonIdleLanes = /* */ 0b000111111111111111111111111111;

export const IdleHydrationLane: Lane = /* */ 0b0010000000000000000000000000000;
const IdleLane: Lanes = /* */ 0b0100000000000000000000000000000;
export const IdleHydrationLane: Lane = /* */ 0b001000000000000000000000000000;
const IdleLane: Lanes = /* */ 0b010000000000000000000000000000;

export const OffscreenLane: Lane = /* */ 0b1000000000000000000000000000000;
export const OffscreenLane: Lane = /* */ 0b100000000000000000000000000000;

// This function is used for the experimental scheduling profiler (react-devtools-scheduling-profiler)
// It should be kept in sync with the Lanes values above.
Expand All @@ -130,9 +128,6 @@ export function getLabelsForLanes(lanes: Lanes): Array<string> | void {
if (lanes & SyncLane) {
labels.push('Sync');
}
if (lanes & SyncBatchedLane) {
labels.push('SyncBatched');
}
if (lanes & InputContinuousHydrationLane) {
labels.push('InputContinuousHydration');
}
Expand Down Expand Up @@ -194,9 +189,6 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
case SyncLane:
return_highestLanePriority = SyncLanePriority;
return SyncLane;
case SyncBatchedLane:
return_highestLanePriority = SyncBatchedLanePriority;
return SyncBatchedLane;
case InputContinuousHydrationLane:
return_highestLanePriority = InputContinuousHydrationLanePriority;
return InputContinuousHydrationLane;
Expand Down Expand Up @@ -265,7 +257,6 @@ export function lanePriorityToSchedulerPriority(
): ReactPriorityLevel {
switch (lanePriority) {
case SyncLanePriority:
case SyncBatchedLanePriority:
return ImmediateSchedulerPriority;
case InputContinuousHydrationLanePriority:
case InputContinuousLanePriority:
Expand Down Expand Up @@ -547,8 +538,6 @@ export function findUpdateLane(lanePriority: LanePriority): Lane {
break;
case SyncLanePriority:
return SyncLane;
case SyncBatchedLanePriority:
return SyncBatchedLane;
case InputContinuousLanePriority:
return InputContinuousLane;
case DefaultLanePriority:
Expand Down Expand Up @@ -805,7 +794,6 @@ export function getBumpedLaneForHydration(
let lane;
switch (highestLanePriority) {
case SyncLanePriority:
case SyncBatchedLanePriority:
lane = NoLane;
break;
case InputContinuousLanePriority:
Expand Down
Loading