Commit c2c31d6

Browse files
pimterryaduh95
authored andcommitted
http: improve performance with known-length calls to end()
This boosts RPS performance for the common API case where you call `res.end(data)` with the entire response by up to 9%. Signed-off-by: Tim Perry <pimterry@gmail.com> PR-URL: #65466 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
1 parent 6409983 commit c2c31d6

3 files changed

Lines changed: 80 additions & 17 deletions

File tree

‎benchmark/http/end-string.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Responses sent as a single res.end(string) with a known Content-Length -
2+
// the shape a JSON or HTML endpoint produces.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
7+
constbench=common.createBenchmark(main,{
8+
len: [4,64,1024,16384,102400],
9+
c: [50],
10+
duration: 5,
11+
});
12+
13+
functionmain({ len, c, duration }){
14+
consthttp=require('http');
15+
constbody='a'.repeat(len);
16+
constheaders={
17+
'Content-Type': 'text/plain',
18+
'Content-Length': `${len}`,
19+
};
20+
21+
constserver=http.createServer((req,res)=>{
22+
res.writeHead(200,headers);
23+
res.end(body);
24+
});
25+
26+
server.listen(0,()=>{
27+
bench.http({
28+
connections: c,
29+
duration,
30+
port: server.address().port,
31+
},()=>{
32+
server.close();
33+
});
34+
});
35+
}

‎lib/_http_outgoing.js‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,25 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
10261026
}
10271027

10281028

1029+
// If this last write can be delivered immediately as the final chunk, this
1030+
// prepares to do so, and then returns true. If not, it returns false and
1031+
// a separate _send call and tick will be required to finish up.
1032+
functionmaybePrepareFinalChunk(msg,chunk,encoding){
1033+
if(typeofchunk!=='string'&&!isUint8Array(chunk))
1034+
returnfalse;
1035+
1036+
if(msg.destroyed||msg.strictContentLength)
1037+
returnfalse;
1038+
1039+
if(!msg._header){
1040+
msg._contentLength=typeofchunk==='string' ?
1041+
Buffer.byteLength(chunk,encoding) : chunk.byteLength;
1042+
msg._implicitHeader();
1043+
}
1044+
1045+
return!!msg._header&&msg._hasBody&&!msg.chunkedEncoding;
1046+
}
1047+
10291048
functionconnectionCorkNT(conn){
10301049
conn.uncork();
10311050
}
@@ -1131,6 +1150,8 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11311150
encoding=null;
11321151
}
11331152

1153+
letfinishCallback=null;
1154+
11341155
if(chunk){
11351156
if(this.finished){
11361157
onError(this,
@@ -1143,7 +1164,18 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11431164
this[kSocket].cork();
11441165
}
11451166

1146-
write_(this,chunk,encoding,null,true);
1167+
if(maybePrepareFinalChunk(this,chunk,encoding)){
1168+
// If just one final write is required, with nothing to follow, we
1169+
// attach finish to the write to avoid a separate send() & tick step
1170+
// later on - this is purely a performance optimization.
1171+
if(typeofcallback==='function'){
1172+
queueEndCallback(this,callback);
1173+
callback=undefined;
1174+
}
1175+
finishCallback=onFinish.bind(undefined,this);
1176+
}
1177+
1178+
write_(this,chunk,encoding,finishCallback,true);
11471179
}elseif(this.finished){
11481180
if(typeofcallback==='function'){
11491181
queueEndCallback(this,callback);
@@ -1165,14 +1197,17 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11651197
thrownewERR_HTTP_CONTENT_LENGTH_MISMATCH(this[kBytesWritten],this._contentLength);
11661198
}
11671199

1168-
constfinish=onFinish.bind(undefined,this);
1200+
if(finishCallback===null){
1201+
// If we didn't early finish, send the last data and schedule 'finish' now:
1202+
finishCallback=onFinish.bind(undefined,this);
11691203

1170-
if(this._hasBody&&this.chunkedEncoding){
1171-
this._send('0\r\n'+this._trailer+'\r\n','latin1',finish);
1172-
}elseif(!this._headerSent||this.writableLength||chunk){
1173-
this._send('','latin1',finish);
1174-
}else{
1175-
process.nextTick(finish);
1204+
if(this._hasBody&&this.chunkedEncoding){
1205+
this._send('0\r\n'+this._trailer+'\r\n','latin1',finishCallback);
1206+
}elseif(!this._headerSent||this.writableLength||chunk){
1207+
this._send('','latin1',finishCallback);
1208+
}else{
1209+
process.nextTick(finishCallback);
1210+
}
11761211
}
11771212

11781213
if(this[kSocket]){

‎test/parallel/test-http-server-response-standalone.js‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@ const res = new ServerResponse({
1515
httpVersionMinor: 1
1616
});
1717

18-
letfirstChunk=true;
19-
2018
constws=newWritable({
2119
write: common.mustCall((chunk,encoding,callback)=>{
22-
if(firstChunk){
23-
assert(chunk.toString().endsWith('hello world'));
24-
firstChunk=false;
25-
}else{
26-
assert.strictEqual(chunk.length,0);
27-
}
20+
assert(chunk.toString().endsWith('hello world'));
2821
setImmediate(callback);
29-
},2)
22+
},1)
3023
});
3124

3225
res.assignSocket(ws);

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 c2c31d6

Browse files
pimterryaduh95
authored andcommitted
http: improve performance with known-length calls to end()
This boosts RPS performance for the common API case where you call `res.end(data)` with the entire response by up to 9%. Signed-off-by: Tim Perry <pimterry@gmail.com> PR-URL: #65466 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
1 parent 6409983 commit c2c31d6

3 files changed

Lines changed: 80 additions & 17 deletions

File tree

‎benchmark/http/end-string.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Responses sent as a single res.end(string) with a known Content-Length -
2+
// the shape a JSON or HTML endpoint produces.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
7+
constbench=common.createBenchmark(main,{
8+
len: [4,64,1024,16384,102400],
9+
c: [50],
10+
duration: 5,
11+
});
12+
13+
functionmain({ len, c, duration }){
14+
consthttp=require('http');
15+
constbody='a'.repeat(len);
16+
constheaders={
17+
'Content-Type': 'text/plain',
18+
'Content-Length': `${len}`,
19+
};
20+
21+
constserver=http.createServer((req,res)=>{
22+
res.writeHead(200,headers);
23+
res.end(body);
24+
});
25+
26+
server.listen(0,()=>{
27+
bench.http({
28+
connections: c,
29+
duration,
30+
port: server.address().port,
31+
},()=>{
32+
server.close();
33+
});
34+
});
35+
}

‎lib/_http_outgoing.js‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,25 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
10261026
}
10271027

10281028

1029+
// If this last write can be delivered immediately as the final chunk, this
1030+
// prepares to do so, and then returns true. If not, it returns false and
1031+
// a separate _send call and tick will be required to finish up.
1032+
functionmaybePrepareFinalChunk(msg,chunk,encoding){
1033+
if(typeofchunk!=='string'&&!isUint8Array(chunk))
1034+
returnfalse;
1035+
1036+
if(msg.destroyed||msg.strictContentLength)
1037+
returnfalse;
1038+
1039+
if(!msg._header){
1040+
msg._contentLength=typeofchunk==='string' ?
1041+
Buffer.byteLength(chunk,encoding) : chunk.byteLength;
1042+
msg._implicitHeader();
1043+
}
1044+
1045+
return!!msg._header&&msg._hasBody&&!msg.chunkedEncoding;
1046+
}
1047+
10291048
functionconnectionCorkNT(conn){
10301049
conn.uncork();
10311050
}
@@ -1131,6 +1150,8 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11311150
encoding=null;
11321151
}
11331152

