Skip to content

Commit

Permalink
async_wrap: setupHooks now accepts object
Browse files Browse the repository at this point in the history
The number of callbacks accepted to setupHooks was getting unwieldy.
Instead change the implementation to accept an object with all callbacks

Ref: #7048
PR-URL: #5756
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Andreas Madsen <amwebdk@gmail.com>
  • Loading branch information
trevnorris authored and Myles Borins committed Jul 12, 2016
1 parent c3d87ee commit 0642a14
Showing 6 changed files with 32 additions and 15 deletions.
35 changes: 26 additions & 9 deletions src/async-wrap.cc
Original file line number Diff line number Diff line change
@@ -121,18 +121,35 @@ static void SetupHooks(const FunctionCallbackInfo<Value>& args) {

if (env->async_hooks()->callbacks_enabled())
return env->ThrowError("hooks should not be set while also enabled");

if (!args[0]->IsFunction())
if (!args[0]->IsObject())
return env->ThrowTypeError("first argument must be an object");

Local<Object> fn_obj = args[0].As<Object>();

Local<Value> init_v = fn_obj->Get(
env->context(),
FIXED_ONE_BYTE_STRING(env->isolate(), "init")).ToLocalChecked();
Local<Value> pre_v = fn_obj->Get(
env->context(),
FIXED_ONE_BYTE_STRING(env->isolate(), "pre")).ToLocalChecked();
Local<Value> post_v = fn_obj->Get(
env->context(),
FIXED_ONE_BYTE_STRING(env->isolate(), "post")).ToLocalChecked();
Local<Value> destroy_v = fn_obj->Get(
env->context(),
FIXED_ONE_BYTE_STRING(env->isolate(), "destroy")).ToLocalChecked();

if (!init_v->IsFunction())
return env->ThrowTypeError("init callback must be a function");

env->set_async_hooks_init_function(args[0].As<Function>());
env->set_async_hooks_init_function(init_v.As<Function>());

if (args[1]->IsFunction())
env->set_async_hooks_pre_function(args[1].As<Function>());
if (args[2]->IsFunction())
env->set_async_hooks_post_function(args[2].As<Function>());
if (args[3]->IsFunction())
env->set_async_hooks_destroy_function(args[3].As<Function>());
if (pre_v->IsFunction())
env->set_async_hooks_pre_function(pre_v.As<Function>());
if (post_v->IsFunction())
env->set_async_hooks_post_function(post_v.As<Function>());
if (destroy_v->IsFunction())
env->set_async_hooks_destroy_function(destroy_v.As<Function>());
}


2 changes: 1 addition & 1 deletion test/parallel/test-async-wrap-check-providers.js
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ function init(id, provider) {

function noop() { }

async_wrap.setupHooks(init, noop, noop);
async_wrap.setupHooks({ init });

async_wrap.enable();

2 changes: 1 addition & 1 deletion test/parallel/test-async-wrap-disabled-propagate-parent.js
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ function init(uid, type, parentUid, parentHandle) {

function noop() { }

async_wrap.setupHooks(init, noop, noop);
async_wrap.setupHooks({ init });
async_wrap.enable();

const server = net.createServer(function(c) {
2 changes: 1 addition & 1 deletion test/parallel/test-async-wrap-propagate-parent.js
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ function init(uid, type, parentUid, parentHandle) {

function noop() { }

async_wrap.setupHooks(init, noop, noop);
async_wrap.setupHooks({ init });
async_wrap.enable();

const server = net.createServer(function(c) {
4 changes: 2 additions & 2 deletions test/parallel/test-async-wrap-throw-no-init.js
Original file line number Diff line number Diff line change
@@ -7,14 +7,14 @@ const async_wrap = process.binding('async_wrap');

assert.throws(function() {
async_wrap.setupHooks(null);
}, /init callback must be a function/);
}, /first argument must be an object/);

assert.throws(function() {
async_wrap.enable();
}, /init callback is not assigned to a function/);

// Should not throw
async_wrap.setupHooks(() => {});
async_wrap.setupHooks({ init: () => {} });
async_wrap.enable();

assert.throws(function() {
2 changes: 1 addition & 1 deletion test/parallel/test-async-wrap-uid.js
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ const assert = require('assert');
const async_wrap = process.binding('async_wrap');

const storage = new Map();
async_wrap.setupHooks(init, pre, post, destroy);
async_wrap.setupHooks({ init, pre, post, destroy });
async_wrap.enable();

function init(uid) {

0 comments on commit 0642a14

Please sign in to comment.