Commit e10eebf
async_wrap: make uid the first argument in init
All other hooks have uid as the first argument, this makes it concistent
for all hooks.
Ref: #7048
PR-URL: #4600
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>1 parent 13d465b commit e10eebf
5 files changed
Lines changed: 6 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -40,8 +40,8 @@ inline AsyncWrap::AsyncWrap(Environment* env, | |||
| 40 | 40 | v8::HandleScope scope(env->isolate()); | |
| 41 | 41 | ||
| 42 | 42 | v8::Local<v8::Value> argv[] = { | |
| 43 | - v8::Int32::New(env->isolate(), provider), | ||
| 44 | 43 | v8::Integer::New(env->isolate(), get_uid()), | |
| 44 | + v8::Int32::New(env->isolate(), provider), | ||
| 45 | 45 | Null(env->isolate()) | |
| 46 | 46 | }; | |
| 47 | 47 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,8 +29,8 @@ if (common.isAix) { | |||
| 29 | 29 | } | |
| 30 | 30 | } | |
| 31 | 31 | ||
| 32 | - function init(id) { | ||
| 33 | - keyList = keyList.filter((e) => e != pkeys[id]); | ||
| 32 | + function init(id, provider) { | ||
| 33 | + keyList = keyList.filter((e) => e != pkeys[provider]); | ||
| 34 | 34 | } | |
| 35 | 35 | ||
| 36 | 36 | function noop() { } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -9,7 +9,7 @@ const providers = Object.keys(async_wrap.Providers); | |||
| 9 | 9 | let cntr = 0; | |
| 10 | 10 | let client; | |
| 11 | 11 | ||
| 12 | - function init(type, id, parent) { | ||
| 12 | + function init(id, type, parent) { | ||
| 13 | 13 | if (parent) { | |
| 14 | 14 | cntr++; | |
| 15 | 15 | // Cannot assert in init callback or will abort. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,7 +8,7 @@ const async_wrap = process.binding('async_wrap'); | |||
| 8 | 8 | let cntr = 0; | |
| 9 | 9 | let client; | |
| 10 | 10 | ||
| 11 | - function init(type, id, parent) { | ||
| 11 | + function init(id, type, parent) { | ||
| 12 | 12 | if (parent) { | |
| 13 | 13 | cntr++; | |
| 14 | 14 | // Cannot assert in init callback or will abort. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -9,7 +9,7 @@ const storage = new Map(); | |||
| 9 | 9 | async_wrap.setupHooks(init, pre, post, destroy); | |
| 10 | 10 | async_wrap.enable(); | |
| 11 | 11 | ||
| 12 | - function init(provider, uid) { | ||
| 12 | + function init(uid) { | ||
| 13 | 13 | storage.set(uid, { | |
| 14 | 14 | init: true, | |
| 15 | 15 | pre: false, | |
0 commit comments