1153+
letfinishCallback=null;
1154+
11341155
if(chunk){
11351156
if(this.finished){
11361157
onError(this,
@@ -1143,7 +1164,18 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11431164
this[kSocket].cork();
11441165
}
11451166

1146-
write_(this,chunk,encoding,null,true);
1167+
if(maybePrepareFinalChunk(this,chunk,encoding)){
1168+
// If just one final write is required, with nothing to follow, we
1169+
// attach finish to the write to avoid a separate send() & tick step
1170+
// later on - this is purely a performance optimization.
1171+
if(typeofcallback==='function'){
1172+
queueEndCallback(this,callback);
1173+
callback=undefined;
1174+
}
1175+
finishCallback=onFinish.bind(undefined,this);
1176+
}
1177+
1178+
write_(this,chunk,encoding,finishCallback,true);
11471179
}elseif(this.finished){
11481180
if(typeofcallback==='function'){
11491181
queueEndCallback(this,callback);
@@ -1165,14 +1197,17 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11651197
thrownewERR_HTTP_CONTENT_LENGTH_MISMATCH(this[kBytesWritten],this._contentLength);
11661198
}
11671199

1168-
constfinish=onFinish.bind(undefined,this);
1200+
if(finishCallback===null){
1201+
// If we didn't early finish, send the last data and schedule 'finish' now:
1202+
finishCallback=onFinish.bind(undefined,this);
11691203

1170-
if(this._hasBody&&this.chunkedEncoding){
1171-
this._send('0\r\n'+this._trailer+'\r\n','latin1',finish);
1172-
}elseif(!this._headerSent||this.writableLength||chunk){
1173-
this._send('','latin1',finish);
1174-
}else{
1175-
process.nextTick(finish);
1204+
if(this._hasBody&&this.chunkedEncoding){
1205+
this._send('0\r\n'+this._trailer+'\r\n','latin1',finishCallback);
1206+
}elseif(!this._headerSent||this.writableLength||chunk){
1207+
this._send('','latin1',finishCallback);
1208+
}else{
1209+
process.nextTick(finishCallback);
1210+
}
11761211
}
11771212

11781213
if(this[kSocket]){

‎test/parallel/test-http-server-response-standalone.js‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@ const res = new ServerResponse({
1515
httpVersionMinor: 1
1616
});
1717

18-
letfirstChunk=true;
19-
2018
constws=newWritable({
2119
write: common.mustCall((chunk,encoding,callback)=>{
22-
if(firstChunk){
23-
assert(chunk.toString().endsWith('hello world'));
24-
firstChunk=false;
25-
}else{
26-
assert.strictEqual(chunk.length,0);
27-
}
20+
assert(chunk.toString().endsWith('hello world'));
2821
setImmediate(callback);
29-
},2)
22+
},1)
3023
});
3124

3225
res.assignSocket(ws);

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 c2c31d6

Browse files
pimterryaduh95
authored andcommitted
http: improve performance with known-length calls to end()
This boosts RPS performance for the common API case where you call `res.end(data)` with the entire response by up to 9%. Signed-off-by: Tim Perry <pimterry@gmail.com> PR-URL: #65466 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
1 parent 6409983 commit c2c31d6

3 files changed

Lines changed: 80 additions & 17 deletions

File tree

‎benchmark/http/end-string.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Responses sent as a single res.end(string) with a known Content-Length -
2+
// the shape a JSON or HTML endpoint produces.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
7+
constbench=common.createBenchmark(main,{
8+
len: [4,64,1024,16384,102400],
9+
c: [50],
10+
duration: 5,
11+
});
12+
13+
functionmain({ len, c, duration }){
14+
consthttp=require('http');
15+
constbody='a'.repeat(len);
16+
constheaders={
17+
'Content-Type': 'text/plain',
18+
'Content-Length': `${len}`,
19+
};
20+
21+
constserver=http.createServer((req,res)=>{
22+
res.writeHead(200,headers);
23+
res.end(body);
24+
});
25+
26+
server.listen(0,()=>{
27+
bench.http({
28+
connections: c,
29+
duration,
30+
port: server.address().port,
31+
},()=>{
32+
server.close();
33+
});
34+
});
35+
}

‎lib/_http_outgoing.js‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,25 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
10261026
}
10271027

10281028

1029+
// If this last write can be delivered immediately as the final chunk, this
1030+
// prepares to do so, and then returns true. If not, it returns false and
1031+
// a separate _send call and tick will be required to finish up.
1032+
functionmaybePrepareFinalChunk(msg,chunk,encoding){
1033+
if(typeofchunk!=='string'&&!isUint8Array(chunk))
1034+
returnfalse;
1035+
1036+
if(msg.destroyed||msg.strictContentLength)
1037+
returnfalse;
1038+
1039+
if(!msg._header){
1040+
msg._contentLength=typeofchunk==='string' ?
1041+
Buffer.byteLength(chunk,encoding) : chunk.byteLength;
1042+
msg._implicitHeader();
1043+
}
1044+
1045+
return!!msg._header&&msg._hasBody&&!msg.chunkedEncoding;
1046+
}
1047+
10291048
functionconnectionCorkNT(conn){
10301049
conn.uncork();
10311050
}
@@ -1131,6 +1150,8 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11311150
encoding=null;
11321151
}
11331152

