src,http_parser: remove KickNextTick call

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. Ref: #7048 PR-URL: #5756 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Andreas Madsen <[email protected]>

Author: trevnorris

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;

src/env.cc

@@ -57,27 +57,4 @@ void Environment::PrintSyncTrace() const{
 fflush(stderr);
 }
 
-
-boolEnvironment::KickNextTick(Environment::AsyncCallbackScope* scope){
- TickInfo* info = tick_info();
-
-if (scope->in_makecallback()){
-returntrue;
- }
-
-if (info->length() == 0){
-isolate()->RunMicrotasks();
- }
-
-if (info->length() == 0){
- info->set_index(0);
-returntrue;
- }
-
- Local<Value> ret =
-tick_callback_function()->Call(process_object(), 0, nullptr);
-
-return !ret.IsEmpty();
-}
-
 } // namespace node

src/env.h

@@ -453,8 +453,6 @@ class Environment{
 
 inlineint64_tget_async_wrap_uid();
 
-boolKickNextTick(AsyncCallbackScope* scope);
-
 inlineuint32_t* heap_statistics_buffer() const;
 inlinevoidset_heap_statistics_buffer(uint32_t* pointer);
 

src/node.cc

@@ -1194,7 +1194,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()){
 returnUndefined(env->isolate());
  }
 

src/node_http_parser.cc

@@ -588,8 +588,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;
@@ -598,8 +596,6 @@ class Parser : public AsyncWrap{
 
  parser->current_buffer_len_ = 0;
  parser->current_buffer_data_ = nullptr;
-
- parser->env()->KickNextTick(&callback_scope);
  }