Skip to content

[async_wrap] fix fatal error during destroy() calls #9753

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

Merged
trevnorris merged 3 commits into from
Dec 1, 2016
Merged

[async_wrap] fix fatal error during destroy() calls #9753

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
517e3a6
async_wrap: mode constructor/destructor to .cc
trevnorris Nov 23, 2016
cf5f4b8
async_wrap: make Initialize a static class member
trevnorris Nov 23, 2016
b49b496
async_wrap: call destroy() callback in uv_idle_t
trevnorris Nov 23, 2016
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
async_wrap: make Initialize a static class member 
This is how it's done everywhere else in core. Make it follow suit.

PR-URL: #9753
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
@trevnorris
trevnorris committed Dec 1, 2016
commit cf5f4b85f5ef7befa592d83b69be646f7efb236a
11 changes: 6 additions & 5 deletions src/async-wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ using v8::Function;
using v8::FunctionCallbackInfo;
using v8::HandleScope;
using v8::HeapProfiler;
using v8::Int32;
using v8::Integer;
using v8::Isolate;
using v8::Local;
Expand Down Expand Up @@ -155,9 +156,9 @@ static void SetupHooks(const FunctionCallbackInfo<Value>& args) {
}


static void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
void AsyncWrap::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Environment* env = Environment::GetCurrent(context);
Isolate* isolate = env->isolate();
HandleScope scope(isolate);
Expand Down Expand Up @@ -195,7 +196,7 @@ AsyncWrap::AsyncWrap(Environment* env,
Local<Object> object,
ProviderType provider,
AsyncWrap* parent)
: BaseObject(env,object), bits_(static_cast<uint32_t>(provider) << 1),
: BaseObject(env, object), bits_(static_cast<uint32_t>(provider) << 1),
uid_(env->get_async_wrap_uid()) {
CHECK_NE(provider, PROVIDER_NONE);
CHECK_GE(object->InternalFieldCount(), 1);
Expand Down Expand Up @@ -361,4 +362,4 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,

} // namespace node

NODE_MODULE_CONTEXT_AWARE_BUILTIN(async_wrap, node::Initialize)
NODE_MODULE_CONTEXT_AWARE_BUILTIN(async_wrap, node::AsyncWrap::Initialize)
4 changes: 4 additions & 0 deletions src/async-wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ class AsyncWrap : public BaseObject {

virtual ~AsyncWrap();

static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);

inline ProviderType provider_type() const;

inline int64_t get_uid() const;
Expand Down