Skip to content

src: improve performance of http parser #58288

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+105 −20
Open

src: improve performance of http parser #58288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions src/node_external_reference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ using CFunctionCallbackWithMultipleValueAndOptions =
v8::Local<v8::Value>,
v8::Local<v8::Value>,
v8::FastApiCallbackOptions&);
using CFunctionVoid = void (*)(v8::Local<v8::Value>);
using CFunctionVoid2 =
Copy link
Member

Choose a reason for hiding this comment

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

Not super excited about the name here but then again none of the macro names here are great.

void (*)(v8::Local<v8::Value>,
// NOLINTNEXTLINE(runtime/references) This is V8 api.
v8::FastApiCallbackOptions& options);
using CFunctionA =
uint32_t (*)(v8::Local<v8::Value> receiver,
v8::Local<v8::Value> sourceValue,
Expand Down Expand Up @@ -99,6 +104,8 @@ class ExternalReferenceRegistry {
ExternalReferenceRegistry();

#define ALLOWED_EXTERNAL_REFERENCE_TYPES(V) \
V(CFunctionVoid) \
V(CFunctionVoid2) \
V(CFunctionA) \
V(CFunctionCallback) \
V(CFunctionCallbackWithalueAndOptions) \
Expand Down
89 changes: 69 additions & 20 deletions src/node_http_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
#include "memory_tracker-inl.h"
#include "node_external_reference.h"
#include "stream_base-inl.h"
#include "v8-fast-api-calls.h"
#include "v8-function-callback.h"
#include "v8.h"

#include <cstdlib> // free()
Expand All @@ -52,6 +54,7 @@ namespace http_parser { // NOLINT(build/namespaces)

using v8::Array;
using v8::Boolean;
using v8::CFunction;
using v8::Context;
using v8::EscapableHandleScope;
using v8::Exception;
Expand Down Expand Up @@ -563,36 +566,45 @@ class Parser : public AsyncWrap, public StreamListener {
new Parser(binding_data, args.This());
}

// TODO(@anonrig): Add V8 Fast API
static void Close(const FunctionCallbackInfo<Value>& args) {
static void CloseFast(Local<Value> receiver) {
Parser* parser;
ASSIGN_OR_RETURN_UNWRAP(&parser, args.This());
ASSIGN_OR_RETURN_UNWRAP(&parser, receiver);

delete parser;
}

// TODO(@anonrig): Add V8 Fast API
static void Free(const FunctionCallbackInfo<Value>& args) {
static void Close(const FunctionCallbackInfo<Value>& args) {
CloseFast(args.This());
}

static void FreeFast(Local<Value> receiver) {
Parser* parser;
ASSIGN_OR_RETURN_UNWRAP(&parser, args.This());
ASSIGN_OR_RETURN_UNWRAP(&parser, receiver);

// Since the Parser destructor isn't going to run the destroy() callbacks
// it needs to be triggered manually.
parser->EmitTraceEventDestroy();
parser->EmitDestroy();
}

// TODO(@anonrig): Add V8 Fast API
static void Remove(const FunctionCallbackInfo<Value>& args) {
static void Free(const FunctionCallbackInfo<Value>& args) {
FreeFast(args.This());
}

static void RemoveFast(Local<Value> receiver) {
Parser* parser;
ASSIGN_OR_RETURN_UNWRAP(&parser, args.This());
ASSIGN_OR_RETURN_UNWRAP(&parser, receiver);

if (parser->connectionsList_ != nullptr) {
parser->connectionsList_->Pop(parser);
parser->connectionsList_->PopActive(parser);
}
}

static void Remove(const FunctionCallbackInfo<Value>& args) {
RemoveFast(args.This());
}

void Save() {
url_.Save();
status_message_.Save();
Expand Down Expand Up @@ -695,7 +707,23 @@ class Parser : public AsyncWrap, public StreamListener {
}
}

// TODO(@anonrig): Add V8 Fast API
template <bool should_pause>
static void PauseFast(Local<Value> receiver,
// NOLINTNEXTLINE(runtime/references) This is V8 api.
v8::FastApiCallbackOptions& options) {
Environment* env = Environment::GetCurrent(options.isolate);
Parser* parser;
ASSIGN_OR_RETURN_UNWRAP(&parser, receiver);
// Should always be called from the same context.
CHECK_EQ(env, parser->env());

if constexpr (should_pause) {
llhttp_pause(&parser->parser_);
} else {
llhttp_resume(&parser->parser_);
}
}

template <bool should_pause>
static void Pause(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
Expand All @@ -711,7 +739,6 @@ class Parser : public AsyncWrap, public StreamListener {
}
}

// TODO(@anonrig): Add V8 Fast API
static void Consume(const FunctionCallbackInfo<Value>& args) {
Copy link
Member

Choose a reason for hiding this comment

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

No fast version?

Parser* parser;
ASSIGN_OR_RETURN_UNWRAP(&parser, args.This());
Expand All @@ -721,10 +748,9 @@ class Parser : public AsyncWrap, public StreamListener {
stream->PushStreamListener(parser);
}

// TODO(@anonrig): Add V8 Fast API
static void Unconsume(const FunctionCallbackInfo<Value>& args) {
static void UnconsumeFast(Local<Value> receiver) {
Parser* parser;
ASSIGN_OR_RETURN_UNWRAP(&parser, args.This());
ASSIGN_OR_RETURN_UNWRAP(&parser, receiver);

// Already unconsumed
if (parser->stream_ == nullptr)
Expand All @@ -733,6 +759,9 @@ class Parser : public AsyncWrap, public StreamListener {
parser->stream_->RemoveStreamListener(parser);
}

static void Unconsume(const FunctionCallbackInfo<Value>& args) {
UnconsumeFast(args.This());
}

static void GetCurrentBuffer(const FunctionCallbackInfo<Value>& args) {
Parser* parser;
Expand Down Expand Up @@ -1235,6 +1264,13 @@ const llhttp_settings_t Parser::settings = {
nullptr,
};

static CFunction pause_fast_(CFunction::Make(&Parser::PauseFast<true>));
static CFunction resume_fast_(CFunction::Make(&Parser::PauseFast<false>));
static CFunction unconsume_fast_(CFunction::Make(&Parser::UnconsumeFast));
static CFunction free_fast_(CFunction::Make(&Parser::FreeFast));
static CFunction remove_fast_(CFunction::Make(&Parser::RemoveFast));
static CFunction close_fast_(CFunction::Make(&Parser::CloseFast));

void CreatePerIsolateProperties(IsolateData* isolate_data,
Local<ObjectTemplate> target) {
Isolate* isolate = isolate_data->isolate();
Expand Down Expand Up @@ -1288,16 +1324,17 @@ void CreatePerIsolateProperties(IsolateData* isolate_data,
Integer::NewFromUnsigned(isolate, kLenientAll));

t->Inherit(AsyncWrap::GetConstructorTemplate(isolate_data));
SetProtoMethod(isolate, t, "close", Parser::Close);
SetProtoMethod(isolate, t, "free", Parser::Free);
SetProtoMethod(isolate, t, "remove", Parser::Remove);
SetFastProtoMethod(isolate, t, "close", Parser::Close, &close_fast_);
SetFastProtoMethod(isolate, t, "free", Parser::Free, &free_fast_);
SetFastProtoMethod(isolate, t, "remove", Parser::Remove, &remove_fast_);
SetProtoMethod(isolate, t, "execute", Parser::Execute);
SetProtoMethod(isolate, t, "finish", Parser::Finish);
SetProtoMethod(isolate, t, "initialize", Parser::Initialize);
SetProtoMethod(isolate, t, "pause", Parser::Pause<true>);
SetProtoMethod(isolate, t, "resume", Parser::Pause<false>);
SetFastProtoMethod(isolate, t, "pause", Parser::Pause<true>, &pause_fast_);
SetFastProtoMethod(isolate, t, "resume", Parser::Pause<false>, &resume_fast_);
SetProtoMethod(isolate, t, "consume", Parser::Consume);
SetProtoMethod(isolate, t, "unconsume", Parser::Unconsume);
SetFastProtoMethod(
isolate, t, "unconsume", Parser::Unconsume, &unconsume_fast_);
SetProtoMethod(isolate, t, "getCurrentBuffer", Parser::GetCurrentBuffer);

SetConstructorFunction(isolate, target, "HTTPParser", t);
Expand Down Expand Up @@ -1358,15 +1395,27 @@ void CreatePerContextProperties(Local<Object> target,
void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
registry->Register(Parser::New);
registry->Register(Parser::Close);
registry->Register(Parser::CloseFast);
registry->Register(close_fast_.GetTypeInfo());
registry->Register(Parser::Free);
registry->Register(Parser::FreeFast);
registry->Register(free_fast_.GetTypeInfo());
registry->Register(Parser::Remove);
registry->Register(Parser::RemoveFast);
registry->Register(remove_fast_.GetTypeInfo());
registry->Register(Parser::Execute);
registry->Register(Parser::Finish);
registry->Register(Parser::Initialize);
registry->Register(Parser::Pause<true>);
registry->Register(Parser::Pause<false>);
registry->Register(Parser::PauseFast<true>);
registry->Register(pause_fast_.GetTypeInfo());
registry->Register(Parser::PauseFast<false>);
registry->Register(resume_fast_.GetTypeInfo());
registry->Register(Parser::Consume);
registry->Register(Parser::Unconsume);
registry->Register(Parser::UnconsumeFast);
registry->Register(unconsume_fast_.GetTypeInfo());
registry->Register(Parser::GetCurrentBuffer);
registry->Register(ConnectionsList::New);
registry->Register(ConnectionsList::All);
Expand Down
24 changes: 24 additions & 0 deletions src/util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,30 @@ void SetProtoMethod(v8::Isolate* isolate,
t->SetClassName(name_string); // NODE_SET_PROTOTYPE_METHOD() compatibility.
}

void SetFastProtoMethod(Isolate* isolate,
Local<FunctionTemplate> that,
const std::string_view name,
v8::FunctionCallback slow_callback,
const v8::CFunction* c_function) {
Local<v8::Signature> signature = v8::Signature::New(isolate, that);
Local<FunctionTemplate> t =
FunctionTemplate::New(isolate,
slow_callback,
Local<Value>(),
signature,
0,
v8::ConstructorBehavior::kThrow,
Copy link
Member

Choose a reason for hiding this comment

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

using v8::ConstructorBehavior at the top of the file

v8::SideEffectType::kHasSideEffect,
c_function);
// kInternalized strings are created in the old space.
const v8::NewStringType type = v8::NewStringType::kInternalized;
Local<v8::String> name_string =
Copy link
Member

Choose a reason for hiding this comment

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

using v8::String at the top

v8::String::NewFromUtf8(isolate, name.data(), type, name.size())
.ToLocalChecked();
that->PrototypeTemplate()->Set(name_string, t);
t->SetClassName(name_string); // NODE_SET_PROTOTYPE_METHOD() compatibility.
}

void SetProtoMethodNoSideEffect(v8::Isolate* isolate,
Local<v8::FunctionTemplate> that,
const std::string_view name,
Expand Down
5 changes: 5 additions & 0 deletions src/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,11 @@ void SetProtoMethod(v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> that,
const std::string_view name,
v8::FunctionCallback callback);
void SetFastProtoMethod(v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> that,
const std::string_view name,
v8::FunctionCallback slow_callback,
const v8::CFunction* c_function);

void SetInstanceMethod(v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> that,
Expand Down
Loading