1153+
letfinishCallback=null;
1154+
11341155
if(chunk){
11351156
if(this.finished){
11361157
onError(this,
@@ -1143,7 +1164,18 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11431164
this[kSocket].cork();
11441165
}
11451166

1146-
write_(this,chunk,encoding,null,true);
1167+
if(maybePrepareFinalChunk(this,chunk,encoding)){
1168+
// If just one final write is required, with nothing to follow, we
1169+
// attach finish to the write to avoid a separate send() & tick step
1170+
// later on - this is purely a performance optimization.
1171+
if(typeofcallback==='function'){
1172+
queueEndCallback(this,callback);
1173+
callback=undefined;
1174+
}
1175+
finishCallback=onFinish.bind(undefined,this);
1176+
}
1177+
1178+
write_(this,chunk,encoding,finishCallback,true);
11471179
}elseif(this.finished){
11481180
if(typeofcallback==='function'){
11491181
queueEndCallback(this,callback);
@@ -1165,14 +1197,17 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11651197
thrownewERR_HTTP_CONTENT_LENGTH_MISMATCH(this[kBytesWritten],this._contentLength);
11661198
}
11671199

1168-
constfinish=onFinish.bind(undefined,this);
1200+
if(finishCallback===null){
1201+
// If we didn't early finish, send the last data and schedule 'finish' now:
1202+
finishCallback=onFinish.bind(undefined,this);
11691203

1170-
if(this._hasBody&&this.chunkedEncoding){
1171-
this._send('0\r\n'+this._trailer+'\r\n','latin1',finish);
1172-
}elseif(!this._headerSent||this.writableLength||chunk){
1173-
this._send('','latin1',finish);
1174-
}else{
1175-
process.nextTick(finish);
1204+
if(this._hasBody&&this.chunkedEncoding){
1205+
this._send('0\r\n'+this._trailer+'\r\n','latin1',finishCallback);
1206+
}elseif(!this._headerSent||this.writableLength||chunk){
1207+
this._send('','latin1',finishCallback);
1208+
}else{
1209+
process.nextTick(finishCallback);
1210+
}
11761211
}
11771212

11781213
if(this[kSocket]){

‎test/parallel/test-http-server-response-standalone.js‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@ const res = new ServerResponse({
1515
httpVersionMinor: 1
1616
});
1717

18-
letfirstChunk=true;
19-
2018
constws=newWritable({
2119
write: common.mustCall((chunk,encoding,callback)=>{
22-
if(firstChunk){
23-
assert(chunk.toString().endsWith('hello world'));
24-
firstChunk=false;
25-
}else{
26-
assert.strictEqual(chunk.length,0);
27-
}
20+
assert(chunk.toString().endsWith('hello world'));
2821
setImmediate(callback);
29-
},2)
22+
},1)
3023
});
3124

3225
res.assignSocket(ws);

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 c2c31d6

Browse files
pimterryaduh95
authored andcommitted
http: improve performance with known-length calls to end()
This boosts RPS performance for the common API case where you call `res.end(data)` with the entire response by up to 9%. Signed-off-by: Tim Perry <pimterry@gmail.com> PR-URL: #65466 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
1 parent 6409983 commit c2c31d6

3 files changed

Lines changed: 80 additions & 17 deletions

File tree

‎benchmark/http/end-string.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Responses sent as a single res.end(string) with a known Content-Length -
2+
// the shape a JSON or HTML endpoint produces.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
7+
constbench=common.createBenchmark(main,{
8+
len: [4,64,1024,16384,102400],
9+
c: [50],
10+
duration: 5,
11+
});
12+
13+
functionmain({ len, c, duration }){
14+
consthttp=require('http');
15+
constbody='a'.repeat(len);
16+
constheaders={
17+
'Content-Type': 'text/plain',
18+
'Content-Length': `${len}`,
19+
};
20+
21+
constserver=http.createServer((req,res)=>{
22+
res.writeHead(200,headers);
23+
res.end(body);
24+
});
25+
26+
server.listen(0,()=>{
27+
bench.http({
28+
connections: c,
29+
duration,
30+
port: server.address().port,
31+
},()=>{
32+
server.close();
33+
});
34+
});
35+
}

‎lib/_http_outgoing.js‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,25 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
10261026
}
10271027

10281028

1029+
// If this last write can be delivered immediately as the final chunk, this
1030+
// prepares to do so, and then returns true. If not, it returns false and
1031+
// a separate _send call and tick will be required to finish up.
1032+
functionmaybePrepareFinalChunk(msg,chunk,encoding){
1033+
if(typeofchunk!=='string'&&!isUint8Array(chunk))
1034+
returnfalse;
1035+
1036+
if(msg.destroyed||msg.strictContentLength)
1037+
returnfalse;
1038+
1039+
if(!msg._header){
1040+
msg._contentLength=typeofchunk==='string' ?
1041+
Buffer.byteLength(chunk,encoding) : chunk.byteLength;
1042+
msg._implicitHeader();
1043+
}
1044+
1045+
return!!msg._header&&msg._hasBody&&!msg.chunkedEncoding;
1046+
}
1047+
10291048
functionconnectionCorkNT(conn){
10301049
conn.uncork();
10311050
}
@@ -1131,6 +1150,8 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11311150
encoding=null;
11321151
}
11331152

