Commit c50d8e4

Browse files
trivikraduh95
authored andcommitted
stream: limit iter from sync iterable batches
Bound sync iterable normalization in from() and fromSync() to FROM_BATCH_SIZE. This avoids unbounded batches for from() sync iterable fallbacks and lets fromSync() coalesce plain Uint8Array values for writev paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63324 Backport-PR-URL: #64675 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
1 parent 1d7c86d commit c50d8e4

5 files changed

Lines changed: 216 additions & 20 deletions

File tree

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Measures batching behavior for stream/iter from() and fromSync()
2+
// with plain synchronous Uint8Array iterables.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
const{ closeSync, openSync, writeSync, writevSync }=require('fs');
7+
const{ devNull }=require('os');
8+
9+
constbench=common.createBenchmark(main,{
10+
method: ['from-first-batch','from-sync-writev'],
11+
chunks: [256,4096,16384],
12+
chunkSize: [16],
13+
n: [100,1000],
14+
},{
15+
flags: ['--experimental-stream-iter'],
16+
combinationFilter({ method, chunks, n }){
17+
if(n===1){
18+
returntrue;
19+
}
20+
if(method==='from-first-batch'){
21+
returnn===1000;
22+
}
23+
returnn===100&&chunks!==16384;
24+
},
25+
test: {
26+
chunks: 256,
27+
chunkSize: 16,
28+
n: 1,
29+
},
30+
});
31+
32+
functionmain({ method, chunks, chunkSize, n }){
33+
switch(method){
34+
case'from-first-batch':
35+
returnbenchFromFirstBatch(chunks,chunkSize,n);
36+
case'from-sync-writev':
37+
returnbenchFromSyncWritev(chunks,chunkSize,n);
38+
}
39+
}
40+
41+
function*source(chunks,chunk){
42+
for(leti=0;i<chunks;i++){
43+
yieldchunk;
44+
}
45+
}
46+
47+
functionbenchFromFirstBatch(chunks,chunkSize,n){
48+
const{ from }=require('stream/iter');
49+
constchunk=newUint8Array(chunkSize);
50+
letseen=0;
51+
52+
(async()=>{
53+
bench.start();
54+
for(leti=0;i<n;i++){
55+
constiterator=from(source(chunks,chunk))[Symbol.asyncIterator]();
56+
const{ value, done }=awaititerator.next();
57+
if(done||value.length===0){
58+
thrownewError('expected a batch');
59+
}
60+
seen+=value.length;
61+
}
62+
bench.end(n);
63+
if(seen===0){
64+
thrownewError('expected chunks');
65+
}
66+
})();
67+
}
68+
69+
functionbenchFromSyncWritev(chunks,chunkSize,n){
70+
const{ pipeToSync }=require('stream/iter');
71+
constchunk=newUint8Array(chunkSize);
72+
constexpected=chunks*chunkSize*n;
73+
letseen=0;
74+
lettotal=0;
75+
constfd=openSync(devNull,'w');
76+
constwriter={
77+
writeSync(chunk){
78+
writeSync(fd,chunk);
79+
seen++;
80+
},
81+
writevSync(batch){
82+
writevSync(fd,batch);
83+
seen+=batch.length;
84+
},
85+
};
86+
87+
try{
88+
bench.start();
89+
for(leti=0;i<n;i++){
90+
total+=pipeToSync(source(chunks,chunk),writer);
91+
}
92+
bench.end(chunks*n);
93+
}finally{
94+
closeSync(fd);
95+
}
96+
97+
if(total!==expected||seen!==chunks*n){
98+
thrownewError('unexpected chunk count');
99+
}
100+
}

β€Žlib/internal/streams/iter/from.jsβ€Ž

Lines changed: 57 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const {
4747
toUint8Array,
4848
}=require('internal/streams/iter/utils');
4949

50-
// Maximum number of chunks to yield per batch from from(Uint8Array[]).
50+
// Maximum number of chunks to yield per batch from from()/fromSync().
5151
// Bounds peak memory when arrays flow through transforms, which must
5252
// allocate output for the entire batch at once.
5353
constFROM_BATCH_SIZE=128;
@@ -190,33 +190,66 @@ function isUint8ArrayBatch(value) {
190190
returntrue;
191191
}
192192

