Skip to content

Commit 13f419a

Browse files
rickhanloniikoto
rickhanlonii
authored and
koto
committed
Delete SyncBatchedLane (facebook#21061)
* Delete SyncBatchedLane * Go back to 31 lanes
1 parent 2e40575 commit 13f419a

File tree

6 files changed

+86
-136
lines changed

6 files changed

+86
-136
lines changed

‎packages/react-devtools-scheduling-profiler/src/import-worker/__tests__/preprocessData-test.internal.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ describe(preprocessData, () => {
404404
{
405405
componentStack: '',
406406
laneLabels: ['Default'],
407-
lanes: [5],
407+
lanes: [4],
408408
timestamp: 0.005,
409409
type: 'schedule-render',
410410
},
@@ -413,7 +413,7 @@ describe(preprocessData, () => {
413413
componentStack: '',
414414
isCascading: false,
415415
laneLabels: ['Default'],
416-
lanes: [5],
416+
lanes: [4],
417417
timestamp: 0.013,
418418
type: 'schedule-state-update',
419419
},
@@ -425,7 +425,7 @@ describe(preprocessData, () => {
425425
depth: 0,
426426
duration: 0.004999999999999999,
427427
laneLabels: ['Default'],
428-
lanes: [5],
428+
lanes: [4],
429429
timestamp: 0.006,
430430
type: 'render-idle',
431431
},
@@ -434,7 +434,7 @@ describe(preprocessData, () => {
434434
depth: 0,
435435
duration: 0.001,
436436
laneLabels: ['Default'],
437-
lanes: [5],
437+
lanes: [4],
438438
timestamp: 0.006,
439439
type: 'render',
440440
},
@@ -443,7 +443,7 @@ describe(preprocessData, () => {
443443
depth: 0,
444444
duration: 0.002999999999999999,
445445
laneLabels: ['Default'],
446-
lanes: [5],
446+
lanes: [4],
447447
timestamp: 0.008,
448448
type: 'commit',
449449
},
@@ -452,7 +452,7 @@ describe(preprocessData, () => {
452452
depth: 1,
453453
duration: 0.0010000000000000009,
454454
laneLabels: ['Default'],
455-
lanes: [5],
455+
lanes: [4],
456456
timestamp: 0.009,
457457
type: 'layout-effects',
458458
},
@@ -461,7 +461,7 @@ describe(preprocessData, () => {
461461
depth: 0,
462462
duration: 0.002,
463463
laneLabels: ['Default'],
464-
lanes: [5],
464+
lanes: [4],
465465
timestamp: 0.012,
466466
type: 'passive-effects',
467467
},
@@ -470,7 +470,7 @@ describe(preprocessData, () => {
470470
depth: 0,
471471
duration: 0.005000000000000001,
472472
laneLabels: ['Default'],
473-
lanes: [5],
473+
lanes: [4],
474474
timestamp: 0.015,
475475
type: 'render-idle',
476476
},
@@ -479,7 +479,7 @@ describe(preprocessData, () => {
479479
depth: 0,
480480
duration: 0.0010000000000000009,
481481
laneLabels: ['Default'],
482-
lanes: [5],
482+
lanes: [4],
483483
timestamp: 0.015,
484484
type: 'render',
485485
},
@@ -488,7 +488,7 @@ describe(preprocessData, () => {
488488
depth: 0,
489489
duration: 0.002999999999999999,
490490
laneLabels: ['Default'],
491-
lanes: [5],
491+
lanes: [4],
492492
timestamp: 0.017,
493493
type: 'commit',
494494
},
@@ -497,7 +497,7 @@ describe(preprocessData, () => {
497497
depth: 1,
498498
duration: 0.0010000000000000009,
499499
laneLabels: ['Default'],
500-
lanes: [5],
500+
lanes: [4],
501501
timestamp: 0.018,
502502
type: 'layout-effects',
503503
},
@@ -506,7 +506,7 @@ describe(preprocessData, () => {
506506
depth: 0,
507507
duration: 0.0009999999999999974,
508508
laneLabels: ['Default'],
509-
lanes: [5],
509+
lanes: [4],
510510
timestamp: 0.021,
511511
type: 'passive-effects',
512512
},

‎packages/react-reconciler/src/ReactFiberLane.new.js

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ import {
4646
NoPriority as NoSchedulerPriority,
4747
} from './SchedulerWithReactIntegration.new';
4848

49-
export const SyncLanePriority: LanePriority = 13;
50-
export const SyncBatchedLanePriority: LanePriority = 12;
49+
export const SyncLanePriority: LanePriority = 12;
5150

5251
const InputContinuousHydrationLanePriority: LanePriority = 11;
5352
export const InputContinuousLanePriority: LanePriority = 10;
@@ -74,42 +73,42 @@ export const NoLanePriority: LanePriority = 0;
7473

7574
export const TotalLanes = 31;
7675

77-
export const NoLanes: Lanes = /* */ 0b0000000000000000000000000000000;
78-
export const NoLane: Lane = /* */ 0b0000000000000000000000000000000;
76+
export const NoLanes: Lanes = /* */ 0b000000000000000000000000000000;
77+
export const NoLane: Lane = /* */ 0b000000000000000000000000000000;
7978

8079
export const SyncLane: Lane = /* */ 0b0000000000000000000000000000001;
81-
export const SyncBatchedLane: Lane = /* */ 0b0000000000000000000000000000010;
82-
83-
const InputContinuousHydrationLane: Lane = /* */ 0b0000000000000000000000000000100;
84-
export const InputContinuousLane: Lanes = /* */ 0b0000000000000000000000000001000;
85-
86-
export const DefaultHydrationLane: Lane = /* */ 0b0000000000000000000000000010000;
87-
export const DefaultLane: Lanes = /* */ 0b0000000000000000000000000100000;
88-
89-
const TransitionHydrationLane: Lane = /* */ 0b0000000000000000000000001000000;
90-
const TransitionLanes: Lanes = /* */ 0b0000000011111111111111110000000;
91-
const TransitionLane1: Lane = /* */ 0b0000000000000000000000010000000;
92-
const TransitionLane2: Lane = /* */ 0b0000000000000000000000100000000;
93-
const TransitionLane3: Lane = /* */ 0b0000000000000000000001000000000;
94-
const TransitionLane4: Lane = /* */ 0b0000000000000000000010000000000;
95-
const TransitionLane5: Lane = /* */ 0b0000000000000000000100000000000;
96-
const TransitionLane6: Lane = /* */ 0b0000000000000000001000000000000;
97-
const TransitionLane7: Lane = /* */ 0b0000000000000000010000000000000;
98-
const TransitionLane8: Lane = /* */ 0b0000000000000000100000000000000;
99-
const TransitionLane9: Lane = /* */ 0b0000000000000001000000000000000;
100-
const TransitionLane10: Lane = /* */ 0b0000000000000010000000000000000;
101-
const TransitionLane11: Lane = /* */ 0b0000000000000100000000000000000;
102-
const TransitionLane12: Lane = /* */ 0b0000000000001000000000000000000;
103-
const TransitionLane13: Lane = /* */ 0b0000000000010000000000000000000;
104-
const TransitionLane14: Lane = /* */ 0b0000000000100000000000000000000;
105-
const TransitionLane15: Lane = /* */ 0b0000000001000000000000000000000;
106-
const TransitionLane16: Lane = /* */ 0b0000000010000000000000000000000;
107-
108-
const RetryLanes: Lanes = /* */ 0b0000111100000000000000000000000;
109-
const RetryLane1: Lane = /* */ 0b0000000100000000000000000000000;
110-
const RetryLane2: Lane = /* */ 0b0000001000000000000000000000000;
111-
const RetryLane3: Lane = /* */ 0b0000010000000000000000000000000;
112-
const RetryLane4: Lane = /* */ 0b0000100000000000000000000000000;
80+
81+
const InputContinuousHydrationLane: Lane = /* */ 0b0000000000000000000000000000010;
82+
export const InputContinuousLane: Lanes = /* */ 0b0000000000000000000000000000100;
83+
84+
export const DefaultHydrationLane: Lane = /* */ 0b0000000000000000000000000001000;
85+
export const DefaultLane: Lanes = /* */ 0b0000000000000000000000000010000;
86+
87+
const TransitionHydrationLane: Lane = /* */ 0b0000000000000000000000000100000;
88+
const TransitionLanes: Lanes = /* */ 0b0000000001111111111111111000000;
89+
const TransitionLane1: Lane = /* */ 0b0000000000000000000000001000000;
90+
const TransitionLane2: Lane = /* */ 0b0000000000000000000000010000000;
91+
const TransitionLane3: Lane = /* */ 0b0000000000000000000000100000000;
92+
const TransitionLane4: Lane = /* */ 0b0000000000000000000001000000000;
93+
const TransitionLane5: Lane = /* */ 0b0000000000000000000010000000000;
94+
const TransitionLane6: Lane = /* */ 0b0000000000000000000100000000000;
95+
const TransitionLane7: Lane = /* */ 0b0000000000000000001000000000000;
96+
const TransitionLane8: Lane = /* */ 0b0000000000000000010000000000000;
97+
const TransitionLane9: Lane = /* */ 0b0000000000000000100000000000000;
98+
const TransitionLane10: Lane = /* */ 0b0000000000000001000000000000000;
99+
const TransitionLane11: Lane = /* */ 0b0000000000000010000000000000000;
100+
const TransitionLane12: Lane = /* */ 0b0000000000000100000000000000000;
101+
const TransitionLane13: Lane = /* */ 0b0000000000001000000000000000000;
102+
const TransitionLane14: Lane = /* */ 0b0000000000010000000000000000000;
103+
const TransitionLane15: Lane = /* */ 0b0000000000100000000000000000000;
104+
const TransitionLane16: Lane = /* */ 0b0000000001000000000000000000000;
105+
106+
const RetryLanes: Lanes = /* */ 0b0000111110000000000000000000000;
107+
const RetryLane1: Lane = /* */ 0b0000000010000000000000000000000;
108+
const RetryLane2: Lane = /* */ 0b0000000100000000000000000000000;
109+
const RetryLane3: Lane = /* */ 0b0000001000000000000000000000000;
110+
const RetryLane4: Lane = /* */ 0b0000010000000000000000000000000;
111+
const RetryLane5: Lane = /* */ 0b0000100000000000000000000000000;
113112

114113
export const SomeRetryLane: Lane = RetryLane1;
115114

@@ -130,9 +129,6 @@ export function getLabelsForLanes(lanes: Lanes): Array<string> | void {
130129
if (lanes & SyncLane) {
131130
labels.push('Sync');
132131
}
133-
if (lanes & SyncBatchedLane) {
134-
labels.push('SyncBatched');
135-
}
136132
if (lanes & InputContinuousHydrationLane) {
137133
labels.push('InputContinuousHydration');
138134
}
@@ -194,9 +190,6 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
194190
case SyncLane:
195191
return_highestLanePriority = SyncLanePriority;
196192
return SyncLane;
197-
case SyncBatchedLane:
198-
return_highestLanePriority = SyncBatchedLanePriority;
199-
return SyncBatchedLane;
200193
case InputContinuousHydrationLane:
201194
return_highestLanePriority = InputContinuousHydrationLanePriority;
202195
return InputContinuousHydrationLane;
@@ -234,6 +227,7 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
234227
case RetryLane2:
235228
case RetryLane3:
236229
case RetryLane4:
230+
case RetryLane5:
237231
return_highestLanePriority = RetryLanePriority;
238232
return lanes & RetryLanes;
239233
case SelectiveHydrationLane:
@@ -265,7 +259,6 @@ export function lanePriorityToSchedulerPriority(
265259
): ReactPriorityLevel {
266260
switch (lanePriority) {
267261
case SyncLanePriority:
268-
case SyncBatchedLanePriority:
269262
return ImmediateSchedulerPriority;
270263
case InputContinuousHydrationLanePriority:
271264
case InputContinuousLanePriority:
@@ -547,8 +540,6 @@ export function findUpdateLane(lanePriority: LanePriority): Lane {
547540
break;
548541
case SyncLanePriority:
549542
return SyncLane;
550-
case SyncBatchedLanePriority:
551-
return SyncBatchedLane;
552543
case InputContinuousLanePriority:
553544
return InputContinuousLane;
554545
case DefaultLanePriority:
@@ -805,7 +796,6 @@ export function getBumpedLaneForHydration(
805796
let lane;
806797
switch (highestLanePriority) {
807798
case SyncLanePriority:
808-
case SyncBatchedLanePriority:
809799
lane = NoLane;
810800
break;
811801
case InputContinuousLanePriority:

‎packages/react-reconciler/src/ReactFiberLane.old.js

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ import {
4646
NoPriority as NoSchedulerPriority,
4747
} from './SchedulerWithReactIntegration.old';
4848

49-
export const SyncLanePriority: LanePriority = 13;
50-
export const SyncBatchedLanePriority: LanePriority = 12;
49+
export const SyncLanePriority: LanePriority = 12;
5150

5251
const InputContinuousHydrationLanePriority: LanePriority = 11;
5352
export const InputContinuousLanePriority: LanePriority = 10;
@@ -74,42 +73,42 @@ export const NoLanePriority: LanePriority = 0;
7473

7574
export const TotalLanes = 31;
7675

77-
export const NoLanes: Lanes = /* */ 0b0000000000000000000000000000000;
78-
export const NoLane: Lane = /* */ 0b0000000000000000000000000000000;
76+
export const NoLanes: Lanes = /* */ 0b000000000000000000000000000000;
77+
export const NoLane: Lane = /* */ 0b000000000000000000000000000000;
7978

8079
export const SyncLane: Lane = /* */ 0b0000000000000000000000000000001;
81-
export const SyncBatchedLane: Lane = /* */ 0b0000000000000000000000000000010;
82-
83-
const InputContinuousHydrationLane: Lane = /* */ 0b0000000000000000000000000000100;
84-
export const InputContinuousLane: Lanes = /* */ 0b0000000000000000000000000001000;
85-
86-
export const DefaultHydrationLane: Lane = /* */ 0b0000000000000000000000000010000;
87-
export const DefaultLane: Lanes = /* */ 0b0000000000000000000000000100000;
88-
89-
const TransitionHydrationLane: Lane = /* */ 0b0000000000000000000000001000000;
90-
const TransitionLanes: Lanes = /* */ 0b0000000011111111111111110000000;
91-
const TransitionLane1: Lane = /* */ 0b0000000000000000000000010000000;
92-
const TransitionLane2: Lane = /* */ 0b0000000000000000000000100000000;
93-
const TransitionLane3: Lane = /* */ 0b0000000000000000000001000000000;
94-
const TransitionLane4: Lane = /* */ 0b0000000000000000000010000000000;
95-
const TransitionLane5: Lane = /* */ 0b0000000000000000000100000000000;
96-
const TransitionLane6: Lane = /* */ 0b0000000000000000001000000000000;
97-
const TransitionLane7: Lane = /* */ 0b0000000000000000010000000000000;
98-
const TransitionLane8: Lane = /* */ 0b0000000000000000100000000000000;
99-
const TransitionLane9: Lane = /* */ 0b0000000000000001000000000000000;
100-
const TransitionLane10: Lane = /* */ 0b0000000000000010000000000000000;
101-
const TransitionLane11: Lane = /* */ 0b0000000000000100000000000000000;
102-
const TransitionLane12: Lane = /* */ 0b0000000000001000000000000000000;
103-
const TransitionLane13: Lane = /* */ 0b0000000000010000000000000000000;
104-
const TransitionLane14: Lane = /* */ 0b0000000000100000000000000000000;
105-
const TransitionLane15: Lane = /* */ 0b0000000001000000000000000000000;
106-
const TransitionLane16: Lane = /* */ 0b0000000010000000000000000000000;
107-
108-
const RetryLanes: Lanes = /* */ 0b0000111100000000000000000000000;
109-
const RetryLane1: Lane = /* */ 0b0000000100000000000000000000000;
110-
const RetryLane2: Lane = /* */ 0b0000001000000000000000000000000;
111-
const RetryLane3: Lane = /* */ 0b0000010000000000000000000000000;
112-
const RetryLane4: Lane = /* */ 0b0000100000000000000000000000000;
80+
81+
const InputContinuousHydrationLane: Lane = /* */ 0b0000000000000000000000000000010;
82+
export const InputContinuousLane: Lanes = /* */ 0b0000000000000000000000000000100;
83+
84+
export const DefaultHydrationLane: Lane = /* */ 0b0000000000000000000000000001000;
85+
export const DefaultLane: Lanes = /* */ 0b0000000000000000000000000010000;
86+
87+
const TransitionHydrationLane: Lane = /* */ 0b0000000000000000000000000100000;
88+
const TransitionLanes: Lanes = /* */ 0b0000000001111111111111111000000;
89+
const TransitionLane1: Lane = /* */ 0b0000000000000000000000001000000;
90+
const TransitionLane2: Lane = /* */ 0b0000000000000000000000010000000;
91+
const TransitionLane3: Lane = /* */ 0b0000000000000000000000100000000;
92+
const TransitionLane4: Lane = /* */ 0b0000000000000000000001000000000;
93+
const TransitionLane5: Lane = /* */ 0b0000000000000000000010000000000;
94+
const TransitionLane6: Lane = /* */ 0b0000000000000000000100000000000;
95+
const TransitionLane7: Lane = /* */ 0b0000000000000000001000000000000;
96+
const TransitionLane8: Lane = /* */ 0b0000000000000000010000000000000;
97+
const TransitionLane9: Lane = /* */ 0b0000000000000000100000000000000;
98+
const TransitionLane10: Lane = /* */ 0b0000000000000001000000000000000;
99+
const TransitionLane11: Lane = /* */ 0b0000000000000010000000000000000;
100+
const TransitionLane12: Lane = /* */ 0b0000000000000100000000000000000;
101+
const TransitionLane13: Lane = /* */ 0b0000000000001000000000000000000;
102+
const TransitionLane14: Lane = /* */ 0b0000000000010000000000000000000;
103+
const TransitionLane15: Lane = /* */ 0b0000000000100000000000000000000;
104+
const TransitionLane16: Lane = /* */ 0b0000000001000000000000000000000;
105+
106+
const RetryLanes: Lanes = /* */ 0b0000111110000000000000000000000;
107+
const RetryLane1: Lane = /* */ 0b0000000010000000000000000000000;
108+
const RetryLane2: Lane = /* */ 0b0000000100000000000000000000000;
109+
const RetryLane3: Lane = /* */ 0b0000001000000000000000000000000;
110+
const RetryLane4: Lane = /* */ 0b0000010000000000000000000000000;
111+
const RetryLane5: Lane = /* */ 0b0000100000000000000000000000000;
113112

114113
export const SomeRetryLane: Lane = RetryLane1;
115114

@@ -130,9 +129,6 @@ export function getLabelsForLanes(lanes: Lanes): Array<string> | void {
130129
if (lanes & SyncLane) {
131130
labels.push('Sync');
132131
}
133-
if (lanes & SyncBatchedLane) {
134-
labels.push('SyncBatched');
135-
}
136132
if (lanes & InputContinuousHydrationLane) {
137133
labels.push('InputContinuousHydration');
138134
}
@@ -194,9 +190,6 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
194190
case SyncLane:
195191
return_highestLanePriority = SyncLanePriority;
196192
return SyncLane;
197-
case SyncBatchedLane:
198-
return_highestLanePriority = SyncBatchedLanePriority;
199-
return SyncBatchedLane;
200193
case InputContinuousHydrationLane:
201194
return_highestLanePriority = InputContinuousHydrationLanePriority;
202195
return InputContinuousHydrationLane;
@@ -234,6 +227,7 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
234227
case RetryLane2:
235228
case RetryLane3:
236229
case RetryLane4:
230+
case RetryLane5:
237231
return_highestLanePriority = RetryLanePriority;
238232
return lanes & RetryLanes;
239233
case SelectiveHydrationLane:
@@ -265,7 +259,6 @@ export function lanePriorityToSchedulerPriority(
265259
): ReactPriorityLevel {
266260
switch (lanePriority) {
267261
case SyncLanePriority:
268-
case SyncBatchedLanePriority:
269262
return ImmediateSchedulerPriority;
270263
case InputContinuousHydrationLanePriority:
271264
case InputContinuousLanePriority:
@@ -547,8 +540,6 @@ export function findUpdateLane(lanePriority: LanePriority): Lane {
547540
break;
548541
case SyncLanePriority:
549542
return SyncLane;
550-
case SyncBatchedLanePriority:
551-
return SyncBatchedLane;
552543
case InputContinuousLanePriority:
553544
return InputContinuousLane;
554545
case DefaultLanePriority:
@@ -805,7 +796,6 @@ export function getBumpedLaneForHydration(
805796
let lane;
806797
switch (highestLanePriority) {
807798
case SyncLanePriority:
808-
case SyncBatchedLanePriority:
809799
lane = NoLane;
810800
break;
811801
case InputContinuousLanePriority:

0 commit comments

Comments
 (0)