1153+
letfinishCallback=null;
1154+
11341155
if(chunk){
11351156
if(this.finished){
11361157
onError(this,
@@ -1143,7 +1164,18 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11431164
this[kSocket].cork();
11441165
}
11451166

1146-
write_(this,chunk,encoding,null,true);
1167+
if(maybePrepareFinalChunk(this,chunk,encoding)){
1168+
// If just one final write is required, with nothing to follow, we
1169+
// attach finish to the write to avoid a separate send() & tick step
1170+
// later on - this is purely a performance optimization.
1171+
if(typeofcallback==='function'){
1172+
queueEndCallback(this,callback);
1173+
callback=undefined;
1174+
}
1175+
finishCallback=onFinish.bind(undefined,this);
1176+
}
1177+
1178+
write_(this,chunk,encoding,finishCallback,true);
11471179
}elseif(this.finished){
11481180
if(typeofcallback==='function'){
11491181
queueEndCallback(this,callback);
@@ -1165,14 +1197,17 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11651197
thrownewERR_HTTP_CONTENT_LENGTH_MISMATCH(this[kBytesWritten],this._contentLength);
11661198
}
11671199

1168-
constfinish=onFinish.bind(undefined,this);
1200+
if(finishCallback===null){
1201+
// If we didn't early finish, send the last data and schedule 'finish' now:
1202+
finishCallback=onFinish.bind(undefined,this);
11691203

1170-
if(this._hasBody&&this.chunkedEncoding){
1171-
this._send('0\r\n'+this._trailer+'\r\n','latin1',finish);
1172-
}elseif(!this._headerSent||this.writableLength||chunk){
1173-
this._send('','latin1',finish);
1174-
}else{
1175-
process.nextTick(finish);
1204+
if(this._hasBody&&this.chunkedEncoding){
1205+
this._send('0\r\n'+this._trailer+'\r\n','latin1',finishCallback);
1206+
}elseif(!this._headerSent||this.writableLength||chunk){
1207+
this._send('','latin1',finishCallback);
1208+
}else{
1209+
process.nextTick(finishCallback);
1210+
}
11761211
}
11771212

11781213
if(this[kSocket]){

‎test/parallel/test-http-server-response-standalone.js‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@ const res = new ServerResponse({
1515
httpVersionMinor: 1
1616
});
1717

18-
letfirstChunk=true;
19-
2018
constws=newWritable({
2119
write: common.mustCall((chunk,encoding,callback)=>{
22-
if(firstChunk){
23-
assert(chunk.toString().endsWith('hello world'));
24-
firstChunk=false;
25-
}else{
26-
assert.strictEqual(chunk.length,0);
27-
}
20+
assert(chunk.toString().endsWith('hello world'));
2821
setImmediate(callback);
29-
},2)
22+
},1)
3023
});
3124

3225
res.assignSocket(ws);

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 c2c31d6

Browse files
pimterryaduh95
authored andcommitted
http: improve performance with known-length calls to end()
This boosts RPS performance for the common API case where you call `res.end(data)` with the entire response by up to 9%. Signed-off-by: Tim Perry <pimterry@gmail.com> PR-URL: #65466 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
1 parent 6409983 commit c2c31d6

3 files changed

Lines changed: 80 additions & 17 deletions

File tree

‎benchmark/http/end-string.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Responses sent as a single res.end(string) with a known Content-Length -
2+
// the shape a JSON or HTML endpoint produces.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
7+
constbench=common.createBenchmark(main,{
8+
len: [4,64,1024,16384,102400],
9+
c: [50],
10+
duration: 5,
11+
});
12+
13+
functionmain({ len, c, duration }){
14+
consthttp=require('http');
15+
constbody='a'.repeat(len);
16+
constheaders={
17+
'Content-Type': 'text/plain',
18+
'Content-Length': `${len}`,
19+
};
20+
21+
constserver=http.createServer((req,res)=>{
22+
res.writeHead(200,headers);
23+
res.end(body);
24+
});
25+
26+
server.listen(0,()=>{
27+
bench.http({
28+
connections: c,
29+
duration,
30+
port: server.address().port,
31+
},()=>{
32+
server.close();
33+
});
34+
});
35+
}

‎lib/_http_outgoing.js‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,25 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
10261026
}
10271027

10281028

1029+
// If this last write can be delivered immediately as the final chunk, this
1030+
// prepares to do so, and then returns true. If not, it returns false and
1031+
// a separate _send call and tick will be required to finish up.
1032+
functionmaybePrepareFinalChunk(msg,chunk,encoding){
1033+
if(typeofchunk!=='string'&&!isUint8Array(chunk))
1034+
returnfalse;
1035+
1036+
if(msg.destroyed||msg.strictContentLength)
1037+
returnfalse;
1038+
1039+
if(!msg._header){
1040+
msg._contentLength=typeofchunk==='string' ?
1041+
Buffer.byteLength(chunk,encoding) : chunk.byteLength;
1042+
msg._implicitHeader();
1043+
}
1044+
1045+
return!!msg._header&&msg._hasBody&&!msg.chunkedEncoding;
1046+
}
1047+
10291048
functionconnectionCorkNT(conn){
10301049
conn.uncork();
10311050
}
@@ -1131,6 +1150,8 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11311150
encoding=null;
11321151
}
11331152

