Skip to content

src: remove pushValueToArray and setupProcessObject #24264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joyeecheung wants to merge 12 commits into from
Closed

src: remove pushValueToArray and setupProcessObject #24264

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a9f8f33
http2: remove pushValueToArray in Http2Session::HandleHeadersFrame
joyeecheung Nov 9, 2018
3e3e9b7
http2: remove pushValueToArray in Http2Session::HandleOriginFrame
joyeecheung Nov 9, 2018
fa1c240
http_parser: remove pushValueToArray in CreateHeaders
joyeecheung Nov 9, 2018
a96a222
process: remove pushValueToArray in EnvEnumerator
joyeecheung Nov 9, 2018
d79ed5d
process: remove pushValueToArray in GetActiveRequests
joyeecheung Nov 9, 2018
70fa3c1
process: remove pushValueToArray in GetActiveHandles
joyeecheung Nov 9, 2018
a54d0c6
os: do not call into JS to push values to an array in GetCPUInfo
joyeecheung Nov 9, 2018
db5e5fa
src: remove pushValueToArray and SetupProcessObject
joyeecheung Nov 9, 2018
0b3568c
fixup! process: remove pushValueToArray in EnvEnumerator
joyeecheung Nov 11, 2018
a44e978
fixup! http2: remove pushValueToArray in Http2Session::HandleHeadersF…
joyeecheung Nov 11, 2018
fcaf05a
fixup! http2: remove pushValueToArray in Http2Session::HandleOriginFrame
joyeecheung Nov 11, 2018
07b5417
fixup! os: do not call into JS to push values to an array in GetCPUInfo
joyeecheung Nov 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
http2: remove pushValueToArray in Http2Session::HandleOriginFrame 
Instead of calling into JS from C++ to push values into an array,
use the new Array::New API that takes a pointer and a length
directly.
  • Loading branch information
@joyeecheung
joyeecheung committed Nov 11, 2018
commit 3e3e9b7097e0b51bb0ecc956422119cf6dc6952e
26 changes: 9 additions & 17 deletions src/node_http2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,25 +1424,17 @@ void Http2Session::HandleOriginFrame(const nghttp2_frame* frame) {
nghttp2_extension ext = frame->ext;
nghttp2_ext_origin* origin = static_cast<nghttp2_ext_origin*>(ext.payload);

Local<Value> holder = Array::New(isolate);
Local<Function> fn = env()->push_values_to_array_function();
Local<Value> argv[NODE_PUSH_VAL_TO_ARRAY_MAX];
size_t nov = origin->nov;
std::vector<Local<Value>> origin_v(nov);

size_t n = 0;
while (n < origin->nov) {
size_t j = 0;
while (n < origin->nov && j < arraysize(argv)) {
auto entry = origin->ov[n++];
argv[j++] =
String::NewFromOneByte(isolate,
entry.origin,
v8::NewStringType::kNormal,
entry.origin_len).ToLocalChecked();
}
if (j > 0)
fn->Call(context, holder, j, argv).ToLocalChecked();
for (size_t i = 0; i < nov; ++i) {
Comment thread
refack marked this conversation as resolved.
Outdated
auto entry = origin->ov[i];
Copy link
Copy Markdown
Member

@addaleax addaleax Nov 12, 2018

Choose a reason for hiding this comment

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

I know this is copy-pasted, but I think getting rid of this auto might make things more readable :)

origin_v[i] =
String::NewFromOneByte(
isolate, entry.origin, v8::NewStringType::kNormal, entry.origin_len)
.ToLocalChecked();
}

Local<Value> holder = Array::New(isolate, origin_v.data(), nov);
Copy link
Copy Markdown
Contributor

@refack refack Nov 11, 2018

Choose a reason for hiding this comment

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

/s/nov/origin_v.size()/ for correctness and readability

MakeCallback(env()->onorigin_string(), 1, &holder);
}

Expand Down