193+
function*yieldBoundedBatch(batch){
194+
if(batch.length===0){
195+
return;
196+
}
197+
if(batch.length<=FROM_BATCH_SIZE){
198+
yieldbatch;
199+
return;
200+
}
201+
for(leti=0;i<batch.length;i+=FROM_BATCH_SIZE){
202+
yieldArrayPrototypeSlice(batch,i,i+FROM_BATCH_SIZE);
203+
}
204+
}
205+
193206
/**
194207
* Normalize a sync streamable source, yielding batches of Uint8Array.
195208
* @param {Iterable} source
196209
* @yields {Uint8Array[]}
197210
*/
198211
function*normalizeSyncSource(source){
212+
letbatch=[];
213+
199214
for(constvalueofsource){
200215
// Fast path 1: value is already a Uint8Array[] batch
201216
if(isUint8ArrayBatch(value)){
202-
if(value.length>0){
203-
yieldvalue;
217+
if(batch.length>0){
218+
yieldbatch;
219+
batch=[];
204220
}
221+
yield*yieldBoundedBatch(value);
205222
continue;
206223
}
207224
// Fast path 2: value is a single Uint8Array (very common)
208225
if(isUint8Array(value)){
209-
yield[value];
226+
ArrayPrototypePush(batch,value);
227+
if(batch.length===FROM_BATCH_SIZE){
228+
yieldbatch;
229+
batch=[];
230+
}
210231
continue;
211232
}
212233
// Slow path: normalize the value
213-
constbatch=[];
214-
for(constchunkofnormalizeSyncValue(value)){
215-
ArrayPrototypePush(batch,chunk);
216-
}
217234
if(batch.length>0){
218235
yieldbatch;
236+
batch=[];
237+
}
238+
letvalueBatch=[];
239+
for(constchunkofnormalizeSyncValue(value)){
240+
ArrayPrototypePush(valueBatch,chunk);
241+
if(valueBatch.length===FROM_BATCH_SIZE){
242+
yieldvalueBatch;
243+
valueBatch=[];
244+
}
219245
}
246+
if(valueBatch.length>0){
247+
yieldvalueBatch;
248+
}
249+
}
250+
251+
if(batch.length>0){
252+
yieldbatch;
220253
}
221254
}
222255

@@ -329,36 +362,42 @@ async function* normalizeAsyncSource(source) {
329362
return;
330363
}
331364

332-
// Fall back to sync iteration - batch all sync values together
365+
// Fall back to sync iteration - batch sync values together with a bound.
333366
if(isSyncIterable(source)){
334-
constbatch=[];
367+
letbatch=[];
335368

336369
for(constvalueofsource){
337370
// Fast path 1: value is already a Uint8Array[] batch
338371
if(isUint8ArrayBatch(value)){
339372
// Flush any accumulated batch first
340373
if(batch.length>0){
341-
yieldArrayPrototypeSlice(batch);
342-
batch.length=0;
343-
}
344-
if(value.length>0){
345-
yieldvalue;
374+
yieldbatch;
375+
batch=[];
346376
}
377+
yield*yieldBoundedBatch(value);
347378
continue;
348379
}
349380
// Fast path 2: value is a single Uint8Array (very common)
350381
if(isUint8Array(value)){
351382
ArrayPrototypePush(batch,value);
383+
if(batch.length===FROM_BATCH_SIZE){
384+
yieldbatch;
385+
batch=[];
386+
}
352387
continue;
353388
}
354389
// Slow path: normalize the value - must flush and yield individually
355390
if(batch.length>0){
356-
yieldArrayPrototypeSlice(batch);
357-
batch.length=0;
391+
yieldbatch;
392+
batch=[];
358393
}
359-
constasyncBatch=[];
394+
letasyncBatch=[];
360395
forawait(constchunkofnormalizeAsyncValue(value)){
361396
ArrayPrototypePush(asyncBatch,chunk);
397+
if(asyncBatch.length===FROM_BATCH_SIZE){
398+
yieldasyncBatch;
399+
asyncBatch=[];
400+
}
362401
}
363402
if(asyncBatch.length>0){
364403
yieldasyncBatch;

β€Žtest/parallel/test-stream-iter-from-coverage.jsβ€Ž

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@ async function testFromSyncSubBatching() {
3131
assert.strictEqual(totalChunks,200);
3232
}
3333

34+
// fromSync: generic sync iterables of Uint8Array use bounded batches
35+
asyncfunctiontestFromSyncIterableSubBatching(){
36+
function*gen(){
37+
for(leti=0;i<200;i++){
38+
yieldnewUint8Array([i&0xFF]);
39+
}
40+
}
41+
constbatches=[];
42+
for(constbatchoffromSync(gen())){
43+
batches.push(batch);
44+
}
45+
assert.strictEqual(batches.length,2);
46+
assert.strictEqual(batches[0].length,128);
47+
assert.strictEqual(batches[1].length,72);
48+
}
49+
3450
// from: Uint8Array[] with > 128 elements triggers sub-batching (async)
3551
asyncfunctiontestFromAsyncSubBatching(){
3652
constbigBatch=Array.from({length: 200},
@@ -44,6 +60,22 @@ async function testFromAsyncSubBatching() {
4460
assert.strictEqual(batches[1].length,72);
4561
}
4662

63+
// from: sync iterables use bounded batches instead of one unbounded batch
64+
asyncfunctiontestFromAsyncSyncIterableSubBatching(){
65+
function*gen(){
66+
for(leti=0;i<200;i++){
67+
yieldnewUint8Array([i&0xFF]);
68+
}
69+
}
70+
constbatches=[];
71+
forawait(constbatchoffrom(gen())){
72+
batches.push(batch);
73+
}
74+
assert.strictEqual(batches.length,2);
75+
assert.strictEqual(batches[0].length,128);
76+
assert.strictEqual(batches[1].length,72);
77+
}
78+
4779
// Exact boundary: 128 elements β†’ single batch (no split)
4880
asyncfunctiontestFromSubBatchingBoundary(){
4981
constexactBatch=Array.from({length: 128},
@@ -133,7 +165,9 @@ async function testFromSyncInvalidYield() {
133165

134166
Promise.all([
135167
testFromSyncSubBatching(),
168+
testFromSyncIterableSubBatching(),
136169
testFromAsyncSubBatching(),
170+
testFromAsyncSyncIterableSubBatching(),
137171
testFromSubBatchingBoundary(),
138172
testFromSubBatchingBoundaryPlus1(),
139173
testFromSyncDataViewInGenerator(),

β€Žtest/parallel/test-stream-iter-from-sync.jsβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ function testFromSyncGenerator() {
6666
for(constbatchofreadable){
6767
batches.push(batch);
6868
}
69-
assert.strictEqual(batches.length,2);
69+
assert.strictEqual(batches.length,1);
70+
assert.strictEqual(batches[0].length,2);
7071
assert.deepStrictEqual(batches[0][0],newUint8Array([1,2]));
71-
assert.deepStrictEqual(batches[1][0],newUint8Array([3,4]));
72+
assert.deepStrictEqual(batches[0][1],newUint8Array([3,4]));
7273
}
7374

7475
functiontestFromSyncNestedIterables(){

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,27 @@ async function testPipeToSyncWritev() {
151151
assert.ok(batches.some((b)=>b.length>1));
152152
}
153153

154+
// pipeToSync batches plain Uint8Array chunks for writevSync
155+
asyncfunctiontestPipeToSyncPlainChunksWritev(){
156+
constbatches=[];
157+
constwrites=[];
158+
constwriter={
159+
writevSync(chunks){batches.push(chunks);},
160+
writeSync(chunk){writes.push(chunk);returntrue;},
161+
endSync(){return0;},
162+
};
163+
function*source(){
164+
yieldnewUint8Array([1]);
165+
yieldnewUint8Array([2]);
166+
yieldnewUint8Array([3]);
167+
}
168+
consttotal=pipeToSync(source(),writer);
169+
assert.strictEqual(total,3);
170+
assert.strictEqual(batches.length,1);
171+
assert.strictEqual(batches[0].length,3);
172+
assert.strictEqual(writes.length,0);
173+
}
174+
154175
// pipeToSync with writer that has write() and writeSync() β€” writeSync preferred
155176
asyncfunctiontestPipeToSyncWriteFallback(){
156177
constsyncWrites=[];
@@ -174,5 +195,6 @@ Promise.all([
174195
testWriteSyncAlwaysFails(),
175196
testPushWriterBlockSyncFalseAccepted(),
176197
testPipeToSyncWritev(),
198+
testPipeToSyncPlainChunksWritev(),
177199
testPipeToSyncWriteFallback(),
178200
]).then(common.mustCall());

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit c50d8e4

Browse files
trivikraduh95
authored andcommitted
stream: limit iter from sync iterable batches
Bound sync iterable normalization in from() and fromSync() to FROM_BATCH_SIZE. This avoids unbounded batches for from() sync iterable fallbacks and lets fromSync() coalesce plain Uint8Array values for writev paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63324 Backport-PR-URL: #64675 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
1 parent 1d7c86d commit c50d8e4

5 files changed

Lines changed: 216 additions & 20 deletions

File tree

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Measures batching behavior for stream/iter from() and fromSync()
2+
// with plain synchronous Uint8Array iterables.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
const{ closeSync, openSync, writeSync, writevSync }=require('fs');
7+
const{ devNull }=require('os');
8+
9+
constbench=common.createBenchmark(main,{
10+
method: ['from-first-batch','from-sync-writev'],
11+
chunks: [256,4096,16384],
12+
chunkSize: [16],
13+
n: [100,1000],
14+
},{
15+
flags: ['--experimental-stream-iter'],
16+
combinationFilter({ method, chunks, n }){
17+
if(n===1){
18+
returntrue;
19+
}
20+
if(method==='from-first-batch'){
21+
returnn===1000;
22+
}
23+
returnn===100&&chunks!==16384;
24+
},
25+
test: {
26+
chunks: 256,
27+
chunkSize: 16,
28+
n: 1,
29+
},
30+
});
31+
32+
functionmain({ method, chunks, chunkSize, n }){
33+
switch(method){
34+
case'from-first-batch':
35+
returnbenchFromFirstBatch(chunks,chunkSize,n);
36+
case'from-sync-writev':
37+
returnbenchFromSyncWritev(chunks,chunkSize,n);
38+
}
39+
}
40+
41+
function*source(chunks,chunk){
42+
for(leti=0;i<chunks;i++){
43+
yieldchunk;
44+
}
45+
}
46+
47+
functionbenchFromFirstBatch(chunks,chunkSize,n){
48+
const{ from }=require('stream/iter');
49+
constchunk=newUint8Array(chunkSize);
50+
letseen=0;
51+
52+
(async()=>{
53+
bench.start();
54+
for(leti=0;i<n;i++){
55+
constiterator=from(source(chunks,chunk))[Symbol.asyncIterator]();
56+
const{ value, done }=awaititerator.next();
57+
if(done||value.length===0){
58+
thrownewError('expected a batch');
59+
}
60+
seen+=value.length;
61+
}
62+
bench.end(n);
63+
if(seen===0){
64+
thrownewError('expected chunks');
65+
}
66+
})();
67+
}
68+
69+
functionbenchFromSyncWritev(chunks,chunkSize,n){
70+
const{ pipeToSync }=require('stream/iter');
71+
constchunk=newUint8Array(chunkSize);
72+
constexpected=chunks*chunkSize*n;
73+
letseen=0;
74+
lettotal=0;
75+
constfd=openSync(devNull,'w');
76+
constwriter={
77+
writeSync(chunk){
78+
writeSync(fd,chunk);
79+
seen++;
80+
},
81+
writevSync(batch){
82+
writevSync(fd,batch);
83+
seen+=batch.length;
84+
},
85+
};
86+
87+
try{
88+
bench.start();
89+
for(leti=0;i<n;i++){
90+
total+=pipeToSync(source(chunks,chunk),writer);
91+
}
92+
bench.end(chunks*n);
93+
}finally{
94+
closeSync(fd);
95+
}
96+
97+
if(total!==expected||seen!==chunks*n){
98+
thrownewError('unexpected chunk count');
99+
}
100+
}

β€Žlib/internal/streams/iter/from.jsβ€Ž

Lines changed: 57 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const {
4747
toUint8Array,
4848
}=require('internal/streams/iter/utils');
4949

50-
// Maximum number of chunks to yield per batch from from(Uint8Array[]).
50+
// Maximum number of chunks to yield per batch from from()/fromSync().
5151
// Bounds peak memory when arrays flow through transforms, which must
5252
// allocate output for the entire batch at once.
5353
constFROM_BATCH_SIZE=128;
@@ -190,33 +190,66 @@ function isUint8ArrayBatch(value) {
190190
returntrue;
191191
}
192192

193+
function*yieldBoundedBatch(batch){
194+
if(batch.length===0){
195+
return;
196+
}
197+
if(batch.length<=FROM_BATCH_SIZE){
198+
yieldbatch;
199+
return;
200+
}
201+
for(leti=0;i<batch.length;i+=FROM_BATCH_SIZE){
202+
yieldArrayPrototypeSlice(batch,i,i+FROM_BATCH_SIZE);
203+
}
204+
}
205+
193206
/**
194207
* Normalize a sync streamable source, yielding batches of Uint8Array.
195208
* @param {Iterable} source
196209
* @yields {Uint8Array[]}
197210
*/
198211
function*normalizeSyncSource(source){
212+
letbatch=[];
213+
199214
for(constvalueofsource){
200215
// Fast path 1: value is already a Uint8Array[] batch
201216
if(isUint8ArrayBatch(value)){
202-
if(value.length>0){
203-
yieldvalue;
217+
if(batch.length>0){
218+
yieldbatch;
219+
batch=[];
204220
}
221+
yield*yieldBoundedBatch(value);
205222
continue;
206223
}
207224
// Fast path 2: value is a single Uint8Array (very common)
208225
if(isUint8Array(value)){
209-
yield[value];
226+
ArrayPrototypePush(batch,value);
227+
if(batch.length===FROM_BATCH_SIZE){
228+
yieldbatch;
229+
batch=[];
230+
}
210231
continue;
211232
}
212233
// Slow path: normalize the value
213-
constbatch=[];
214-
for(constchunkofnormalizeSyncValue(value)){
215-
ArrayPrototypePush(batch,chunk);
216-
}
217234
if(batch.length>0){
218235
yieldbatch;
236+
batch=[];
237+
}
238+
letvalueBatch=[];
239+
for(constchunkofnormalizeSyncValue(value)){
240+
ArrayPrototypePush(valueBatch,chunk);
241+
if(valueBatch.length===FROM_BATCH_SIZE){
242+
yieldvalueBatch;
243+
valueBatch=[];
244+
}
219245
}
246+
if(valueBatch.length>0){
247+
yieldvalueBatch;
248+
}
249+
}
250+
251+
if(batch.length>0){
252+
yieldbatch;
220253
}
221254
}
222255

@@ -329,36 +362,42 @@ async function* normalizeAsyncSource(source) {
329362
return;
330363
}
331364

332-
// Fall back to sync iteration - batch all sync values together
365+
// Fall back to sync iteration - batch sync values together with a bound.
333366
if(isSyncIterable(source)){
334-
constbatch=[];
367+
letbatch=[];
335368

336369
for(constvalueofsource){
337370
// Fast path 1: value is already a Uint8Array[] batch
338371
if(isUint8ArrayBatch(value)){
339372
// Flush any accumulated batch first
340373
if(batch.length>0){
341-
yieldArrayPrototypeSlice(batch);
342-
batch.length=0;
343-
}
344-
if(value.length>0){
345-
yieldvalue;
374+
yieldbatch;
375+
batch=[];
346376
}
377+
yield*yieldBoundedBatch(value);
347378
continue;
348379
}
349380
// Fast path 2: value is a single Uint8Array (very common)
350381
if(isUint8Array(value)){
351382
ArrayPrototypePush(batch,value);
383+
if(batch.length===FROM_BATCH_SIZE){
384+
yieldbatch;
385+
batch=[];
386+
}
352387
continue;
353388
}
354389
// Slow path: normalize the value - must flush and yield individually
355390
if(batch.length>0){
356-
yieldArrayPrototypeSlice(batch);
357-
batch.length=0;
391+
yieldbatch;
392+
batch=[];
358393
}
359-
constasyncBatch=[];
394+
letasyncBatch=[];
360395
forawait(constchunkofnormalizeAsyncValue(value)){
361396
ArrayPrototypePush(asyncBatch,chunk);
397+
if(asyncBatch.length===FROM_BATCH_SIZE){
398+
yieldasyncBatch;
399+
asyncBatch=[];
400+
}
362401
}
363402
if(asyncBatch.length>0){
364403
yieldasyncBatch;

β€Žtest/parallel/test-stream-iter-from-coverage.jsβ€Ž

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@ async function testFromSyncSubBatching() {
3131
assert.strictEqual(totalChunks,200);
3232
}
3333

34+
// fromSync: generic sync iterables of Uint8Array use bounded batches
35+
asyncfunctiontestFromSyncIterableSubBatching(){
36+
function*gen(){
37+
for(leti=0;i<200;i++){
38+
yieldnewUint8Array([i&0xFF]);
39+
}
40+
}
41+
constbatches=[];
42+
for(constbatchoffromSync(gen())){
43+
batches.push(batch);
44+
}
45+
assert.strictEqual(batches.length,2);
46+
assert.strictEqual(batches[0].length,128);
47+
assert.strictEqual(batches[1].length,72);
48+
}
49+
3450
// from: Uint8Array[] with > 128 elements triggers sub-batching (async)
3551
asyncfunctiontestFromAsyncSubBatching(){
3652
constbigBatch=Array.from({length: 200},
@@ -44,6 +60,22 @@ async function testFromAsyncSubBatching() {
4460
assert.strictEqual(batches[1].length,72);
4561
}
4662

63+
// from: sync iterables use bounded batches instead of one unbounded batch
64+
asyncfunctiontestFromAsyncSyncIterableSubBatching(){
65+
function*gen(){
66+
for(leti=0;i<200;i++){
67+
yieldnewUint8Array([i&0xFF]);
68+
}
69+
}
70+
constbatches=[];
71+
forawait(constbatchoffrom(gen())){
72+
batches.push(batch);
73+
}
74+
assert.strictEqual(batches.length,2);
75+
assert.strictEqual(batches[0].length,128);
76+
assert.strictEqual(batches[1].length,72);
77+
}
78+
4779
// Exact boundary: 128 elements β†’ single batch (no split)
4880
asyncfunctiontestFromSubBatchingBoundary(){
4981
constexactBatch=Array.from({length: 128},
@@ -133,7 +165,9 @@ async function testFromSyncInvalidYield() {
133165

134166
Promise.all([
135167
testFromSyncSubBatching(),
168+
testFromSyncIterableSubBatching(),
136169
testFromAsyncSubBatching(),
170+
testFromAsyncSyncIterableSubBatching(),
137171
testFromSubBatchingBoundary(),
138172
testFromSubBatchingBoundaryPlus1(),
139173
testFromSyncDataViewInGenerator(),

β€Žtest/parallel/test-stream-iter-from-sync.jsβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ function testFromSyncGenerator() {
6666
for(constbatchofreadable){
6767
batches.push(batch);
6868
}
69-
assert.strictEqual(batches.length,2);
69+
assert.strictEqual(batches.length,1);
70+
assert.strictEqual(batches[0].length,2);
7071
assert.deepStrictEqual(batches[0][0],newUint8Array([1,2]));
71-
assert.deepStrictEqual(batches[1][0],newUint8Array([3,4]));
72+
assert.deepStrictEqual(batches[0][1],newUint8Array([3,4]));
7273
}
7374

7475
functiontestFromSyncNestedIterables(){

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,27 @@ async function testPipeToSyncWritev() {
151151
assert.ok(batches.some((b)=>b.length>1));
152152
}
153153

154+
// pipeToSync batches plain Uint8Array chunks for writevSync
155+
asyncfunctiontestPipeToSyncPlainChunksWritev(){
156+
constbatches=[];
157+
constwrites=[];
158+
constwriter={
159+
writevSync(chunks){batches.push(chunks);},
160+
writeSync(chunk){writes.push(chunk);returntrue;},
161+
endSync(){return0;},
162+
};
163+
function*source(){
164+
yieldnewUint8Array([1]);
165+
yieldnewUint8Array([2]);
166+
yieldnewUint8Array([3]);
167+
}
168+
consttotal=pipeToSync(source(),writer);
169+
assert.strictEqual(total,3);
170+
assert.strictEqual(batches.length,1);
171+
assert.strictEqual(batches[0].length,3);
172+
assert.strictEqual(writes.length,0);
173+
}
174+
154175
// pipeToSync with writer that has write() and writeSync() β€” writeSync preferred
155176
asyncfunctiontestPipeToSyncWriteFallback(){
156177
constsyncWrites=[];
@@ -174,5 +195,6 @@ Promise.all([
174195
testWriteSyncAlwaysFails(),
175196
testPushWriterBlockSyncFalseAccepted(),
176197
testPipeToSyncWritev(),
198+
testPipeToSyncPlainChunksWritev(),
177199
testPipeToSyncWriteFallback(),
178200
]).then(common.mustCall());

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit c50d8e4

Browse files
trivikraduh95
authored andcommitted
stream: limit iter from sync iterable batches
Bound sync iterable normalization in from() and fromSync() to FROM_BATCH_SIZE. This avoids unbounded batches for from() sync iterable fallbacks and lets fromSync() coalesce plain Uint8Array values for writev paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63324 Backport-PR-URL: #64675 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
1 parent 1d7c86d commit c50d8e4

5 files changed

Lines changed: 216 additions & 20 deletions

File tree

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Measures batching behavior for stream/iter from() and fromSync()
2+
// with plain synchronous Uint8Array iterables.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
const{ closeSync, openSync, writeSync, writevSync }=require('fs');
7+
const{ devNull }=require('os');
8+
9+
constbench=common.createBenchmark(main,{
10+
method: ['from-first-batch','from-sync-writev'],
11+
chunks: [256,4096,16384],
12+
chunkSize: [16],
13+
n: [100,1000],
14+
},{
15+
flags: ['--experimental-stream-iter'],
16+
combinationFilter({ method, chunks, n }){
17+
if(n===1){
18+
returntrue;
19+
}
20+
if(method==='from-first-batch'){
21+
returnn===1000;
22+
}
23+
returnn===100&&chunks!==16384;
24+
},
25+
test: {
26+
chunks: 256,
27+
chunkSize: 16,
28+
n: 1,
29+
},
30+
});
31+
32+
functionmain({ method, chunks, chunkSize, n }){
33+
switch(method){
34+
case'from-first-batch':
35+
returnbenchFromFirstBatch(chunks,chunkSize,n);
36+
case'from-sync-writev':
37+
returnbenchFromSyncWritev(chunks,chunkSize,n);
38+
}
39+
}
40+
41+
function*source(chunks,chunk){
42+
for(leti=0;i<chunks;i++){
43+
yieldchunk;
44+
}
45+
}
46+
47+
functionbenchFromFirstBatch(chunks,chunkSize,n){
48+
const{ from }=require('stream/iter');
49+
constchunk=newUint8Array(chunkSize);
50+
letseen=0;
51+
52+
(async()=>{
53+
bench.start();
54+
for(leti=0;i<n;i++){
55+
constiterator=from(source(chunks,chunk))[Symbol.asyncIterator]();
56+
const{ value, done }=awaititerator.next();
57+
if(done||value.length===0){
58+
thrownewError('expected a batch');
59+
}
60+
seen+=value.length;
61+
}
62+
bench.end(n);
63+
if(seen===0){
64+
thrownewError('expected chunks');
65+
}
66+
})();
67+
}
68+
69+
functionbenchFromSyncWritev(chunks,chunkSize,n){
70+
const{ pipeToSync }=require('stream/iter');
71+
constchunk=newUint8Array(chunkSize);
72+
constexpected=chunks*chunkSize*n;
73+
letseen=0;
74+
lettotal=0;
75+
constfd=openSync(devNull,'w');
76+
constwriter={
77+
writeSync(chunk){
78+
writeSync(fd,chunk);
79+
seen++;
80+
},
81+
writevSync(batch){
82+
writevSync(fd,batch);
83+
seen+=batch.length;
84+
},
85+
};
86+
87+
try{
88+
bench.start();
89+
for(leti=0;i<n;i++){
90+
total+=pipeToSync(source(chunks,chunk),writer);
91+
}
92+
bench.end(chunks*n);
93+
}finally{
94+
closeSync(fd);
95+
}
96+
97+
if(total!==expected||seen!==chunks*n){
98+
thrownewError('unexpected chunk count');
99+
}
100+
}

β€Žlib/internal/streams/iter/from.jsβ€Ž

Lines changed: 57 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const {
4747
toUint8Array,
4848
}=require('internal/streams/iter/utils');
4949

50-
// Maximum number of chunks to yield per batch from from(Uint8Array[]).
50+
// Maximum number of chunks to yield per batch from from()/fromSync().
5151
// Bounds peak memory when arrays flow through transforms, which must
5252
// allocate output for the entire batch at once.
5353
constFROM_BATCH_SIZE=128;
@@ -190,33 +190,66 @@ function isUint8ArrayBatch(value) {
190190
returntrue;
191191
}
192192

193+
function*yieldBoundedBatch(batch){
194+
if(batch.length===0){
195+
return;
196+
}
197+
if(batch.length<=FROM_BATCH_SIZE){
198+
yieldbatch;
199+
return;
200+
}
201+
for(leti=0;i<batch.length;i+=FROM_BATCH_SIZE){
202+
yieldArrayPrototypeSlice(batch,i,i+FROM_BATCH_SIZE);
203+
}
204+
}
205+
193206
/**
194207
* Normalize a sync streamable source, yielding batches of Uint8Array.
195208
* @param {Iterable} source
196209
* @yields {Uint8Array[]}
197210
*/
198211
function*normalizeSyncSource(source){
212+
letbatch=[];
213+
199214
for(constvalueofsource){
200215
// Fast path 1: value is already a Uint8Array[] batch
201216
if(isUint8ArrayBatch(value)){
202-
if(value.length>0){
203-
yieldvalue;
217+
if(batch.length>0){
218+
yieldbatch;
219+
batch=[];
204220
}
221+
yield*yieldBoundedBatch(value);
205222
continue;
206223
}
207224
// Fast path 2: value is a single Uint8Array (very common)
208225
if(isUint8Array(value)){
209-
yield[value];
226+
ArrayPrototypePush(batch,value);
227+
if(batch.length===FROM_BATCH_SIZE){
228+
yieldbatch;
229+
batch=[];
230+
}
210231
continue;
211232
}
212233
// Slow path: normalize the value
213-
constbatch=[];
214-
for(constchunkofnormalizeSyncValue(value)){
215-
ArrayPrototypePush(batch,chunk);
216-
}
217234
if(batch.length>0){
218235
yieldbatch;
236+
batch=[];
237+
}
238+
letvalueBatch=[];
239+
for(constchunkofnormalizeSyncValue(value)){
240+
ArrayPrototypePush(valueBatch,chunk);
241+
if(valueBatch.length===FROM_BATCH_SIZE){
242+
yieldvalueBatch;
243+
valueBatch=[];
244+
}
219245
}
246+
if(valueBatch.length>0){
247+
yieldvalueBatch;
248+
}
249+
}
250+
251+
if(batch.length>0){
252+
yieldbatch;
220253
}
221254
}
222255

@@ -329,36 +362,42 @@ async function* normalizeAsyncSource(source) {
329362
return;
330363
}
331364

332-
// Fall back to sync iteration - batch all sync values together
365+
// Fall back to sync iteration - batch sync values together with a bound.
333366
if(isSyncIterable(source)){
334-
constbatch=[];
367+
letbatch=[];
335368

336369
for(constvalueofsource){
337370
// Fast path 1: value is already a Uint8Array[] batch
338371
if(isUint8ArrayBatch(value)){
339372
// Flush any accumulated batch first
340373
if(batch.length>0){
341-
yieldArrayPrototypeSlice(batch);
342-
batch.length=0;
343-
}
344-
if(value.length>0){
345-
yieldvalue;
374+
yieldbatch;
375+
batch=[];
346376
}
377+
yield*yieldBoundedBatch(value);
347378
continue;
348379
}
349380
// Fast path 2: value is a single Uint8Array (very common)
350381
if(isUint8Array(value)){
351382
ArrayPrototypePush(batch,value);
383+
if(batch.length===FROM_BATCH_SIZE){
384+
yieldbatch;
385+
batch=[];
386+
}
352387
continue;
353388
}
354389
// Slow path: normalize the value - must flush and yield individually
355390
if(batch.length>0){
356-
yieldArrayPrototypeSlice(batch);
357-
batch.length=0;
391+
yieldbatch;
392+
batch=[];
358393
}
359-
constasyncBatch=[];
394+
letasyncBatch=[];
360395
forawait(constchunkofnormalizeAsyncValue(value)){
361396
ArrayPrototypePush(asyncBatch,chunk);
397+
if(asyncBatch.length===FROM_BATCH_SIZE){
398+
yieldasyncBatch;
399+
asyncBatch=[];
400+
}
362401
}
363402
if(asyncBatch.length>0){
364403
yieldasyncBatch;

β€Žtest/parallel/test-stream-iter-from-coverage.jsβ€Ž

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@ async function testFromSyncSubBatching() {
3131
assert.strictEqual(totalChunks,200);
3232
}
3333

34+
// fromSync: generic sync iterables of Uint8Array use bounded batches
35+
asyncfunctiontestFromSyncIterableSubBatching(){
36+
function*gen(){
37+
for(leti=0;i<200;i++){
38+
yieldnewUint8Array([i&0xFF]);
39+
}
40+
}
41+
constbatches=[];
42+
for(constbatchoffromSync(gen())){
43+
batches.push(batch);
44+
}
45+
assert.strictEqual(batches.length,2);
46+
assert.strictEqual(batches[0].length,128);
47+
assert.strictEqual(batches[1].length,72);
48+
}
49+
3450
// from: Uint8Array[] with > 128 elements triggers sub-batching (async)
3551
asyncfunctiontestFromAsyncSubBatching(){
3652
constbigBatch=Array.from({length: 200},
@@ -44,6 +60,22 @@ async function testFromAsyncSubBatching() {
4460
assert.strictEqual(batches[1].length,72);
4561
}
4662

63+
// from: sync iterables use bounded batches instead of one unbounded batch
64+
asyncfunctiontestFromAsyncSyncIterableSubBatching(){
65+
function*gen(){
66+
for(leti=0;i<200;i++){
67+
yieldnewUint8Array([i&0xFF]);
68+
}
69+
}
70+
constbatches=[];
71+
forawait(constbatchoffrom(gen())){
72+
batches.push(batch);
73+
}
74+
assert.strictEqual(batches.length,2);
75+
assert.strictEqual(batches[0].length,128);
76+
assert.strictEqual(batches[1].length,72);
77+
}
78+
4779
// Exact boundary: 128 elements β†’ single batch (no split)
4880
asyncfunctiontestFromSubBatchingBoundary(){
4981
constexactBatch=Array.from({length: 128},
@@ -133,7 +165,9 @@ async function testFromSyncInvalidYield() {
133165

134166
Promise.all([
135167
testFromSyncSubBatching(),
168+
testFromSyncIterableSubBatching(),
136169
testFromAsyncSubBatching(),
170+
testFromAsyncSyncIterableSubBatching(),
137171
testFromSubBatchingBoundary(),
138172
testFromSubBatchingBoundaryPlus1(),
139173
testFromSyncDataViewInGenerator(),

β€Žtest/parallel/test-stream-iter-from-sync.jsβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ function testFromSyncGenerator() {
6666
for(constbatchofreadable){
6767
batches.push(batch);
6868
}
69-
assert.strictEqual(batches.length,2);
69+
assert.strictEqual(batches.length,1);
70+
assert.strictEqual(batches[0].length,2);
7071
assert.deepStrictEqual(batches[0][0],newUint8Array([1,2]));
71-
assert.deepStrictEqual(batches[1][0],newUint8Array([3,4]));
72+
assert.deepStrictEqual(batches[0][1],newUint8Array([3,4]));
7273
}
7374

7475
functiontestFromSyncNestedIterables(){

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,27 @@ async function testPipeToSyncWritev() {
151151
assert.ok(batches.some((b)=>b.length>1));
152152
}
153153

154+
// pipeToSync batches plain Uint8Array chunks for writevSync
155+
asyncfunctiontestPipeToSyncPlainChunksWritev(){
156+
constbatches=[];
157+
constwrites=[];
158+
constwriter={
159+
writevSync(chunks){batches.push(chunks);},
160+
writeSync(chunk){writes.push(chunk);returntrue;},
161+
endSync(){return0;},
162+
};
163+
function*source(){
164+
yieldnewUint8Array([1]);
165+
yieldnewUint8Array([2]);
166+
yieldnewUint8Array([3]);
167+
}
168+
consttotal=pipeToSync(source(),writer);
169+
assert.strictEqual(total,3);
170+
assert.strictEqual(batches.length,1);
171+
assert.strictEqual(batches[0].length,3);
172+
assert.strictEqual(writes.length,0);
173+
}
174+
154175
// pipeToSync with writer that has write() and writeSync() β€” writeSync preferred
155176
asyncfunctiontestPipeToSyncWriteFallback(){
156177
constsyncWrites=[];
@@ -174,5 +195,6 @@ Promise.all([
174195
testWriteSyncAlwaysFails(),
175196
testPushWriterBlockSyncFalseAccepted(),
176197
testPipeToSyncWritev(),
198+
testPipeToSyncPlainChunksWritev(),
177199
testPipeToSyncWriteFallback(),
178200
]).then(common.mustCall());

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit c50d8e4

Browse files
trivikraduh95
authored andcommitted
stream: limit iter from sync iterable batches
Bound sync iterable normalization in from() and fromSync() to FROM_BATCH_SIZE. This avoids unbounded batches for from() sync iterable fallbacks and lets fromSync() coalesce plain Uint8Array values for writev paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63324 Backport-PR-URL: #64675 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
1 parent 1d7c86d commit c50d8e4

5 files changed

Lines changed: 216 additions & 20 deletions

File tree

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Measures batching behavior for stream/iter from() and fromSync()
2+
// with plain synchronous Uint8Array iterables.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
const{ closeSync, openSync, writeSync, writevSync }=require('fs');
7+
const{ devNull }=require('os');
8+
9+
constbench=common.createBenchmark(main,{
10+
method: ['from-first-batch','from-sync-writev'],
11+
chunks: [256,4096,16384],
12+
chunkSize: [16],
13+
n: [100,1000],
14+
},{
15+
flags: ['--experimental-stream-iter'],
16+
combinationFilter({ method, chunks, n }){
17+
if(n===1){
18+
returntrue;
19+
}
20+
if(method==='from-first-batch'){
21+
returnn===1000;
22+
}
23+
returnn===100&&chunks!==16384;
24+
},
25+
test: {
26+
chunks: 256,
27+
chunkSize: 16,
28+
n: 1,
29+
},
30+
});
31+
32+
functionmain({ method, chunks, chunkSize, n }){
33+
switch(method){
34+
case'from-first-batch':
35+
returnbenchFromFirstBatch(chunks,chunkSize,n);
36+
case'from-sync-writev':
37+
returnbenchFromSyncWritev(chunks,chunkSize,n);
38+
}
39+
}
40+
41+
function*source(chunks,chunk){
42+
for(leti=0;i<chunks;i++){
43+
yieldchunk;
44+
}
45+
}
46+
47+
functionbenchFromFirstBatch(chunks,chunkSize,n){
48+
const{ from }=require('stream/iter');
49+
constchunk=newUint8Array(chunkSize);
50+
letseen=0;
51+
52+
(async()=>{
53+
bench.start();
54+
for(leti=0;i<n;i++){
55+
constiterator=from(source(chunks,chunk))[Symbol.asyncIterator]();
56+
const{ value, done }=awaititerator.next();
57+
if(done||value.length===0){
58+
thrownewError('expected a batch');
59+
}
60+
seen+=value.length;
61+
}
62+
bench.end(n);
63+
if(seen===0){
64+
thrownewError('expected chunks');
65+
}
66+
})();
67+
}
68+
69+
functionbenchFromSyncWritev(chunks,chunkSize,n){
70+
const{ pipeToSync }=require('stream/iter');
71+
constchunk=newUint8Array(chunkSize);
72+
constexpected=chunks*chunkSize*n;
73+
letseen=0;
74+
lettotal=0;
75+
constfd=openSync(devNull,'w');
76+
constwriter={
77+
writeSync(chunk){
78+
writeSync(fd,chunk);
79+
seen++;
80+
},
81+
writevSync(batch){
82+
writevSync(fd,batch);
83+
seen+=batch.length;
84+
},
85+
};
86+
87+
try{
88+
bench.start();
89+
for(leti=0;i<n;i++){
90+
total+=pipeToSync(source(chunks,chunk),writer);
91+
}
92+
bench.end(chunks*n);
93+
}finally{
94+
closeSync(fd);
95+
}
96+
97+
if(total!==expected||seen!==chunks*n){
98+
thrownewError('unexpected chunk count');
99+
}
100+
}

β€Žlib/internal/streams/iter/from.jsβ€Ž

Lines changed: 57 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const {
4747
toUint8Array,
4848
}=require('internal/streams/iter/utils');
4949

50-
// Maximum number of chunks to yield per batch from from(Uint8Array[]).
50+
// Maximum number of chunks to yield per batch from from()/fromSync().
5151
// Bounds peak memory when arrays flow through transforms, which must
5252
// allocate output for the entire batch at once.
5353
constFROM_BATCH_SIZE=128;
@@ -190,33 +190,66 @@ function isUint8ArrayBatch(value) {
190190
returntrue;
191191
}
192192

193+
function*yieldBoundedBatch(batch){
194+
if(batch.length===0){
195+
return;
196+
}
197+
if(batch.length<=FROM_BATCH_SIZE){
198+
yieldbatch;
199+
return;
200+
}
201+
for(leti=0;i<batch.length;i+=FROM_BATCH_SIZE){
202+
yieldArrayPrototypeSlice(batch,i,i+FROM_BATCH_SIZE);
203+
}
204+
}
205+
193206
/**
194207
* Normalize a sync streamable source, yielding batches of Uint8Array.
195208
* @param {Iterable} source
196209
* @yields {Uint8Array[]}
197210
*/
198211
function*normalizeSyncSource(source){
212+
letbatch=[];
213+
199214
for(constvalueofsource){
200215
// Fast path 1: value is already a Uint8Array[] batch
201216
if(isUint8ArrayBatch(value)){
202-
if(value.length>0){
203-
yieldvalue;
217+
if(batch.length>0){
218+
yieldbatch;
219+
batch=[];
204220
}
221+
yield*yieldBoundedBatch(value);
205222
continue;
206223
}
207224
// Fast path 2: value is a single Uint8Array (very common)
208225
if(isUint8Array(value)){
209-
yield[value];
226+
ArrayPrototypePush(batch,value);
227+
if(batch.length===FROM_BATCH_SIZE){
228+
yieldbatch;
229+
batch=[];
230+
}
210231
continue;
211232
}
212233
// Slow path: normalize the value
213-
constbatch=[];
214-
for(constchunkofnormalizeSyncValue(value)){
215-
ArrayPrototypePush(batch,chunk);
216-
}
217234
if(batch.length>0){
218235
yieldbatch;
236+
batch=[];
237+
}
238+
letvalueBatch=[];
239+
for(constchunkofnormalizeSyncValue(value)){
240+
ArrayPrototypePush(valueBatch,chunk);
241+
if(valueBatch.length===FROM_BATCH_SIZE){
242+
yieldvalueBatch;
243+
valueBatch=[];
244+
}
219245
}
246+
if(valueBatch.length>0){
247+
yieldvalueBatch;
248+
}
249+
}
250+
251+
if(batch.length>0){
252+
yieldbatch;
220253
}
221254
}
222255

@@ -329,36 +362,42 @@ async function* normalizeAsyncSource(source) {
329362
return;
330363
}
331364

332-
// Fall back to sync iteration - batch all sync values together
365+
// Fall back to sync iteration - batch sync values together with a bound.
333366
if(isSyncIterable(source)){
334-
constbatch=[];
367+
letbatch=[];
335368

336369
for(constvalueofsource){
337370
// Fast path 1: value is already a Uint8Array[] batch
338371
if(isUint8ArrayBatch(value)){
339372
// Flush any accumulated batch first
340373
if(batch.length>0){
341-
yieldArrayPrototypeSlice(batch);
342-
batch.length=0;
343-
}
344-
if(value.length>0){
345-
yieldvalue;
374+
yieldbatch;
375+
batch=[];
346376
}
377+
yield*yieldBoundedBatch(value);
347378
continue;
348379
}
349380
// Fast path 2: value is a single Uint8Array (very common)
350381
if(isUint8Array(value)){
351382
ArrayPrototypePush(batch,value);
383+
if(batch.length===FROM_BATCH_SIZE){
384+
yieldbatch;
385+
batch=[];
386+
}
352387
continue;
353388
}
354389
// Slow path: normalize the value - must flush and yield individually
355390
if(batch.length>0){
356-
yieldArrayPrototypeSlice(batch);
357-
batch.length=0;
391+
yieldbatch;
392+
batch=[];
358393
}
359-
constasyncBatch=[];
394+
letasyncBatch=[];
360395
forawait(constchunkofnormalizeAsyncValue(value)){
361396
ArrayPrototypePush(asyncBatch,chunk);
397+
if(asyncBatch.length===FROM_BATCH_SIZE){
398+
yieldasyncBatch;
399+
asyncBatch=[];
400+
}
362401
}
363402
if(asyncBatch.length>0){
364403
yieldasyncBatch;

β€Žtest/parallel/test-stream-iter-from-coverage.jsβ€Ž

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@ async function testFromSyncSubBatching() {
3131
assert.strictEqual(totalChunks,200);
3232
}
3333

34+
// fromSync: generic sync iterables of Uint8Array use bounded batches
35+
asyncfunctiontestFromSyncIterableSubBatching(){
36+
function*gen(){
37+
for(leti=0;i<200;i++){
38+
yieldnewUint8Array([i&0xFF]);
39+
}
40+
}
41+
constbatches=[];
42+
for(constbatchoffromSync(gen())){
43+
batches.push(batch);
44+
}
45+
assert.strictEqual(batches.length,2);
46+
assert.strictEqual(batches[0].length,128);
47+
assert.strictEqual(batches[1].length,72);
48+
}
49+
3450
// from: Uint8Array[] with > 128 elements triggers sub-batching (async)
3551
asyncfunctiontestFromAsyncSubBatching(){
3652
constbigBatch=Array.from({length: 200},
@@ -44,6 +60,22 @@ async function testFromAsyncSubBatching() {
4460
assert.strictEqual(batches[1].length,72);
4561
}
4662

63+
// from: sync iterables use bounded batches instead of one unbounded batch
64+
asyncfunctiontestFromAsyncSyncIterableSubBatching(){
65+
function*gen(){
66+
for(leti=0;i<200;i++){
67+
yieldnewUint8Array([i&0xFF]);
68+
}
69+
}
70+
constbatches=[];
71+
forawait(constbatchoffrom(gen())){
72+
batches.push(batch);
73+
}
74+
assert.strictEqual(batches.length,2);
75+
assert.strictEqual(batches[0].length,128);
76+
assert.strictEqual(batches[1].length,72);
77+
}
78+
4779
// Exact boundary: 128 elements β†’ single batch (no split)
4880
asyncfunctiontestFromSubBatchingBoundary(){
4981
constexactBatch=Array.from({length: 128},
@@ -133,7 +165,9 @@ async function testFromSyncInvalidYield() {
133165

134166
Promise.all([
135167
testFromSyncSubBatching(),
168+
testFromSyncIterableSubBatching(),
136169
testFromAsyncSubBatching(),
170+
testFromAsyncSyncIterableSubBatching(),
137171
testFromSubBatchingBoundary(),
138172
testFromSubBatchingBoundaryPlus1(),
139173
testFromSyncDataViewInGenerator(),

β€Žtest/parallel/test-stream-iter-from-sync.jsβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ function testFromSyncGenerator() {
6666
for(constbatchofreadable){
6767
batches.push(batch);
6868
}
69-
assert.strictEqual(batches.length,2);
69+
assert.strictEqual(batches.length,1);
70+
assert.strictEqual(batches[0].length,2);
7071
assert.deepStrictEqual(batches[0][0],newUint8Array([1,2]));
71-
assert.deepStrictEqual(batches[1][0],newUint8Array([3,4]));
72+
assert.deepStrictEqual(batches[0][1],newUint8Array([3,4]));
7273
}
7374

7475
functiontestFromSyncNestedIterables(){

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,27 @@ async function testPipeToSyncWritev() {
151151
assert.ok(batches.some((b)=>b.length>1));
152152
}
153153

154+
// pipeToSync batches plain Uint8Array chunks for writevSync
155+
asyncfunctiontestPipeToSyncPlainChunksWritev(){
156+
constbatches=[];
157+
constwrites=[];
158+
constwriter={
159+
writevSync(chunks){batches.push(chunks);},
160+
writeSync(chunk){writes.push(chunk);returntrue;},
161+
endSync(){return0;},
162+
};
163+
function*source(){
164+
yieldnewUint8Array([1]);
165+
yieldnewUint8Array([2]);
166+
yieldnewUint8Array([3]);
167+
}
168+
consttotal=pipeToSync(source(),writer);
169+
assert.strictEqual(total,3);
170+
assert.strictEqual(batches.length,1);
171+
assert.strictEqual(batches[0].length,3);
172+
assert.strictEqual(writes.length,0);
173+
}
174+
154175
// pipeToSync with writer that has write() and writeSync() β€” writeSync preferred
155176
asyncfunctiontestPipeToSyncWriteFallback(){
156177
constsyncWrites=[];
@@ -174,5 +195,6 @@ Promise.all([
174195
testWriteSyncAlwaysFails(),
175196
testPushWriterBlockSyncFalseAccepted(),
176197
testPipeToSyncWritev(),
198+
testPipeToSyncPlainChunksWritev(),
177199
testPipeToSyncWriteFallback(),
178200
]).then(common.mustCall());

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit c50d8e4

Browse files
trivikraduh95
authored andcommitted
stream: limit iter from sync iterable batches
Bound sync iterable normalization in from() and fromSync() to FROM_BATCH_SIZE. This avoids unbounded batches for from() sync iterable fallbacks and lets fromSync() coalesce plain Uint8Array values for writev paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63324 Backport-PR-URL: #64675 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
1 parent 1d7c86d commit c50d8e4

5 files changed

Lines changed: 216 additions & 20 deletions

File tree

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Measures batching behavior for stream/iter from() and fromSync()
2+
// with plain synchronous Uint8Array iterables.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
const{ closeSync, openSync, writeSync, writevSync }=require('fs');
7+
const{ devNull }=require('os');
8+
9+
constbench=common.createBenchmark(main,{
10+
method: ['from-first-batch','from-sync-writev'],
11+
chunks: [256,4096,16384],
12+
chunkSize: [16],
13+
n: [100,1000],
14+
},{
15+
flags: ['--experimental-stream-iter'],
16+
combinationFilter({ method, chunks, n }){
17+
if(n===1){
18+
returntrue;
19+
}
20+
if(method==='from-first-batch'){
21+
returnn===1000;
22+
}
23+
returnn===100&&chunks!==16384;
24+
},
25+
test: {
26+
chunks: 256,
27+
chunkSize: 16,
28+
n: 1,
29+
},
30+
});
31+
32+
functionmain({ method, chunks, chunkSize, n }){
33+
switch(method){
34+
case'from-first-batch':
35+
returnbenchFromFirstBatch(chunks,chunkSize,n);
36+
case'from-sync-writev':
37+
returnbenchFromSyncWritev(chunks,chunkSize,n);
38+
}
39+
}
40+
41+
function*source(chunks,chunk){
42+
for(leti=0;i<chunks;i++){
43+
yieldchunk;
44+
}
45+
}
46+
47+
functionbenchFromFirstBatch(chunks,chunkSize,n){
48+
const{ from }=require('stream/iter');
49+
constchunk=newUint8Array(chunkSize);
50+
letseen=0;
51+
52+
(async()=>{
53+
bench.start();
54+
for(leti=0;i<n;i++){
55+
constiterator=from(source(chunks,chunk))[Symbol.asyncIterator]();
56+
const{ value, done }=awaititerator.next();
57+
if(done||value.length===0){
58+
thrownewError('expected a batch');
59+
}
60+
seen+=value.length;
61+
}
62+
bench.end(n);
63+
if(seen===0){
64+
thrownewError('expected chunks');
65+
}
66+
})();
67+
}
68+
69+
functionbenchFromSyncWritev(chunks,chunkSize,n){
70+
const{ pipeToSync }=require('stream/iter');
71+
constchunk=newUint8Array(chunkSize);
72+
constexpected=chunks*chunkSize*n;
73+
letseen=0;
74+
lettotal=0;
75+
constfd=openSync(devNull,'w');
76+
constwriter={
77+
writeSync(chunk){
78+
writeSync(fd,chunk);
79+
seen++;
80+
},
81+
writevSync(batch){
82+
writevSync(fd,batch);
83+
seen+=batch.length;
84+
},
85+
};
86+
87+
try{
88+
bench.start();
89+
for(leti=0;i<n;i++){
90+
total+=pipeToSync(source(chunks,chunk),writer);
91+
}
92+
bench.end(chunks*n);
93+
}finally{
94+
closeSync(fd);
95+
}
96+
97+
if(total!==expected||seen!==chunks*n){
98+
thrownewError('unexpected chunk count');
99+
}
100+
}

β€Žlib/internal/streams/iter/from.jsβ€Ž

Lines changed: 57 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const {
4747
toUint8Array,
4848
}=require('internal/streams/iter/utils');
4949

50-
// Maximum number of chunks to yield per batch from from(Uint8Array[]).
50+
// Maximum number of chunks to yield per batch from from()/fromSync().
5151
// Bounds peak memory when arrays flow through transforms, which must
5252
// allocate output for the entire batch at once.
5353
constFROM_BATCH_SIZE=128;
@@ -190,33 +190,66 @@ function isUint8ArrayBatch(value) {
190190
returntrue;
191191
}
192192

193+
function*yieldBoundedBatch(batch){
194+
if(batch.length===0){
195+
return;
196+
}
197+
if(batch.length<=FROM_BATCH_SIZE){
198+
yieldbatch;
199+
return;
200+
}
201+
for(leti=0;i<batch.length;i+=FROM_BATCH_SIZE){
202+
yieldArrayPrototypeSlice(batch,i,i+FROM_BATCH_SIZE);
203+
}
204+
}
205+
193206
/**
194207
* Normalize a sync streamable source, yielding batches of Uint8Array.
195208
* @param {Iterable} source
196209
* @yields {Uint8Array[]}
197210
*/
198211
function*normalizeSyncSource(source){
212+
letbatch=[];
213+
199214
for(constvalueofsource){
200215
// Fast path 1: value is already a Uint8Array[] batch
201216
if(isUint8ArrayBatch(value)){
202-
if(value.length>0){
203-
yieldvalue;
217+
if(batch.length>0){
218+
yieldbatch;
219+
batch=[];
204220
}
221+
yield*yieldBoundedBatch(value);
205222
continue;
206223
}
207224
// Fast path 2: value is a single Uint8Array (very common)
208225
if(isUint8Array(value)){
209-
yield[value];
226+
ArrayPrototypePush(batch,value);
227+
if(batch.length===FROM_BATCH_SIZE){
228+
yieldbatch;
229+
batch=[];
230+
}
210231
continue;
211232
}
212233
// Slow path: normalize the value
213-
constbatch=[];
214-
for(constchunkofnormalizeSyncValue(value)){
215-
ArrayPrototypePush(batch,chunk);
216-
}
217234
if(batch.length>0){
218235
yieldbatch;
236+
batch=[];
237+
}
238+
letvalueBatch=[];
239+
for(constchunkofnormalizeSyncValue(value)){
240+
ArrayPrototypePush(valueBatch,chunk);
241+
if(valueBatch.length===FROM_BATCH_SIZE){
242+
yieldvalueBatch;
243+
valueBatch=[];
244+
}
219245
}
246+
if(valueBatch.length>0){
247+
yieldvalueBatch;
248+
}
249+
}
250+
251+
if(batch.length>0){
252+
yieldbatch;
220253
}
221254
}
222255

@@ -329,36 +362,42 @@ async function* normalizeAsyncSource(source) {
329362
return;
330363
}
331364

332-
// Fall back to sync iteration - batch all sync values together
365+
// Fall back to sync iteration - batch sync values together with a bound.
333366
if(isSyncIterable(source)){
334-
constbatch=[];
367+
letbatch=[];
335368

336369
for(constvalueofsource){
337370
// Fast path 1: value is already a Uint8Array[] batch
338371
if(isUint8ArrayBatch(value)){
339372
// Flush any accumulated batch first
340373
if(batch.length>0){
341-
yieldArrayPrototypeSlice(batch);
342-
batch.length=0;
343-
}
344-
if(value.length>0){
345-
yieldvalue;
374+
yieldbatch;
375+
batch=[];
346376
}
377+
yield*yieldBoundedBatch(value);
347378
continue;
348379
}
349380
// Fast path 2: value is a single Uint8Array (very common)
350381
if(isUint8Array(value)){
351382
ArrayPrototypePush(batch,value);
383+
if(batch.length===FROM_BATCH_SIZE){
384+
yieldbatch;
385+
batch=[];
386+
}
352387
continue;
353388
}
354389
// Slow path: normalize the value - must flush and yield individually
355390
if(batch.length>0){
356-
yieldArrayPrototypeSlice(batch);
357-
batch.length=0;
391+
yieldbatch;
392+
batch=[];
358393
}
359-
constasyncBatch=[];
394+
letasyncBatch=[];
360395
forawait(constchunkofnormalizeAsyncValue(value)){
361396
ArrayPrototypePush(asyncBatch,chunk);
397+
if(asyncBatch.length===FROM_BATCH_SIZE){
398+
yieldasyncBatch;
399+
asyncBatch=[];
400+
}
362401
}
363402
if(asyncBatch.length>0){
364403
yieldasyncBatch;

β€Žtest/parallel/test-stream-iter-from-coverage.jsβ€Ž

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@ async function testFromSyncSubBatching() {
3131
assert.strictEqual(totalChunks,200);
3232
}
3333

34+
// fromSync: generic sync iterables of Uint8Array use bounded batches
35+
asyncfunctiontestFromSyncIterableSubBatching(){
36+
function*gen(){
37+
for(leti=0;i<200;i++){
38+
yieldnewUint8Array([i&0xFF]);
39+
}
40+
}
41+
constbatches=[];
42+
for(constbatchoffromSync(gen())){
43+
batches.push(batch);
44+
}
45+
assert.strictEqual(batches.length,2);
46+
assert.strictEqual(batches[0].length,128);
47+
assert.strictEqual(batches[1].length,72);
48+
}
49+
3450
// from: Uint8Array[] with > 128 elements triggers sub-batching (async)
3551
asyncfunctiontestFromAsyncSubBatching(){
3652
constbigBatch=Array.from({length: 200},
@@ -44,6 +60,22 @@ async function testFromAsyncSubBatching() {
4460
assert.strictEqual(batches[1].length,72);
4561
}
4662

63+
// from: sync iterables use bounded batches instead of one unbounded batch
64+
asyncfunctiontestFromAsyncSyncIterableSubBatching(){
65+
function*gen(){
66+
for(leti=0;i<200;i++){
67+
yieldnewUint8Array([i&0xFF]);
68+
}
69+
}
70+
constbatches=[];
71+
forawait(constbatchoffrom(gen())){
72+
batches.push(batch);
73+
}
74+
assert.strictEqual(batches.length,2);
75+
assert.strictEqual(batches[0].length,128);
76+
assert.strictEqual(batches[1].length,72);
77+
}
78+
4779
// Exact boundary: 128 elements β†’ single batch (no split)
4880
asyncfunctiontestFromSubBatchingBoundary(){
4981
constexactBatch=Array.from({length: 128},
@@ -133,7 +165,9 @@ async function testFromSyncInvalidYield() {
133165

134166
Promise.all([
135167
testFromSyncSubBatching(),
168+
testFromSyncIterableSubBatching(),
136169
testFromAsyncSubBatching(),
170+
testFromAsyncSyncIterableSubBatching(),
137171
testFromSubBatchingBoundary(),
138172
testFromSubBatchingBoundaryPlus1(),
139173
testFromSyncDataViewInGenerator(),

β€Žtest/parallel/test-stream-iter-from-sync.jsβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ function testFromSyncGenerator() {
6666
for(constbatchofreadable){
6767
batches.push(batch);
6868
}
69-
assert.strictEqual(batches.length,2);
69+
assert.strictEqual(batches.length,1);
70+
assert.strictEqual(batches[0].length,2);
7071
assert.deepStrictEqual(batches[0][0],newUint8Array([1,2]));
71-
assert.deepStrictEqual(batches[1][0],newUint8Array([3,4]));
72+
assert.deepStrictEqual(batches[0][1],newUint8Array([3,4]));
7273
}
7374

7475
functiontestFromSyncNestedIterables(){

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,27 @@ async function testPipeToSyncWritev() {
151151
assert.ok(batches.some((b)=>b.length>1));
152152
}
153153

154+
// pipeToSync batches plain Uint8Array chunks for writevSync
155+
asyncfunctiontestPipeToSyncPlainChunksWritev(){
156+
constbatches=[];
157+
constwrites=[];
158+
constwriter={
159+
writevSync(chunks){batches.push(chunks);},
160+
writeSync(chunk){writes.push(chunk);returntrue;},
161+
endSync(){return0;},
162+
};
163+
function*source(){
164+
yieldnewUint8Array([1]);
165+
yieldnewUint8Array([2]);
166+
yieldnewUint8Array([3]);
167+
}
168+
consttotal=pipeToSync(source(),writer);
169+
assert.strictEqual(total,3);
170+
assert.strictEqual(batches.length,1);
171+
assert.strictEqual(batches[0].length,3);
172+
assert.strictEqual(writes.length,0);
173+
}
174+
154175
// pipeToSync with writer that has write() and writeSync() β€” writeSync preferred
155176
asyncfunctiontestPipeToSyncWriteFallback(){
156177
constsyncWrites=[];
@@ -174,5 +195,6 @@ Promise.all([
174195
testWriteSyncAlwaysFails(),
175196
testPushWriterBlockSyncFalseAccepted(),
176197
testPipeToSyncWritev(),
198+
testPipeToSyncPlainChunksWritev(),
177199
testPipeToSyncWriteFallback(),
178200
]).then(common.mustCall());

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit c50d8e4

Browse files
trivikraduh95
authored andcommitted
stream: limit iter from sync iterable batches
Bound sync iterable normalization in from() and fromSync() to FROM_BATCH_SIZE. This avoids unbounded batches for from() sync iterable fallbacks and lets fromSync() coalesce plain Uint8Array values for writev paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63324 Backport-PR-URL: #64675 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
1 parent 1d7c86d commit c50d8e4

5 files changed

Lines changed: 216 additions & 20 deletions

File tree

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Measures batching behavior for stream/iter from() and fromSync()
2+
// with plain synchronous Uint8Array iterables.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
const{ closeSync, openSync, writeSync, writevSync }=require('fs');
7+
const{ devNull }=require('os');
8+
9+
constbench=common.createBenchmark(main,{
10+
method: ['from-first-batch','from-sync-writev'],
11+
chunks: [256,4096,16384],
12+
chunkSize: [16],
13+
n: [100,1000],
14+
},{
15+
flags: ['--experimental-stream-iter'],
16+
combinationFilter({ method, chunks, n }){
17+
if(n===1){
18+
returntrue;
19+
}
20+
if(method==='from-first-batch'){
21+
returnn===1000;
22+
}
23+
returnn===100&&chunks!==16384;
24+
},
25+
test: {
26+
chunks: 256,
27+
chunkSize: 16,
28+
n: 1,
29+
},
30+
});
31+
32+
functionmain({ method, chunks, chunkSize, n }){
33+
switch(method){
34+
case'from-first-batch':
35+
returnbenchFromFirstBatch(chunks,chunkSize,n);
36+
case'from-sync-writev':
37+
returnbenchFromSyncWritev(chunks,chunkSize,n);
38+
}
39+
}
40+
41+
function*source(chunks,chunk){
42+
for(leti=0;i<chunks;i++){
43+
yieldchunk;
44+
}
45+
}
46+
47+
functionbenchFromFirstBatch(chunks,chunkSize,n){
48+
const{ from }=require('stream/iter');
49+
constchunk=newUint8Array(chunkSize);
50+
letseen=0;
51+
52+
(async()=>{
53+
bench.start();
54+
for(leti=0;i<n;i++){
55+
constiterator=from(source(chunks,chunk))[Symbol.asyncIterator]();
56+
const{ value, done }=awaititerator.next();
57+
if(done||value.length===0){
58+
thrownewError('expected a batch');
59+
}
60+
seen+=value.length;
61+
}
62+
bench.end(n);
63+
if(seen===0){
64+
thrownewError('expected chunks');
65+
}
66+
})();
67+
}
68+
69+
functionbenchFromSyncWritev(chunks,chunkSize,n){
70+
const{ pipeToSync }=require('stream/iter');
71+
constchunk=newUint8Array(chunkSize);
72+
constexpected=chunks*chunkSize*n;
73+
letseen=0;
74+
lettotal=0;
75+
constfd=openSync(devNull,'w');
76+
constwriter={
77+
writeSync(chunk){
78+
writeSync(fd,chunk);
79+
seen++;
80+
},
81+
writevSync(batch){
82+
writevSync(fd,batch);
83+
seen+=batch.length;
84+
},
85+
};
86+
87+
try{
88+
bench.start();
89+
for(leti=0;i<n;i++){
90+
total+=pipeToSync(source(chunks,chunk),writer);
91+
}
92+
bench.end(chunks*n);
93+
}finally{
94+
closeSync(fd);
95+
}
96+
97+
if(total!==expected||seen!==chunks*n){
98+
thrownewError('unexpected chunk count');
99+
}
100+
}

β€Žlib/internal/streams/iter/from.jsβ€Ž

Lines changed: 57 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const {
4747
toUint8Array,
4848
}=require('internal/streams/iter/utils');
4949

50-
// Maximum number of chunks to yield per batch from from(Uint8Array[]).
50+
// Maximum number of chunks to yield per batch from from()/fromSync().
5151
// Bounds peak memory when arrays flow through transforms, which must
5252
// allocate output for the entire batch at once.
5353
constFROM_BATCH_SIZE=128;
@@ -190,33 +190,66 @@ function isUint8ArrayBatch(value) {
190190
returntrue;
191191
}
192192

193+
function*yieldBoundedBatch(batch){
194+
if(batch.length===0){
195+
return;
196+
}
197+
if(batch.length<=FROM_BATCH_SIZE){
198+
yieldbatch;
199+
return;
200+
}
201+
for(leti=0;i<batch.length;i+=FROM_BATCH_SIZE){
202+
yieldArrayPrototypeSlice(batch,i,i+FROM_BATCH_SIZE);
203+
}
204+
}
205+
193206
/**
194207
* Normalize a sync streamable source, yielding batches of Uint8Array.
195208
* @param {Iterable} source
196209
* @yields {Uint8Array[]}
197210
*/
198211
function*normalizeSyncSource(source){
212+
letbatch=[];
213+
199214
for(constvalueofsource){
200215
// Fast path 1: value is already a Uint8Array[] batch
201216
if(isUint8ArrayBatch(value)){
202-
if(value.length>0){
203-
yieldvalue;
217+
if(batch.length>0){
218+
yieldbatch;
219+
batch=[];
204220
}
221+
yield*yieldBoundedBatch(value);
205222
continue;
206223
}
207224
// Fast path 2: value is a single Uint8Array (very common)
208225
if(isUint8Array(value)){
209-
yield[value];
226+
ArrayPrototypePush(batch,value);
227+
if(batch.length===FROM_BATCH_SIZE){
228+
yieldbatch;
229+
batch=[];
230+
}
210231
continue;
211232
}
212233
// Slow path: normalize the value
213-
constbatch=[];
214-
for(constchunkofnormalizeSyncValue(value)){
215-
ArrayPrototypePush(batch,chunk);
216-
}
217234
if(batch.length>0){
218235
yieldbatch;
236+
batch=[];
237+
}
238+
letvalueBatch=[];
239+
for(constchunkofnormalizeSyncValue(value)){
240+
ArrayPrototypePush(valueBatch,chunk);
241+
if(valueBatch.length===FROM_BATCH_SIZE){
242+
yieldvalueBatch;
243+
valueBatch=[];
244+
}
219245
}
246+
if(valueBatch.length>0){
247+
yieldvalueBatch;
248+
}
249+
}
250+
251+
if(batch.length>0){
252+
yieldbatch;
220253
}
221254
}
222255

@@ -329,36 +362,42 @@ async function* normalizeAsyncSource(source) {
329362
return;
330363
}
331364

332-
// Fall back to sync iteration - batch all sync values together
365+
// Fall back to sync iteration - batch sync values together with a bound.
333366
if(isSyncIterable(source)){
334-
constbatch=[];
367+
letbatch=[];
335368

336369
for(constvalueofsource){
337370
// Fast path 1: value is already a Uint8Array[] batch
338371
if(isUint8ArrayBatch(value)){
339372
// Flush any accumulated batch first
340373
if(batch.length>0){
341-
yieldArrayPrototypeSlice(batch);
342-
batch.length=0;
343-
}
344-
if(value.length>0){
345-
yieldvalue;
374+
yieldbatch;
375+
batch=[];
346376
}
377+
yield*yieldBoundedBatch(value);
347378
continue;
348379
}
349380
// Fast path 2: value is a single Uint8Array (very common)
350381
if(isUint8Array(value)){
351382
ArrayPrototypePush(batch,value);
383+
if(batch.length===FROM_BATCH_SIZE){
384+
yieldbatch;
385+
batch=[];
386+
}
352387
continue;
353388
}
354389
// Slow path: normalize the value - must flush and yield individually
355390
if(batch.length>0){
356-
yieldArrayPrototypeSlice(batch);
357-
batch.length=0;
391+
yieldbatch;
392+
batch=[];
358393
}
359-
constasyncBatch=[];
394+
letasyncBatch=[];
360395
forawait(constchunkofnormalizeAsyncValue(value)){
361396
ArrayPrototypePush(asyncBatch,chunk);
397+
if(asyncBatch.length===FROM_BATCH_SIZE){
398+
yieldasyncBatch;
399+
asyncBatch=[];
400+
}
362401
}
363402
if(asyncBatch.length>0){
364403
yieldasyncBatch;

β€Žtest/parallel/test-stream-iter-from-coverage.jsβ€Ž

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@ async function testFromSyncSubBatching() {
3131
assert.strictEqual(totalChunks,200);
3232
}
3333

34+
// fromSync: generic sync iterables of Uint8Array use bounded batches
35+
asyncfunctiontestFromSyncIterableSubBatching(){
36+
function*gen(){
37+
for(leti=0;i<200;i++){
38+
yieldnewUint8Array([i&0xFF]);
39+
}
40+
}
41+
constbatches=[];
42+
for(constbatchoffromSync(gen())){
43+
batches.push(batch);
44+
}
45+
assert.strictEqual(batches.length,2);
46+
assert.strictEqual(batches[0].length,128);
47+
assert.strictEqual(batches[1].length,72);
48+
}
49+
3450
// from: Uint8Array[] with > 128 elements triggers sub-batching (async)
3551
asyncfunctiontestFromAsyncSubBatching(){
3652
constbigBatch=Array.from({length: 200},
@@ -44,6 +60,22 @@ async function testFromAsyncSubBatching() {
4460
assert.strictEqual(batches[1].length,72);
4561
}
4662

63+
// from: sync iterables use bounded batches instead of one unbounded batch
64+
asyncfunctiontestFromAsyncSyncIterableSubBatching(){
65+
function*gen(){
66+
for(leti=0;i<200;i++){
67+
yieldnewUint8Array([i&0xFF]);
68+
}
69+
}
70+
constbatches=[];
71+
forawait(constbatchoffrom(gen())){
72+
batches.push(batch);
73+
}
74+
assert.strictEqual(batches.length,2);
75+
assert.strictEqual(batches[0].length,128);
76+
assert.strictEqual(batches[1].length,72);
77+
}
78+
4779
// Exact boundary: 128 elements β†’ single batch (no split)
4880
asyncfunctiontestFromSubBatchingBoundary(){
4981
constexactBatch=Array.from({length: 128},
@@ -133,7 +165,9 @@ async function testFromSyncInvalidYield() {
133165

134166
Promise.all([
135167
testFromSyncSubBatching(),
168+
testFromSyncIterableSubBatching(),
136169
testFromAsyncSubBatching(),
170+
testFromAsyncSyncIterableSubBatching(),
137171
testFromSubBatchingBoundary(),
138172
testFromSubBatchingBoundaryPlus1(),
139173
testFromSyncDataViewInGenerator(),

β€Žtest/parallel/test-stream-iter-from-sync.jsβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ function testFromSyncGenerator() {
6666
for(constbatchofreadable){
6767
batches.push(batch);
6868
}
69-
assert.strictEqual(batches.length,2);
69+
assert.strictEqual(batches.length,1);
70+
assert.strictEqual(batches[0].length,2);
7071
assert.deepStrictEqual(batches[0][0],newUint8Array([1,2]));
71-
assert.deepStrictEqual(batches[1][0],newUint8Array([3,4]));
72+
assert.deepStrictEqual(batches[0][1],newUint8Array([3,4]));
7273
}
7374

7475
functiontestFromSyncNestedIterables(){

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,27 @@ async function testPipeToSyncWritev() {
151151
assert.ok(batches.some((b)=>b.length>1));
152152
}
153153

154+
// pipeToSync batches plain Uint8Array chunks for writevSync
155+
asyncfunctiontestPipeToSyncPlainChunksWritev(){
156+
constbatches=[];
157+
constwrites=[];
158+
constwriter={
159+
writevSync(chunks){batches.push(chunks);},
160+
writeSync(chunk){writes.push(chunk);returntrue;},
161+
endSync(){return0;},
162+
};
163+
function*source(){
164+
yieldnewUint8Array([1]);
165+
yieldnewUint8Array([2]);
166+
yieldnewUint8Array([3]);
167+
}
168+
consttotal=pipeToSync(source(),writer);
169+
assert.strictEqual(total,3);
170+
assert.strictEqual(batches.length,1);
171+
assert.strictEqual(batches[0].length,3);
172+
assert.strictEqual(writes.length,0);
173+
}
174+
154175
// pipeToSync with writer that has write() and writeSync() β€” writeSync preferred
155176
asyncfunctiontestPipeToSyncWriteFallback(){
156177
constsyncWrites=[];
@@ -174,5 +195,6 @@ Promise.all([
174195
testWriteSyncAlwaysFails(),
175196
testPushWriterBlockSyncFalseAccepted(),
176197
testPipeToSyncWritev(),
198+
testPipeToSyncPlainChunksWritev(),
177199
testPipeToSyncWriteFallback(),
178200
]).then(common.mustCall());

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit c50d8e4

Browse files
trivikraduh95
authored andcommitted
stream: limit iter from sync iterable batches
Bound sync iterable normalization in from() and fromSync() to FROM_BATCH_SIZE. This avoids unbounded batches for from() sync iterable fallbacks and lets fromSync() coalesce plain Uint8Array values for writev paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63324 Backport-PR-URL: #64675 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
1 parent 1d7c86d commit c50d8e4

5 files changed

Lines changed: 216 additions & 20 deletions

File tree

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Measures batching behavior for stream/iter from() and fromSync()
2+
// with plain synchronous Uint8Array iterables.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
const{ closeSync, openSync, writeSync, writevSync }=require('fs');
7+
const{ devNull }=require('os');
8+
9+
constbench=common.createBenchmark(main,{
10+
method: ['from-first-batch','from-sync-writev'],
11+
chunks: [256,4096,16384],
12+
chunkSize: [16],
13+
n: [100,1000],
14+
},{
15+
flags: ['--experimental-stream-iter'],
16+
combinationFilter({ method, chunks, n }){
17+
if(n===1){
18+
returntrue;
19+
}
20+
if(method==='from-first-batch'){
21+
returnn===1000;
22+
}
23+
returnn===100&&chunks!==16384;
24+
},
25+
test: {
26+
chunks: 256,
27+
chunkSize: 16,
28+
n: 1,
29+
},
30+
});
31+
32+
functionmain({ method, chunks, chunkSize, n }){
33+
switch(method){
34+
case'from-first-batch':
35+
returnbenchFromFirstBatch(chunks,chunkSize,n);
36+
case'from-sync-writev':
37+
returnbenchFromSyncWritev(chunks,chunkSize,n);
38+
}
39+
}
40+
41+
function*source(chunks,chunk){
42+
for(leti=0;i<chunks;i++){
43+
yieldchunk;
44+
}
45+
}
46+
47+
functionbenchFromFirstBatch(chunks,chunkSize,n){
48+
const{ from }=require('stream/iter');
49+
constchunk=newUint8Array(chunkSize);
50+
letseen=0;
51+
52+
(async()=>{
53+
bench.start();
54+
for(leti=0;i<n;i++){
55+
constiterator=from(source(chunks,chunk))[Symbol.asyncIterator]();
56+
const{ value, done }=awaititerator.next();
57+
if(done||value.length===0){
58+
thrownewError('expected a batch');
59+
}
60+
seen+=value.length;
61+
}
62+
bench.end(n);
63+
if(seen===0){
64+
thrownewError('expected chunks');
65+
}
66+
})();
67+
}
68+
69+
functionbenchFromSyncWritev(chunks,chunkSize,n){
70+
const{ pipeToSync }=require('stream/iter');
71+
constchunk=newUint8Array(chunkSize);
72+
constexpected=chunks*chunkSize*n;
73+
letseen=0;
74+
lettotal=0;
75+
constfd=openSync(devNull,'w');
76+
constwriter={
77+
writeSync(chunk){
78+
writeSync(fd,chunk);
79+
seen++;
80+
},
81+
writevSync(batch){
82+
writevSync(fd,batch);
83+
seen+=batch.length;
84+
},
85+
};
86+
87+
try{
88+
bench.start();
89+
for(leti=0;i<n;i++){
90+
total+=pipeToSync(source(chunks,chunk),writer);
91+
}
92+
bench.end(chunks*n);
93+
}finally{
94+
closeSync(fd);
95+
}
96+
97+
if(total!==expected||seen!==chunks*n){
98+
thrownewError('unexpected chunk count');
99+
}
100+
}

β€Žlib/internal/streams/iter/from.jsβ€Ž

Lines changed: 57 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const {
4747
toUint8Array,
4848
}=require('internal/streams/iter/utils');
4949

50-
// Maximum number of chunks to yield per batch from from(Uint8Array[]).
50+
// Maximum number of chunks to yield per batch from from()/fromSync().
5151
// Bounds peak memory when arrays flow through transforms, which must
5252
// allocate output for the entire batch at once.
5353
constFROM_BATCH_SIZE=128;
@@ -190,33 +190,66 @@ function isUint8ArrayBatch(value) {
190190
returntrue;
191191
}
192192

193+
function*yieldBoundedBatch(batch){
194+
if(batch.length===0){
195+
return;
196+
}
197+
if(batch.length<=FROM_BATCH_SIZE){
198+
yieldbatch;
199+
return;
200+
}
201+
for(leti=0;i<batch.length;i+=FROM_BATCH_SIZE){
202+
yieldArrayPrototypeSlice(batch,i,i+FROM_BATCH_SIZE);
203+
}
204+
}
205+
193206
/**
194207
* Normalize a sync streamable source, yielding batches of Uint8Array.
195208
* @param {Iterable} source
196209
* @yields {Uint8Array[]}
197210
*/
198211
function*normalizeSyncSource(source){
212+
letbatch=[];
213+
199214
for(constvalueofsource){
200215
// Fast path 1: value is already a Uint8Array[] batch
201216
if(isUint8ArrayBatch(value)){
202-
if(value.length>0){
203-
yieldvalue;
217+
if(batch.length>0){
218+
yieldbatch;
219+
batch=[];
204220
}
221+
yield*yieldBoundedBatch(value);
205222
continue;
206223
}
207224
// Fast path 2: value is a single Uint8Array (very common)
208225
if(isUint8Array(value)){
209-
yield[value];
226+
ArrayPrototypePush(batch,value);
227+
if(batch.length===FROM_BATCH_SIZE){
228+
yieldbatch;
229+
batch=[];
230+
}
210231
continue;
211232
}
212233
// Slow path: normalize the value
213-
constbatch=[];
214-
for(constchunkofnormalizeSyncValue(value)){
215-
ArrayPrototypePush(batch,chunk);
216-
}
217234
if(batch.length>0){
218235
yieldbatch;
236+
batch=[];
237+
}
238+
letvalueBatch=[];
239+
for(constchunkofnormalizeSyncValue(value)){
240+
ArrayPrototypePush(valueBatch,chunk);
241+
if(valueBatch.length===FROM_BATCH_SIZE){
242+
yieldvalueBatch;
243+
valueBatch=[];
244+
}
219245
}
246+
if(valueBatch.length>0){
247+
yieldvalueBatch;
248+
}
249+
}
250+
251+
if(batch.length>0){
252+
yieldbatch;
220253
}
221254
}
222255

@@ -329,36 +362,42 @@ async function* normalizeAsyncSource(source) {
329362
return;
330363
}
331364

332-
// Fall back to sync iteration - batch all sync values together
365+
// Fall back to sync iteration - batch sync values together with a bound.
333366
if(isSyncIterable(source)){
334-
constbatch=[];
367+
letbatch=[];
335368

336369
for(constvalueofsource){
337370
// Fast path 1: value is already a Uint8Array[] batch
338371
if(isUint8ArrayBatch(value)){
339372
// Flush any accumulated batch first
340373
if(batch.length>0){
341-
yieldArrayPrototypeSlice(batch);
342-
batch.length=0;
343-
}
344-
if(value.length>0){
345-
yieldvalue;
374+
yieldbatch;
375+
batch=[];
346376
}
377+
yield*yieldBoundedBatch(value);
347378
continue;
348379
}
349380
// Fast path 2: value is a single Uint8Array (very common)
350381
if(isUint8Array(value)){
351382
ArrayPrototypePush(batch,value);
383+
if(batch.length===FROM_BATCH_SIZE){
384+
yieldbatch;
385+
batch=[];
386+
}
352387
continue;
353388
}
354389
// Slow path: normalize the value - must flush and yield individually
355390
if(batch.length>0){
356-
yieldArrayPrototypeSlice(batch);
357-
batch.length=0;
391+
yieldbatch;
392+
batch=[];
358393
}
359-
constasyncBatch=[];
394+
letasyncBatch=[];
360395
forawait(constchunkofnormalizeAsyncValue(value)){
361396
ArrayPrototypePush(asyncBatch,chunk);
397+
if(asyncBatch.length===FROM_BATCH_SIZE){
398+
yieldasyncBatch;
399+
asyncBatch=[];
400+
}
362401
}
363402
if(asyncBatch.length>0){
364403
yieldasyncBatch;

β€Žtest/parallel/test-stream-iter-from-coverage.jsβ€Ž

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@ async function testFromSyncSubBatching() {
3131
assert.strictEqual(totalChunks,200);
3232
}
3333

34+
// fromSync: generic sync iterables of Uint8Array use bounded batches
35+
asyncfunctiontestFromSyncIterableSubBatching(){
36+
function*gen(){
37+
for(leti=0;i<200;i++){
38+
yieldnewUint8Array([i&0xFF]);
39+
}
40+
}
41+
constbatches=[];
42+
for(constbatchoffromSync(gen())){
43+
batches.push(batch);
44+
}
45+
assert.strictEqual(batches.length,2);
46+
assert.strictEqual(batches[0].length,128);
47+
assert.strictEqual(batches[1].length,72);
48+
}
49+
3450
// from: Uint8Array[] with > 128 elements triggers sub-batching (async)
3551
asyncfunctiontestFromAsyncSubBatching(){
3652
constbigBatch=Array.from({length: 200},
@@ -44,6 +60,22 @@ async function testFromAsyncSubBatching() {
4460
assert.strictEqual(batches[1].length,72);
4561
}
4662

63+
// from: sync iterables use bounded batches instead of one unbounded batch
64+
asyncfunctiontestFromAsyncSyncIterableSubBatching(){
65+
function*gen(){
66+
for(leti=0;i<200;i++){
67+
yieldnewUint8Array([i&0xFF]);
68+
}
69+
}
70+
constbatches=[];
71+
forawait(constbatchoffrom(gen())){
72+
batches.push(batch);
73+
}
74+
assert.strictEqual(batches.length,2);
75+
assert.strictEqual(batches[0].length,128);
76+
assert.strictEqual(batches[1].length,72);
77+
}
78+
4779
// Exact boundary: 128 elements β†’ single batch (no split)
4880
asyncfunctiontestFromSubBatchingBoundary(){
4981
constexactBatch=Array.from({length: 128},
@@ -133,7 +165,9 @@ async function testFromSyncInvalidYield() {
133165

134166
Promise.all([
135167
testFromSyncSubBatching(),
168+
testFromSyncIterableSubBatching(),
136169
testFromAsyncSubBatching(),
170+
testFromAsyncSyncIterableSubBatching(),
137171
testFromSubBatchingBoundary(),
138172
testFromSubBatchingBoundaryPlus1(),
139173
testFromSyncDataViewInGenerator(),

β€Žtest/parallel/test-stream-iter-from-sync.jsβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ function testFromSyncGenerator() {
6666
for(constbatchofreadable){
6767
batches.push(batch);
6868
}
69-
assert.strictEqual(batches.length,2);
69+
assert.strictEqual(batches.length,1);
70+
assert.strictEqual(batches[0].length,2);
7071
assert.deepStrictEqual(batches[0][0],newUint8Array([1,2]));
71-
assert.deepStrictEqual(batches[1][0],newUint8Array([3,4]));
72+
assert.deepStrictEqual(batches[0][1],newUint8Array([3,4]));
7273
}
7374

7475
functiontestFromSyncNestedIterables(){

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,27 @@ async function testPipeToSyncWritev() {
151151
assert.ok(batches.some((b)=>b.length>1));
152152
}
153153

154+
// pipeToSync batches plain Uint8Array chunks for writevSync
155+
asyncfunctiontestPipeToSyncPlainChunksWritev(){
156+
constbatches=[];
157+
constwrites=[];
158+
constwriter={
159+
writevSync(chunks){batches.push(chunks);},
160+
writeSync(chunk){writes.push(chunk);returntrue;},
161+
endSync(){return0;},
162+
};
163+
function*source(){
164+
yieldnewUint8Array([1]);
165+
yieldnewUint8Array([2]);
166+
yieldnewUint8Array([3]);
167+
}
168+
consttotal=pipeToSync(source(),writer);
169+
assert.strictEqual(total,3);
170+
assert.strictEqual(batches.length,1);
171+
assert.strictEqual(batches[0].length,3);
172+
assert.strictEqual(writes.length,0);
173+
}
174+
154175
// pipeToSync with writer that has write() and writeSync() β€” writeSync preferred
155176
asyncfunctiontestPipeToSyncWriteFallback(){
156177
constsyncWrites=[];
@@ -174,5 +195,6 @@ Promise.all([
174195
testWriteSyncAlwaysFails(),
175196
testPushWriterBlockSyncFalseAccepted(),
176197
testPipeToSyncWritev(),
198+
testPipeToSyncPlainChunksWritev(),
177199
testPipeToSyncWriteFallback(),
178200
]).then(common.mustCall());

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit c50d8e4

Browse files
trivikraduh95
authored andcommitted
stream: limit iter from sync iterable batches
Bound sync iterable normalization in from() and fromSync() to FROM_BATCH_SIZE. This avoids unbounded batches for from() sync iterable fallbacks and lets fromSync() coalesce plain Uint8Array values for writev paths. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5 PR-URL: #63324 Backport-PR-URL: #64675 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
1 parent 1d7c86d commit c50d8e4

5 files changed

Lines changed: 216 additions & 20 deletions

File tree

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Measures batching behavior for stream/iter from() and fromSync()
2+
// with plain synchronous Uint8Array iterables.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
const{ closeSync, openSync, writeSync, writevSync }=require('fs');
7+
const{ devNull }=require('os');
8+
9+
constbench=common.createBenchmark(main,{
10+
method: ['from-first-batch','from-sync-writev'],
11+
chunks: [256,4096,16384],
12+
chunkSize: [16],
13+
n: [100,1000],
14+
},{
15+
flags: ['--experimental-stream-iter'],
16+
combinationFilter({ method, chunks, n }){
17+
if(n===1){
18+
returntrue;
19+
}
20+
if(method==='from-first-batch'){
21+
returnn===1000;
22+
}
23+
returnn===100&&chunks!==16384;
24+
},
25+
test: {
26+
chunks: 256,
27+
chunkSize: 16,
28+
n: 1,
29+
},
30+
});
31+
32+
functionmain({ method, chunks, chunkSize, n }){
33+
switch(method){
34+
case'from-first-batch':
35+
returnbenchFromFirstBatch(chunks,chunkSize,n);
36+
case'from-sync-writev':
37+
returnbenchFromSyncWritev(chunks,chunkSize,n);
38+
}
39+
}
40+
41+
function*source(chunks,chunk){
42+
for(leti=0;i<chunks;i++){
43+
yieldchunk;
44+
}
45+
}
46+
47+
functionbenchFromFirstBatch(chunks,chunkSize,n){
48+
const{ from }=require('stream/iter');
49+
constchunk=newUint8Array(chunkSize);
50+
letseen=0;
51+
52+
(async()=>{
53+
bench.start();
54+
for(leti=0;i<n;i++){
55+
constiterator=from(source(chunks,chunk))[Symbol.asyncIterator]();
56+
const{ value, done }=awaititerator.next();
57+
if(done||value.length===0){
58+
thrownewError('expected a batch');
59+
}
60+
seen+=value.length;
61+
}
62+
bench.end(n);
63+
if(seen===0){
64+
thrownewError('expected chunks');
65+
}
66+
})();
67+
}
68+
69+
functionbenchFromSyncWritev(chunks,chunkSize,n){
70+
const{ pipeToSync }=require('stream/iter');
71+
constchunk=newUint8Array(chunkSize);
72+
constexpected=chunks*chunkSize*n;
73+
letseen=0;
74+
lettotal=0;
75+
constfd=openSync(devNull,'w');
76+
constwriter={
77+
writeSync(chunk){
78+
writeSync(fd,chunk);
79+
seen++;
80+
},
81+
writevSync(batch){
82+
writevSync(fd,batch);
83+
seen+=batch.length;
84+
},
85+
};
86+
87+
try{
88+
bench.start();
89+
for(leti=0;i<n;i++){
90+
total+=pipeToSync(source(chunks,chunk),writer);
91+
}
92+
bench.end(chunks*n);
93+
}finally{
94+
closeSync(fd);
95+
}
96+
97+
if(total!==expected||seen!==chunks*n){
98+
thrownewError('unexpected chunk count');
99+
}
100+
}

β€Žlib/internal/streams/iter/from.jsβ€Ž

Lines changed: 57 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const {
4747
toUint8Array,
4848
}=require('internal/streams/iter/utils');
4949

50-
// Maximum number of chunks to yield per batch from from(Uint8Array[]).
50+
// Maximum number of chunks to yield per batch from from()/fromSync().
5151
// Bounds peak memory when arrays flow through transforms, which must
5252
// allocate output for the entire batch at once.
5353
constFROM_BATCH_SIZE=128;
@@ -190,33 +190,66 @@ function isUint8ArrayBatch(value) {
190190
returntrue;
191191
}
192192

193+
function*yieldBoundedBatch(batch){
194+
if(batch.length===0){
195+
return;
196+
}
197+
if(batch.length<=FROM_BATCH_SIZE){
198+
yieldbatch;
199+
return;
200+
}
201+
for(leti=0;i<batch.length;i+=FROM_BATCH_SIZE){
202+
yieldArrayPrototypeSlice(batch,i,i+FROM_BATCH_SIZE);
203+
}
204+
}
205+
193206
/**
194207
* Normalize a sync streamable source, yielding batches of Uint8Array.
195208
* @param {Iterable} source
196209
* @yields {Uint8Array[]}
197210
*/
198211
function*normalizeSyncSource(source){
212+
letbatch=[];
213+
199214
for(constvalueofsource){
200215
// Fast path 1: value is already a Uint8Array[] batch
201216
if(isUint8ArrayBatch(value)){
202-
if(value.length>0){
203-
yieldvalue;
217+
if(batch.length>0){
218+
yieldbatch;
219+
batch=[];
204220
}
221+
yield*yieldBoundedBatch(value);
205222
continue;
206223
}
207224
// Fast path 2: value is a single Uint8Array (very common)
208225
if(isUint8Array(value)){
209-
yield[value];
226+
ArrayPrototypePush(batch,value);
227+
if(batch.length===FROM_BATCH_SIZE){
228+
yieldbatch;
229+
batch=[];
230+
}
210231
continue;
211232
}
212233
// Slow path: normalize the value
213-
constbatch=[];
214-
for(constchunkofnormalizeSyncValue(value)){
215-
ArrayPrototypePush(batch,chunk);
216-
}
217234
if(batch.length>0){
218235
yieldbatch;
236+
batch=[];
237+
}
238+
letvalueBatch=[];
239+
for(constchunkofnormalizeSyncValue(value)){
240+
ArrayPrototypePush(valueBatch,chunk);
241+
if(valueBatch.length===FROM_BATCH_SIZE){
242+
yieldvalueBatch;
243+
valueBatch=[];
244+
}
219245
}
246+
if(valueBatch.length>0){
247+
yieldvalueBatch;
248+
}
249+
}
250+
251+
if(batch.length>0){
252+
yieldbatch;
220253
}
221254
}
222255

@@ -329,36 +362,42 @@ async function* normalizeAsyncSource(source) {
329362
return;
330363
}
331364

332-
// Fall back to sync iteration - batch all sync values together
365+
// Fall back to sync iteration - batch sync values together with a bound.
333366
if(isSyncIterable(source)){
334-
constbatch=[];
367+
letbatch=[];
335368

336369
for(constvalueofsource){
337370
// Fast path 1: value is already a Uint8Array[] batch
338371
if(isUint8ArrayBatch(value)){
339372
// Flush any accumulated batch first
340373
if(batch.length>0){
341-
yieldArrayPrototypeSlice(batch);
342-
batch.length=0;
343-
}
344-
if(value.length>0){
345-
yieldvalue;
374+
yieldbatch;
375+
batch=[];
346376
}
377+
yield*yieldBoundedBatch(value);
347378
continue;
348379
}
349380
// Fast path 2: value is a single Uint8Array (very common)
350381
if(isUint8Array(value)){
351382
ArrayPrototypePush(batch,value);
383+
if(batch.length===FROM_BATCH_SIZE){
384+
yieldbatch;
385+
batch=[];
386+
}
352387
continue;
353388
}
354389
// Slow path: normalize the value - must flush and yield individually
355390
if(batch.length>0){
356-
yieldArrayPrototypeSlice(batch);
357-
batch.length=0;
391+
yieldbatch;
392+
batch=[];
358393
}
359-
constasyncBatch=[];
394+
letasyncBatch=[];
360395
forawait(constchunkofnormalizeAsyncValue(value)){
361396
ArrayPrototypePush(asyncBatch,chunk);
397+
if(asyncBatch.length===FROM_BATCH_SIZE){
398+
yieldasyncBatch;
399+
asyncBatch=[];
400+
}
362401
}
363402
if(asyncBatch.length>0){
364403
yieldasyncBatch;

β€Žtest/parallel/test-stream-iter-from-coverage.jsβ€Ž

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@ async function testFromSyncSubBatching() {
3131
assert.strictEqual(totalChunks,200);
3232
}
3333

34+
// fromSync: generic sync iterables of Uint8Array use bounded batches
35+
asyncfunctiontestFromSyncIterableSubBatching(){
36+
function*gen(){
37+
for(leti=0;i<200;i++){
38+
yieldnewUint8Array([i&0xFF]);
39+
}
40+
}
41+
constbatches=[];
42+
for(constbatchoffromSync(gen())){
43+
batches.push(batch);
44+
}
45+
assert.strictEqual(batches.length,2);
46+
assert.strictEqual(batches[0].length,128);
47+
assert.strictEqual(batches[1].length,72);
48+
}
49+
3450
// from: Uint8Array[] with > 128 elements triggers sub-batching (async)
3551
asyncfunctiontestFromAsyncSubBatching(){
3652
constbigBatch=Array.from({length: 200},
@@ -44,6 +60,22 @@ async function testFromAsyncSubBatching() {
4460
assert.strictEqual(batches[1].length,72);
4561
}
4662

63+
// from: sync iterables use bounded batches instead of one unbounded batch
64+
asyncfunctiontestFromAsyncSyncIterableSubBatching(){
65+
function*gen(){
66+
for(leti=0;i<200;i++){
67+
yieldnewUint8Array([i&0xFF]);
68+
}
69+
}
70+
constbatches=[];
71+
forawait(constbatchoffrom(gen())){
72+
batches.push(batch);
73+
}
74+
assert.strictEqual(batches.length,2);
75+
assert.strictEqual(batches[0].length,128);
76+
assert.strictEqual(batches[1].length,72);
77+
}
78+
4779
// Exact boundary: 128 elements β†’ single batch (no split)
4880
asyncfunctiontestFromSubBatchingBoundary(){
4981
constexactBatch=Array.from({length: 128},
@@ -133,7 +165,9 @@ async function testFromSyncInvalidYield() {
133165

134166
Promise.all([
135167
testFromSyncSubBatching(),
168+
testFromSyncIterableSubBatching(),
136169
testFromAsyncSubBatching(),
170+
testFromAsyncSyncIterableSubBatching(),
137171
testFromSubBatchingBoundary(),
138172
testFromSubBatchingBoundaryPlus1(),
139173
testFromSyncDataViewInGenerator(),

β€Žtest/parallel/test-stream-iter-from-sync.jsβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ function testFromSyncGenerator() {
6666
for(constbatchofreadable){
6767
batches.push(batch);
6868
}
69-
assert.strictEqual(batches.length,2);
69+
assert.strictEqual(batches.length,1);
70+
assert.strictEqual(batches[0].length,2);
7071
assert.deepStrictEqual(batches[0][0],newUint8Array([1,2]));
71-
assert.deepStrictEqual(batches[1][0],newUint8Array([3,4]));
72+
assert.deepStrictEqual(batches[0][1],newUint8Array([3,4]));
7273
}
7374

7475
functiontestFromSyncNestedIterables(){

β€Žtest/parallel/test-stream-iter-pipeto-writev.jsβ€Ž

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,27 @@ async function testPipeToSyncWritev() {
151151
assert.ok(batches.some((b)=>b.length>1));
152152
}
153153

154+
// pipeToSync batches plain Uint8Array chunks for writevSync
155+
asyncfunctiontestPipeToSyncPlainChunksWritev(){
156+
constbatches=[];
157+
constwrites=[];
158+
constwriter={
159+
writevSync(chunks){batches.push(chunks);},
160+
writeSync(chunk){writes.push(chunk);returntrue;},
161+
endSync(){return0;},
162+
};
163+
function*source(){
164+
yieldnewUint8Array([1]);
165+
yieldnewUint8Array([2]);
166+
yieldnewUint8Array([3]);
167+
}
168+
consttotal=pipeToSync(source(),writer);
169+
assert.strictEqual(total,3);
170+
assert.strictEqual(batches.length,1);
171+
assert.strictEqual(batches[0].length,3);
172+
assert.strictEqual(writes.length,0);
173+
}
174+
154175
// pipeToSync with writer that has write() and writeSync() β€” writeSync preferred
155176
asyncfunctiontestPipeToSyncWriteFallback(){
156177
constsyncWrites=[];
@@ -174,5 +195,6 @@ Promise.all([
174195
testWriteSyncAlwaysFails(),
175196
testPushWriterBlockSyncFalseAccepted(),
176197
testPipeToSyncWritev(),
198+
testPipeToSyncPlainChunksWritev(),
177199
testPipeToSyncWriteFallback(),
178200
]).then(common.mustCall());

0 commit comments

Comments
Β (0)