Skip to content

AsyncWrap minor fixes #1614

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
trevnorris wants to merge 4 commits into from
Closed

AsyncWrap minor fixes #1614

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f51590
async-wrap: don't call init callback unnecessarily
trevnorris May 4, 2015
cc0385e
async-wrap: pass PROVIDER as first arg to init
trevnorris May 4, 2015
7740d5e
async-wrap: set flags using functions
trevnorris May 4, 2015
eed38b3
async-wrap: remove before/after calls in init
trevnorris May 4, 2015
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: set flags using functions 
Setting flags using cryptic numeric object fields is confusing. Instead
use much simpler .enable()/.disable() calls on the async_wrap object.
  • Loading branch information
@trevnorris
trevnorris committed May 4, 2015
commit 7740d5e80802e9181b49a877ff69fed416040e5b
40 changes: 19 additions & 21 deletions src/async-wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,28 @@ using v8::kExternalUint32Array;

namespace node {

static void EnableHooksJS(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
env->async_hooks()->set_enable_callbacks(1);
}


static void DisableHooksJS(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
env->async_hooks()->set_enable_callbacks(0);
}


static void SetupHooks(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args.GetIsolate());

CHECK(args[0]->IsObject());
CHECK(args[0]->IsFunction());
CHECK(args[1]->IsFunction());
CHECK(args[2]->IsFunction());
CHECK(args[3]->IsFunction());

// Attach Fields enum from Environment::AsyncHooks.
// Flags attached to this object are:
// - kCallInitHook (0): Tells the AsyncWrap constructor whether it should
// make a call to the init JS callback. This is disabled by default, so
// even after setting the callbacks the flag will have to be set to
// non-zero to have those callbacks called. This only affects the init
// callback. If the init callback was called, then the pre/post callbacks
// will automatically be called.
Local<Object> async_hooks_obj = args[0].As<Object>();
Environment::AsyncHooks* async_hooks = env->async_hooks();
async_hooks_obj->SetIndexedPropertiesToExternalArrayData(
async_hooks->fields(),
kExternalUint32Array,
async_hooks->fields_count());

env->set_async_hooks_init_function(args[1].As<Function>());
env->set_async_hooks_pre_function(args[2].As<Function>());
env->set_async_hooks_post_function(args[3].As<Function>());

env->set_async_hooks_init_function(args[0].As<Function>());
env->set_async_hooks_pre_function(args[1].As<Function>());
env->set_async_hooks_post_function(args[2].As<Function>());

env->set_using_asyncwrap(true);
}
Expand All @@ -62,6 +58,8 @@ static void Initialize(Handle<Object> target,
HandleScope scope(isolate);

NODE_SET_METHOD(target, "setupHooks", SetupHooks);
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis May 4, 2015

Choose a reason for hiding this comment

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

I would do the same for SetupHooks for consistency. That can wait for another PR though.

Copy link
Copy Markdown
Contributor Author

@trevnorris trevnorris May 5, 2015

Choose a reason for hiding this comment

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

might as well. had to run before I had a chance to land this.

env->SetMethod(target, "disable", DisableHooksJS);
env->SetMethod(target, "enable", EnableHooksJS);

Local<Object> async_providers = Object::New(isolate);
#define V(PROVIDER) \
Expand Down