From 605329d7f77397f5f3e1ae65b738cd4391e18f9a Mon Sep 17 00:00:00 2001
From: Trevor Norris <trev.norris@gmail.com>
Date: Thu, 5 Feb 2015 16:22:25 -0700
Subject: [PATCH] asyncwrap: fix constructor condition for early ret

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/joyent/node/pull/9146
Reviewed-by: Julien Gilli <julien.gilli@joyent.com>
---
 src/async-wrap-inl.h | 4 +++-
 src/async-wrap.cc    | 2 ++
 src/env-inl.h        | 9 +++++++++
 src/env.h            | 4 ++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/async-wrap-inl.h b/src/async-wrap-inl.h
index f064ea96cf4..f7e848e6f41 100644
--- a/src/async-wrap-inl.h
+++ b/src/async-wrap-inl.h
@@ -43,7 +43,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 == NULL)
     return;
 
   // TODO(trevnorris): Until it's verified all passed object's are not weak,
diff --git a/src/async-wrap.cc b/src/async-wrap.cc
index de1007e73d1..9ae59639729 100644
--- a/src/async-wrap.cc
+++ b/src/async-wrap.cc
@@ -69,6 +69,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);
 }
 
 
diff --git a/src/env-inl.h b/src/env-inl.h
index a2245130664..53f818ad62c 100644
--- a/src/env-inl.h
+++ b/src/env-inl.h
@@ -210,6 +210,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) {
@@ -343,6 +344,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_;
 }
diff --git a/src/env.h b/src/env.h
index e028a23f048..fb243b0ebce 100644
--- a/src/env.h
+++ b/src/env.h
@@ -430,6 +430,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);
 
@@ -499,6 +502,7 @@ class Environment {
   ares_task_list cares_task_list_;
   bool using_smalloc_alloc_cb_;
   bool using_domains_;
+  bool using_asyncwrap_;
   QUEUE gc_tracker_queue_;
   bool printed_error_;
   debugger::Agent debugger_agent_;