Skip to content

Commit

Permalink
perf(ext/fetch): Use the WebIDL conversion to DOMString rather than U…
Browse files Browse the repository at this point in the history
…SVString for Response constructor (denoland#12201)
  • Loading branch information
lmalheiro authored Sep 25, 2021
1 parent 09f2cdb commit b095157
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 6 deletions.
5 changes: 5 additions & 0 deletions cli/bench/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option<i32>)] = &[
&["run", "cli/tests/testdata/text_encoder_into_perf.js"],
None,
),
(
"response_string",
&["run", "cli/tests/testdata/response_string_perf.js"],
None,
),
(
"check",
&[
Expand Down
34 changes: 34 additions & 0 deletions cli/tests/testdata/response_string_perf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
const mixed = "@Ā๐😀";

function generateRandom(bytes) {
let result = "";
let i = 0;
while (i < bytes) {
const toAdd = Math.floor(Math.random() * Math.min(4, bytes - i));
switch (toAdd) {
case 0:
result += mixed[0];
i++;
break;
case 1:
result += mixed[1];
i++;
break;
case 2:
result += mixed[2];
i++;
break;
case 3:
result += mixed[3];
result += mixed[4];
i += 2;
break;
}
}
return result;
}

const randomData = generateRandom(1024);
for (let i = 0; i < 10_000; i++) {
new Response(randomData);
}
11 changes: 7 additions & 4 deletions ext/fetch/22_body.js
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@
return { body, contentType };
}

webidl.converters["BodyInit"] = (V, opts) => {
webidl.converters["BodyInit_DOMString"] = (V, opts) => {
// Union for (ReadableStream or Blob or ArrayBufferView or ArrayBuffer or FormData or URLSearchParams or USVString)
if (V instanceof ReadableStream) {
// TODO(lucacasonato): ReadableStream is not branded
Expand All @@ -393,10 +393,13 @@
return webidl.converters["ArrayBufferView"](V, opts);
}
}
return webidl.converters["USVString"](V, opts);
// BodyInit conversion is passed to extractBody(), which calls core.encode().
// core.encode() will UTF-8 encode strings with replacement, being equivalent to the USV normalization.
// Therefore we can convert to DOMString instead of USVString and avoid a costly redundant conversion.
return webidl.converters["DOMString"](V, opts);
};
webidl.converters["BodyInit?"] = webidl.createNullableConverter(
webidl.converters["BodyInit"],
webidl.converters["BodyInit_DOMString?"] = webidl.createNullableConverter(
webidl.converters["BodyInit_DOMString"],
);

window.__bootstrap.fetchBody = { mixinBody, InnerBody, extractBody };
Expand Down
2 changes: 1 addition & 1 deletion ext/fetch/23_request.js
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
{
key: "body",
converter: webidl.createNullableConverter(
webidl.converters["BodyInit"],
webidl.converters["BodyInit_DOMString"],
),
},
{ key: "redirect", converter: webidl.converters["RequestRedirect"] },
Expand Down
2 changes: 1 addition & 1 deletion ext/fetch/23_response.js
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
*/
constructor(body = null, init = {}) {
const prefix = "Failed to construct 'Response'";
body = webidl.converters["BodyInit?"](body, {
body = webidl.converters["BodyInit_DOMString?"](body, {
prefix,
context: "Argument 1",
});
Expand Down

0 comments on commit b095157

Please sign in to comment.