1153+
letfinishCallback=null;
1154+
11341155
if(chunk){
11351156
if(this.finished){
11361157
onError(this,
@@ -1143,7 +1164,18 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11431164
this[kSocket].cork();
11441165
}
11451166

1146-
write_(this,chunk,encoding,null,true);
1167+
if(maybePrepareFinalChunk(this,chunk,encoding)){
1168+
// If just one final write is required, with nothing to follow, we
1169+
// attach finish to the write to avoid a separate send() & tick step
1170+
// later on - this is purely a performance optimization.
1171+
if(typeofcallback==='function'){
1172+
queueEndCallback(this,callback);
1173+
callback=undefined;
1174+
}
1175+
finishCallback=onFinish.bind(undefined,this);
1176+
}
1177+
1178+
write_(this,chunk,encoding,finishCallback,true);
11471179
}elseif(this.finished){
11481180
if(typeofcallback==='function'){
11491181
queueEndCallback(this,callback);
@@ -1165,14 +1197,17 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11651197
thrownewERR_HTTP_CONTENT_LENGTH_MISMATCH(this[kBytesWritten],this._contentLength);
11661198
}
11671199

1168-
constfinish=onFinish.bind(undefined,this);
1200+
if(finishCallback===null){
1201+
// If we didn't early finish, send the last data and schedule 'finish' now:
1202+
finishCallback=onFinish.bind(undefined,this);
11691203

1170-
if(this._hasBody&&this.chunkedEncoding){
1171-
this._send('0\r\n'+this._trailer+'\r\n','latin1',finish);
1172-
}elseif(!this._headerSent||this.writableLength||chunk){
1173-
this._send('','latin1',finish);
1174-
}else{
1175-
process.nextTick(finish);
1204+
if(this._hasBody&&this.chunkedEncoding){
1205+
this._send('0\r\n'+this._trailer+'\r\n','latin1',finishCallback);
1206+
}elseif(!this._headerSent||this.writableLength||chunk){
1207+
this._send('','latin1',finishCallback);
1208+
}else{
1209+
process.nextTick(finishCallback);
1210+
}
11761211
}
11771212

11781213
if(this[kSocket]){

‎test/parallel/test-http-server-response-standalone.js‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@ const res = new ServerResponse({
1515
httpVersionMinor: 1
1616
});
1717

18-
letfirstChunk=true;
19-
2018
constws=newWritable({
2119
write: common.mustCall((chunk,encoding,callback)=>{
22-
if(firstChunk){
23-
assert(chunk.toString().endsWith('hello world'));
24-
firstChunk=false;
25-
}else{
26-
assert.strictEqual(chunk.length,0);
27-
}
20+
assert(chunk.toString().endsWith('hello world'));
2821
setImmediate(callback);
29-
},2)
22+
},1)
3023
});
3124

3225
res.assignSocket(ws);

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 c2c31d6

Browse files
pimterryaduh95
authored andcommitted
http: improve performance with known-length calls to end()
This boosts RPS performance for the common API case where you call `res.end(data)` with the entire response by up to 9%. Signed-off-by: Tim Perry <pimterry@gmail.com> PR-URL: #65466 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
1 parent 6409983 commit c2c31d6

3 files changed

Lines changed: 80 additions & 17 deletions

File tree

‎benchmark/http/end-string.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Responses sent as a single res.end(string) with a known Content-Length -
2+
// the shape a JSON or HTML endpoint produces.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
7+
constbench=common.createBenchmark(main,{
8+
len: [4,64,1024,16384,102400],
9+
c: [50],
10+
duration: 5,
11+
});
12+
13+
functionmain({ len, c, duration }){
14+
consthttp=require('http');
15+
constbody='a'.repeat(len);
16+
constheaders={
17+
'Content-Type': 'text/plain',
18+
'Content-Length': `${len}`,
19+
};
20+
21+
constserver=http.createServer((req,res)=>{
22+
res.writeHead(200,headers);
23+
res.end(body);
24+
});
25+
26+
server.listen(0,()=>{
27+
bench.http({
28+
connections: c,
29+
duration,
30+
port: server.address().port,
31+
},()=>{
32+
server.close();
33+
});
34+
});
35+
}

‎lib/_http_outgoing.js‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,25 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
10261026
}
10271027

10281028

1029+
// If this last write can be delivered immediately as the final chunk, this
1030+
// prepares to do so, and then returns true. If not, it returns false and
1031+
// a separate _send call and tick will be required to finish up.
1032+
functionmaybePrepareFinalChunk(msg,chunk,encoding){
1033+
if(typeofchunk!=='string'&&!isUint8Array(chunk))
1034+
returnfalse;
1035+
1036+
if(msg.destroyed||msg.strictContentLength)
1037+
returnfalse;
1038+
1039+
if(!msg._header){
1040+
msg._contentLength=typeofchunk==='string' ?
1041+
Buffer.byteLength(chunk,encoding) : chunk.byteLength;
1042+
msg._implicitHeader();
1043+
}
1044+
1045+
return!!msg._header&&msg._hasBody&&!msg.chunkedEncoding;
1046+
}
1047+
10291048
functionconnectionCorkNT(conn){
10301049
conn.uncork();
10311050
}
@@ -1131,6 +1150,8 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11311150
encoding=null;
11321151
}
11331152

