Skip to content

src: lazily load internalBinding('uv') and build the errmap lazily #25143

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 2 commits into from
Closed

src: lazily load internalBinding('uv') and build the errmap lazily #25143

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5d4f00
src: lazily load internalBinding('uv') and build the errmap lazily
joyeecheung Dec 19, 2018
0226fe1
fixup! src: lazily load internalBinding('uv') and build the errmap la…
joyeecheung Dec 28, 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
fixup! src: lazily load internalBinding('uv') and build the errmap la… 
…zily
  • Loading branch information
@joyeecheung
joyeecheung committed Dec 28, 2018
commit 0226fe1bd36e85c14ddabc758c16559c1f1f9fbf
64 changes: 46 additions & 18 deletions src/uv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,39 @@
#include "env-inl.h"

namespace node {

namespace per_process {
struct UVError {
int value;
const char* name;
const char* message;
};

// We only expand the macro once here to reduce the amount of code
// generated.
static const struct UVError uv_errors_map[] = {
#define V(name, message) {UV_##name, #name, message},
UV_ERRNO_MAP(V)
#undef V
};
} // namespace per_process

namespace {

using v8::Array;
using v8::Context;
using v8::DontDelete;
using v8::FunctionCallbackInfo;
using v8::Integer;
using v8::Isolate;
using v8::Local;
using v8::Map;
using v8::Object;
using v8::PropertyAttribute;
using v8::ReadOnly;
using v8::String;
using v8::Value;


void ErrName(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
if (env->options()->pending_deprecation && env->EmitErrNameWarning()) {
Expand All @@ -57,27 +76,26 @@ void ErrName(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set(OneByteString(env->isolate(), name));
}


void GetErrMap(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
Isolate* isolate = env->isolate();
Local<Context> context = env->context();

Local<Map> err_map = Map::New(isolate);

#define V(name, msg) do { \
Local<Value> arr[] = { \
OneByteString(isolate, #name), \
OneByteString(isolate, msg) \
}; \
if (err_map->Set(context, \
Integer::New(isolate, UV_##name), \
Array::New(isolate, arr, arraysize(arr))).IsEmpty()) { \
return; \
} \
} while (0);
UV_ERRNO_MAP(V)
#undef V
size_t errors_len = arraysize(per_process::uv_errors_map);
for (size_t i = 0; i < errors_len; ++i) {
const auto& error = per_process::uv_errors_map[i];
Local<Value> arr[] = {OneByteString(isolate, error.name),
OneByteString(isolate, error.message)};
if (err_map
->Set(context,
Integer::New(isolate, error.value),
Array::New(isolate, arr, arraysize(arr)))
.IsEmpty()) {
return;
}
}

args.GetReturnValue().Set(err_map);
}
Expand All @@ -94,9 +112,19 @@ void Initialize(Local<Object> target,
->GetFunction(env->context())
.ToLocalChecked()).FromJust();

#define V(name, _) NODE_DEFINE_CONSTANT(target, UV_##name);
UV_ERRNO_MAP(V)
#undef V
// TODO(joyeecheung): This should be deprecated in user land in favor of
// `util.getSystemErrorName(err)`.
PropertyAttribute attributes =
static_cast<PropertyAttribute>(ReadOnly | DontDelete);
size_t errors_len = arraysize(per_process::uv_errors_map);
const std::string prefix = "UV_";
for (size_t i = 0; i < errors_len; ++i) {
const auto& error = per_process::uv_errors_map[i];
const std::string prefixed_name = prefix + error.name;
Local<String> name = OneByteString(isolate, prefixed_name.c_str());
Local<Integer> value = Integer::New(isolate, error.value);
target->DefineOwnProperty(context, name, value, attributes).FromJust();
}

env->SetMethod(target, "getErrorMap", GetErrMap);
}
Expand Down