1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

asyncwrap: fix constructor condition for early ret

Browse Source 
AsyncWrap should always properly propagate asynchronous calls to any
child that is created. Regardless whether kCallInitHook is currently
active. The previous logic would always return early if kCallInitHook
wasn't set.

PR-URL: https://github.com/iojs/io.js/pull/732
Reviewed-by: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Trevor Norris 2015-02-05 15:54:12 -07:00
parent 10277d2e57
commit 05f4dff975
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/async-wrap-inl.h
View File

@ -21,7 +21,9 @@ inline AsyncWrap::AsyncWrap(Environment* env,
has_async_queue_(false),
provider_type_(provider) {
// Check user controlled flag to see if the init callback should run.
if (!env->call_async_init_hook())
if (!env->using_asyncwrap())
return;
if (!env->call_async_init_hook() && parent != nullptr)
return;
// TODO(trevnorris): Until it's verified all passed object's are not weak,

2
src/async-wrap.cc
View File

@ -48,6 +48,8 @@ static void SetupHooks(const FunctionCallbackInfo<Value>& args) {
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_using_asyncwrap(true);
}

9
src/env-inl.h
View File

@ -165,6 +165,7 @@ inline Environment::Environment(v8::Local<v8::Context> context,
isolate_data_(IsolateData::GetOrCreate(context->GetIsolate(), loop)),
using_smalloc_alloc_cb_(false),
using_domains_(false),
using_asyncwrap_(false),
printed_error_(false),
debugger_agent_(this),
context_(context->GetIsolate(), context) {
@ -298,6 +299,14 @@ inline void Environment::set_using_domains(bool value) {
using_domains_ = value;
}
inline bool Environment::using_asyncwrap() const {
return using_asyncwrap_;
}
inline void Environment::set_using_asyncwrap(bool value) {
using_asyncwrap_ = value;
}
inline bool Environment::printed_error() const {
return printed_error_;
}

4
src/env.h
View File

@ -395,6 +395,9 @@ class Environment {
inline bool using_domains() const;
inline void set_using_domains(bool value);
inline bool using_asyncwrap() const;
inline void set_using_asyncwrap(bool value);
inline bool printed_error() const;
inline void set_printed_error(bool value);
@ -479,6 +482,7 @@ class Environment {
ares_task_list cares_task_list_;
bool using_smalloc_alloc_cb_;
bool using_domains_;
bool using_asyncwrap_;
bool printed_error_;
debugger::Agent debugger_agent_;