1153+
letfinishCallback=null;
1154+
11341155
if(chunk){
11351156
if(this.finished){
11361157
onError(this,
@@ -1143,7 +1164,18 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11431164
this[kSocket].cork();
11441165
}
11451166

1146-
write_(this,chunk,encoding,null,true);
1167+
if(maybePrepareFinalChunk(this,chunk,encoding)){
1168+
// If just one final write is required, with nothing to follow, we
1169+
// attach finish to the write to avoid a separate send() & tick step
1170+
// later on - this is purely a performance optimization.
1171+
if(typeofcallback==='function'){
1172+
queueEndCallback(this,callback);
1173+
callback=undefined;
1174+
}
1175+
finishCallback=onFinish.bind(undefined,this);
1176+
}
1177+
1178+
write_(this,chunk,encoding,finishCallback,true);
11471179
}elseif(this.finished){
11481180
if(typeofcallback==='function'){
11491181
queueEndCallback(this,callback);
@@ -1165,14 +1197,17 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11651197
thrownewERR_HTTP_CONTENT_LENGTH_MISMATCH(this[kBytesWritten],this._contentLength);
11661198
}
11671199

1168-
constfinish=onFinish.bind(undefined,this);
1200+
if(finishCallback===null){
1201+
// If we didn't early finish, send the last data and schedule 'finish' now:
1202+
finishCallback=onFinish.bind(undefined,this);
11691203

1170-
if(this._hasBody&&this.chunkedEncoding){
1171-
this._send('0\r\n'+this._trailer+'\r\n','latin1',finish);
1172-
}elseif(!this._headerSent||this.writableLength||chunk){
1173-
this._send('','latin1',finish);
1174-
}else{
1175-
process.nextTick(finish);
1204+
if(this._hasBody&&this.chunkedEncoding){
1205+
this._send('0\r\n'+this._trailer+'\r\n','latin1',finishCallback);
1206+
}elseif(!this._headerSent||this.writableLength||chunk){
1207+
this._send('','latin1',finishCallback);
1208+
}else{
1209+
process.nextTick(finishCallback);
1210+
}
11761211
}
11771212

11781213
if(this[kSocket]){

‎test/parallel/test-http-server-response-standalone.js‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@ const res = new ServerResponse({
1515
httpVersionMinor: 1
1616
});
1717

18-
letfirstChunk=true;
19-
2018
constws=newWritable({
2119
write: common.mustCall((chunk,encoding,callback)=>{
22-
if(firstChunk){
23-
assert(chunk.toString().endsWith('hello world'));
24-
firstChunk=false;
25-
}else{
26-
assert.strictEqual(chunk.length,0);
27-
}
20+
assert(chunk.toString().endsWith('hello world'));
2821
setImmediate(callback);
29-
},2)
22+
},1)
3023
});
3124

3225
res.assignSocket(ws);

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 c2c31d6

Browse files
pimterryaduh95
authored andcommitted
http: improve performance with known-length calls to end()
This boosts RPS performance for the common API case where you call `res.end(data)` with the entire response by up to 9%. Signed-off-by: Tim Perry <pimterry@gmail.com> PR-URL: #65466 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
1 parent 6409983 commit c2c31d6

3 files changed

Lines changed: 80 additions & 17 deletions

File tree

‎benchmark/http/end-string.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Responses sent as a single res.end(string) with a known Content-Length -
2+
// the shape a JSON or HTML endpoint produces.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
7+
constbench=common.createBenchmark(main,{
8+
len: [4,64,1024,16384,102400],
9+
c: [50],
10+
duration: 5,
11+
});
12+
13+
functionmain({ len, c, duration }){
14+
consthttp=require('http');
15+
constbody='a'.repeat(len);
16+
constheaders={
17+
'Content-Type': 'text/plain',
18+
'Content-Length': `${len}`,
19+
};
20+
21+
constserver=http.createServer((req,res)=>{
22+
res.writeHead(200,headers);
23+
res.end(body);
24+
});
25+
26+
server.listen(0,()=>{
27+
bench.http({
28+
connections: c,
29+
duration,
30+
port: server.address().port,
31+
},()=>{
32+
server.close();
33+
});
34+
});
35+
}

‎lib/_http_outgoing.js‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,25 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
10261026
}
10271027

10281028

1029+
// If this last write can be delivered immediately as the final chunk, this
1030+
// prepares to do so, and then returns true. If not, it returns false and
1031+
// a separate _send call and tick will be required to finish up.
1032+
functionmaybePrepareFinalChunk(msg,chunk,encoding){
1033+
if(typeofchunk!=='string'&&!isUint8Array(chunk))
1034+
returnfalse;
1035+
1036+
if(msg.destroyed||msg.strictContentLength)
1037+
returnfalse;
1038+
1039+
if(!msg._header){
1040+
msg._contentLength=typeofchunk==='string' ?
1041+
Buffer.byteLength(chunk,encoding) : chunk.byteLength;
1042+
msg._implicitHeader();
1043+
}
1044+
1045+
return!!msg._header&&msg._hasBody&&!msg.chunkedEncoding;
1046+
}
1047+
10291048
functionconnectionCorkNT(conn){
10301049
conn.uncork();
10311050
}
@@ -1131,6 +1150,8 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11311150
encoding=null;
11321151
}
11331152

