src,http_parser: remove KickNextTick call

trevnorris · trevnorris · commit 41f333e67949 · 2016-03-28T11:30:55.000-06:00
Now that HTTPParser uses MakeCallback it is unnecessary to manually process the nextTickQueue. The KickNextTick function is now no longer needed so code has moved back to node::MakeCallback to simplify implementation. Include minor cleanup moving Environment::tick_info() call below the early return to save an operation. PR-URL: nodejs#5756 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Andreas Madsen <amwebdk@gmail.com>
diff --git a/src/async-wrap.cc b/src/async-wrap.cc
@@ -181,7 +181,6 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
   Local<Function> post_fn = env()->async_hooks_post_function();
   Local<Value> uid = Integer::New(env()->isolate(), get_uid());
   Local<Object> context = object();
-  Local<Object> process = env()->process_object();
   Local<Object> domain;
   bool has_domain = false;
 
@@ -233,16 +232,18 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
     }
   }
 
-  Environment::TickInfo* tick_info = env()->tick_info();
-
   if (callback_scope.in_makecallback()) {
     return ret;
   }
 
+  Environment::TickInfo* tick_info = env()->tick_info();
+
   if (tick_info->length() == 0) {
     env()->isolate()->RunMicrotasks();
   }
 
+  Local<Object> process = env()->process_object();
+
   if (tick_info->length() == 0) {
     tick_info->set_index(0);
     return ret;
diff --git a/src/env.cc b/src/env.cc
@@ -64,27 +64,4 @@ void Environment::PrintSyncTrace() const {
   fflush(stderr);
 }
 
-
-bool Environment::KickNextTick(Environment::AsyncCallbackScope* scope) {
-  TickInfo* info = tick_info();
-
-  if (scope->in_makecallback()) {
-    return true;
-  }
-
-  if (info->length() == 0) {
-    isolate()->RunMicrotasks();
-  }
-
-  if (info->length() == 0) {
-    info->set_index(0);
-    return true;
-  }
-
-  Local<Value> ret =
-    tick_callback_function()->Call(process_object(), 0, nullptr);
-
-  return !ret.IsEmpty();
-}
-
 }  // namespace node
diff --git a/src/env.h b/src/env.h
@@ -475,8 +475,6 @@ class Environment {
 
   inline int64_t get_async_wrap_uid();
 
-  bool KickNextTick(AsyncCallbackScope* scope);
-
   inline uint32_t* heap_statistics_buffer() const;
   inline void set_heap_statistics_buffer(uint32_t* pointer);
 
diff --git a/src/node.cc b/src/node.cc
@@ -1222,7 +1222,23 @@ Local<Value> MakeCallback(Environment* env,
     }
   }
 
-  if (!env->KickNextTick(&callback_scope)) {
+  if (callback_scope.in_makecallback()) {
+    return ret;
+  }
+
+  Environment::TickInfo* tick_info = env->tick_info();
+
+  if (tick_info->length() == 0) {
+    env->isolate()->RunMicrotasks();
+  }
+
+  Local<Object> process = env->process_object();
+
+  if (tick_info->length() == 0) {
+    tick_info->set_index(0);
+  }
+
+  if (env->tick_callback_function()->Call(process, 0, nullptr).IsEmpty()) {
     return Undefined(env->isolate());
   }
 
diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc
@@ -587,8 +587,6 @@ class Parser : public AsyncWrap {
     if (!cb->IsFunction())
       return;
 
-    Environment::AsyncCallbackScope callback_scope(parser->env());
-
     // Hooks for GetCurrentBuffer
     parser->current_buffer_len_ = nread;
     parser->current_buffer_data_ = buf->base;
@@ -597,8 +595,6 @@ class Parser : public AsyncWrap {
 
     parser->current_buffer_len_ = 0;
     parser->current_buffer_data_ = nullptr;
-
-    parser->env()->KickNextTick(&callback_scope);
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,6 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,`
`181`	`181`	`Local<Function> post_fn = env()->async_hooks_post_function();`
`182`	`182`	`Local<Value> uid = Integer::New(env()->isolate(), get_uid());`
`183`	`183`	`Local<Object> context = object();`
`184`		`- Local<Object> process = env()->process_object();`
`185`	`184`	`Local<Object> domain;`
`186`	`185`	`bool has_domain = false;`
`187`	`186`
`@@ -233,16 +232,18 @@ Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,`
`233`	`232`	`}`
`234`	`233`	`}`
`235`	`234`
`236`		`- Environment::TickInfo* tick_info = env()->tick_info();`
`237`		`-`
`238`	`235`	`if (callback_scope.in_makecallback()) {`
`239`	`236`	`return ret;`
`240`	`237`	`}`
`241`	`238`
	`239`	`+ Environment::TickInfo* tick_info = env()->tick_info();`
	`240`	`+`
`242`	`241`	`if (tick_info->length() == 0) {`
`243`	`242`	`env()->isolate()->RunMicrotasks();`
`244`	`243`	`}`
`245`	`244`
	`245`	`+ Local<Object> process = env()->process_object();`
	`246`	`+`
`246`	`247`	`if (tick_info->length() == 0) {`
`247`	`248`	`tick_info->set_index(0);`
`248`	`249`	`return ret;`