1153+
letfinishCallback=null;
1154+
11341155
if(chunk){
11351156
if(this.finished){
11361157
onError(this,
@@ -1143,7 +1164,18 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11431164
this[kSocket].cork();
11441165
}
11451166

1146-
write_(this,chunk,encoding,null,true);
1167+
if(maybePrepareFinalChunk(this,chunk,encoding)){
1168+
// If just one final write is required, with nothing to follow, we
1169+
// attach finish to the write to avoid a separate send() & tick step
1170+
// later on - this is purely a performance optimization.
1171+
if(typeofcallback==='function'){
1172+
queueEndCallback(this,callback);
1173+
callback=undefined;
1174+
}
1175+
finishCallback=onFinish.bind(undefined,this);
1176+
}
1177+
1178+
write_(this,chunk,encoding,finishCallback,true);
11471179
}elseif(this.finished){
11481180
if(typeofcallback==='function'){
11491181
queueEndCallback(this,callback);
@@ -1165,14 +1197,17 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11651197
thrownewERR_HTTP_CONTENT_LENGTH_MISMATCH(this[kBytesWritten],this._contentLength);
11661198
}
11671199

1168-
constfinish=onFinish.bind(undefined,this);
1200+
if(finishCallback===null){
1201+
// If we didn't early finish, send the last data and schedule 'finish' now:
1202+
finishCallback=onFinish.bind(undefined,this);
11691203

1170-
if(this._hasBody&&this.chunkedEncoding){
1171-
this._send('0\r\n'+this._trailer+'\r\n','latin1',finish);
1172-
}elseif(!this._headerSent||this.writableLength||chunk){
1173-
this._send('','latin1',finish);
1174-
}else{
1175-
process.nextTick(finish);
1204+
if(this._hasBody&&this.chunkedEncoding){
1205+
this._send('0\r\n'+this._trailer+'\r\n','latin1',finishCallback);
1206+
}elseif(!this._headerSent||this.writableLength||chunk){
1207+
this._send('','latin1',finishCallback);
1208+
}else{
1209+
process.nextTick(finishCallback);
1210+
}
11761211
}
11771212

11781213
if(this[kSocket]){

‎test/parallel/test-http-server-response-standalone.js‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@ const res = new ServerResponse({
1515
httpVersionMinor: 1
1616
});
1717

18-
letfirstChunk=true;
19-
2018
constws=newWritable({
2119
write: common.mustCall((chunk,encoding,callback)=>{
22-
if(firstChunk){
23-
assert(chunk.toString().endsWith('hello world'));
24-
firstChunk=false;
25-
}else{
26-
assert.strictEqual(chunk.length,0);
27-
}
20+
assert(chunk.toString().endsWith('hello world'));
2821
setImmediate(callback);
29-
},2)
22+
},1)
3023
});
3124

3225
res.assignSocket(ws);

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 c2c31d6

Browse files
pimterryaduh95
authored andcommitted
http: improve performance with known-length calls to end()
This boosts RPS performance for the common API case where you call `res.end(data)` with the entire response by up to 9%. Signed-off-by: Tim Perry <pimterry@gmail.com> PR-URL: #65466 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gürgün Dayıoğlu <hey@gurgun.day>
1 parent 6409983 commit c2c31d6

3 files changed

Lines changed: 80 additions & 17 deletions

File tree

‎benchmark/http/end-string.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Responses sent as a single res.end(string) with a known Content-Length -
2+
// the shape a JSON or HTML endpoint produces.
3+
'use strict';
4+
5+
constcommon=require('../common.js');
6+
7+
constbench=common.createBenchmark(main,{
8+
len: [4,64,1024,16384,102400],
9+
c: [50],
10+
duration: 5,
11+
});
12+
13+
functionmain({ len, c, duration }){
14+
consthttp=require('http');
15+
constbody='a'.repeat(len);
16+
constheaders={
17+
'Content-Type': 'text/plain',
18+
'Content-Length': `${len}`,
19+
};
20+
21+
constserver=http.createServer((req,res)=>{
22+
res.writeHead(200,headers);
23+
res.end(body);
24+
});
25+
26+
server.listen(0,()=>{
27+
bench.http({
28+
connections: c,
29+
duration,
30+
port: server.address().port,
31+
},()=>{
32+
server.close();
33+
});
34+
});
35+
}

‎lib/_http_outgoing.js‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,25 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
10261026
}
10271027

10281028

1029+
// If this last write can be delivered immediately as the final chunk, this
1030+
// prepares to do so, and then returns true. If not, it returns false and
1031+
// a separate _send call and tick will be required to finish up.
1032+
functionmaybePrepareFinalChunk(msg,chunk,encoding){
1033+
if(typeofchunk!=='string'&&!isUint8Array(chunk))
1034+
returnfalse;
1035+
1036+
if(msg.destroyed||msg.strictContentLength)
1037+
returnfalse;
1038+
1039+
if(!msg._header){
1040+
msg._contentLength=typeofchunk==='string' ?
1041+
Buffer.byteLength(chunk,encoding) : chunk.byteLength;
1042+
msg._implicitHeader();
1043+
}
1044+
1045+
return!!msg._header&&msg._hasBody&&!msg.chunkedEncoding;
1046+
}
1047+
10291048
functionconnectionCorkNT(conn){
10301049
conn.uncork();
10311050
}
@@ -1131,6 +1150,8 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11311150
encoding=null;
11321151
}
11331152

1153+
letfinishCallback=null;
1154+
11341155
if(chunk){
11351156
if(this.finished){
11361157
onError(this,
@@ -1143,7 +1164,18 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11431164
this[kSocket].cork();
11441165
}
11451166

1146-
write_(this,chunk,encoding,null,true);
1167+
if(maybePrepareFinalChunk(this,chunk,encoding)){
1168+
// If just one final write is required, with nothing to follow, we
1169+
// attach finish to the write to avoid a separate send() & tick step
1170+
// later on - this is purely a performance optimization.
1171+
if(typeofcallback==='function'){
1172+
queueEndCallback(this,callback);
1173+
callback=undefined;
1174+
}
1175+
finishCallback=onFinish.bind(undefined,this);
1176+
}
1177+
1178+
write_(this,chunk,encoding,finishCallback,true);
11471179
}elseif(this.finished){
11481180
if(typeofcallback==='function'){
11491181
queueEndCallback(this,callback);
@@ -1165,14 +1197,17 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
11651197
thrownewERR_HTTP_CONTENT_LENGTH_MISMATCH(this[kBytesWritten],this._contentLength);
11661198
}
11671199

1168-
constfinish=onFinish.bind(undefined,this);
1200+
if(finishCallback===null){
1201+
// If we didn't early finish, send the last data and schedule 'finish' now:
1202+
finishCallback=onFinish.bind(undefined,this);
11691203

1170-
if(this._hasBody&&this.chunkedEncoding){
1171-
this._send('0\r\n'+this._trailer+'\r\n','latin1',finish);
1172-
}elseif(!this._headerSent||this.writableLength||chunk){
1173-
this._send('','latin1',finish);
1174-
}else{
1175-
process.nextTick(finish);
1204+
if(this._hasBody&&this.chunkedEncoding){
1205+
this._send('0\r\n'+this._trailer+'\r\n','latin1',finishCallback);
1206+
}elseif(!this._headerSent||this.writableLength||chunk){
1207+
this._send('','latin1',finishCallback);
1208+
}else{
1209+
process.nextTick(finishCallback);
1210+
}
11761211
}
11771212

11781213
if(this[kSocket]){

‎test/parallel/test-http-server-response-standalone.js‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@ const res = new ServerResponse({
1515
httpVersionMinor: 1
1616
});
1717

18-
letfirstChunk=true;
19-
2018
constws=newWritable({
2119
write: common.mustCall((chunk,encoding,callback)=>{
22-
if(firstChunk){
23-
assert(chunk.toString().endsWith('hello world'));
24-
firstChunk=false;
25-
}else{
26-
assert.strictEqual(chunk.length,0);
27-
}
20+
assert(chunk.toString().endsWith('hello world'));
2821
setImmediate(callback);
29-
},2)
22+
},1)
3023
});
3124

3225
res.assignSocket(ws);

0 commit comments

Comments
 (0)