Skip to content

Commit

Permalink
feat(asynchooks): don't clear periodic macrotask after invoke
Browse files Browse the repository at this point in the history
  • Loading branch information
@JiaLiPassion
JiaLiPassion committed Jan 4, 2018
1 parent 7afb895 commit adcb360
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 31 deletions.
2 changes: 1 addition & 1 deletion example/benchmarks/timeout_benchmarks.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
require('../../dist/zone-node-asynchooks');

const start = Date.now();
for (let i = 0; i < 10000; i ++) {
for (let i = 0; i < 100000; i ++) {
setTimeout(() => {}, 0);
}

Expand Down
63 changes: 42 additions & 21 deletions lib/node/async_hooks.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ Zone.__load_patch('node_async_hooks', (global: any, Zone: ZoneType, api: _ZonePr
try {
async_hooks = require('async_hooks');
Zone.__mode__ = 'asynchooks';
global.__Zone_disable_node_timers = true;
global.__Zone_disable_nextTick = true;
global.__Zone_disable_handleUnhandledPromiseRejection = true;
global.__Zone_disable_crypto = true;
global.__Zone_disable_fs = true;
} catch (err) {
print(err.message);
return;
Expand All @@ -29,6 +34,8 @@ Zone.__load_patch('node_async_hooks', (global: any, Zone: ZoneType, api: _ZonePr
const SET_TIMEOUT = 'setTimeout';
const NEXT_TICK = 'process.nextTick';

const periodicProviders = ['STATWATCHER', 'HTTPPARSER', 'TCPWRAP'];

const NUMBER = 'number';

const noop = function() {};
Expand All @@ -39,6 +46,7 @@ Zone.__load_patch('node_async_hooks', (global: any, Zone: ZoneType, api: _ZonePr
zone?: Zone;
id: number;
task?: Task;
isDeleted?: boolean;
}

const idPromise: AsyncHooksContext[] = [];
Expand All @@ -57,18 +65,12 @@ Zone.__load_patch('node_async_hooks', (global: any, Zone: ZoneType, api: _ZonePr
(zone as any)._zoneDelegate.handleError(zone, error);
});

function binarySearch(
array: AsyncHooksContext[], id: number, isDeleteNonPeriodic = false,
isForceDelete = false): AsyncHooksContext {
function binarySearch(array: AsyncHooksContext[], id: number): AsyncHooksContext {
let low = 0, high = array.length - 1, mid;
while (low <= high) {
mid = Math.floor((low + high) / 2);
const midCtx = array[mid];
if (midCtx.id === id) {
if (isForceDelete || (isDeleteNonPeriodic && midCtx.task && midCtx.task.data &&
!midCtx.task.data.isPeriodic)) {
array.splice(mid, 1);
}
return midCtx;
} else if (midCtx.id < id)
low = mid + 1;
Expand All @@ -78,6 +80,12 @@ Zone.__load_patch('node_async_hooks', (global: any, Zone: ZoneType, api: _ZonePr
return null;
}

function clearAsyncHooksContext(ctx: AsyncHooksContext) {
ctx.task = null;
ctx.zone = null;
ctx.isDeleted = true;
}

function cancelTask(task: Task, id: number) {
if (task.source === SET_TIMEOUT) {
clearTimeout((task.data as any).args);
Expand All @@ -100,11 +108,12 @@ Zone.__load_patch('node_async_hooks', (global: any, Zone: ZoneType, api: _ZonePr
if (!DEBUG) {
return;
}
print(Object.keys(obj)
.map((key: string) => {
/*print(Object.keys(obj)
.map((key: any) => {
return key + ':' + obj[key];
})
.join(','));
*/
}

api.setPromiseTick = (flag: boolean) => {
Expand Down Expand Up @@ -148,16 +157,13 @@ Zone.__load_patch('node_async_hooks', (global: any, Zone: ZoneType, api: _ZonePr
data.args = parentHandle;
let source: string = provider;
if (isPeriodic) {
source = SET_INTERVAL;
source = provider === TIMER_PROVIDER ? SET_INTERVAL : provider;
} else if (provider === TIMER_PROVIDER) {
source = SET_TIMEOUT;
}
const task = zone.scheduleMacroTask(source, noop, data, noop, () => {
cancelTask(task, id);
});
if (id === 51) {
print('task state', task.state);
}
idMacroTasks.push({id, zone, task});
}

Expand All @@ -174,9 +180,12 @@ Zone.__load_patch('node_async_hooks', (global: any, Zone: ZoneType, api: _ZonePr
promiseInit(id, triggerId, parentHandle);
} else if (provider === TICKOBJ_PROVIDER) {
scheduleMicroTask(id, provider, triggerId, parentHandle);
return;
} else {
if (provider === TIMER_PROVIDER && parentHandle && typeof parentHandle._repeat === NUMBER) {
scheduleMacroTask(id, provider, triggerId, parentHandle, parentHandle._idleTimeout, true);
} else if (periodicProviders.indexOf(provider) >= 0) {
scheduleMacroTask(id, provider, triggerId, parentHandle, undefined, true);
} else {
printObj(parentHandle);
scheduleMacroTask(
Expand All @@ -198,38 +207,50 @@ Zone.__load_patch('node_async_hooks', (global: any, Zone: ZoneType, api: _ZonePr
currentAsyncContext = binarySearch(idMacroTasks, id);
}
if (currentAsyncContext) {
print('before ', currentAsyncContext && currentAsyncContext.task.source, id.toString());
print(
'before ',
currentAsyncContext && currentAsyncContext.task && currentAsyncContext.task.source,
id.toString());
api.beforeRunTask(currentAsyncContext.zone, currentAsyncContext.task);
(currentAsyncContext.zone as any).invokeTask(currentAsyncContext.task, null, null);
}
}

function after(id: number) {
let currentAsyncContext = binarySearch(idPromise, id, true);
let currentAsyncContext = binarySearch(idPromise, id);
if (currentAsyncContext) {
api.setAsyncContext(null);
clearAsyncHooksContext(currentAsyncContext);
return;
}
currentAsyncContext = binarySearch(idMicroTasks, id, true);
currentAsyncContext = binarySearch(idMicroTasks, id);
if (!currentAsyncContext) {
currentAsyncContext = binarySearch(idMacroTasks, id, true);
currentAsyncContext = binarySearch(idMacroTasks, id);
}
print(
'after ',
currentAsyncContext && currentAsyncContext.task && currentAsyncContext.task.source,
id.toString());
if (currentAsyncContext) {
api.afterRunTask(currentAsyncContext.zone, currentAsyncContext.task);
if (!(currentAsyncContext.task && currentAsyncContext.task.data &&
currentAsyncContext.task.data.isPeriodic)) {
clearAsyncHooksContext(currentAsyncContext);
}
}
print('after ', currentAsyncContext && currentAsyncContext.task.source, id.toString());
}

function destroy(id: number) {
const currentAsyncContext = binarySearch(idMacroTasks, id, true, true);
if (currentAsyncContext) {
const currentAsyncContext = binarySearch(idMacroTasks, id);
if (currentAsyncContext && currentAsyncContext.task) {
print('cancel async context', currentAsyncContext.task.source, id.toString());
printObj((currentAsyncContext.task.data as any).args);
if (currentAsyncContext.task.state !== 'notScheduled') {
currentAsyncContext.zone.cancelTask(currentAsyncContext.task);
}
clearAsyncHooksContext(currentAsyncContext);
}
}

async_hooks.createHook({init, before, after, destroy}).enable();
});
});
10 changes: 2 additions & 8 deletions lib/node/rollup-main-asynchooks.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,5 @@
import '../zone';
import '../common/promise';
import '../common/to-string';
const _global = global as any;
_global.__Zone_disable_node_timers = true;
_global.__Zone_disable_nextTick = true;
_global.__Zone_disable_handleUnhandledPromiseRejection = true;
_global.__Zone_disable_crypto = true;
_global.__Zone_disable_fs = true;
import './node';
import './async_hooks';
import './async_hooks';
// import './node';
7 changes: 6 additions & 1 deletion tsconfig-node.es2017.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
"include": [
"lib/common",
"lib/jasmine",
"lib/node",
"lib/node/async_hooks.ts",
"lib/node/events.ts",
"lib/node/fs.ts",
"lib/node/node.ts",
"lib/node/es2017",
"lib/zone-spec",
"lib/zone.ts",
"test/asynchooks",
Expand All @@ -32,6 +36,7 @@
"test/node_entry_point.ts",
"test/node_entry_point_asynchooks.ts",
"lib/browser/rollup-main.ts",
"lib/browser/rollup-main-asynchooks.ts",
"lib/node/rollup-main.ts",
"lib/node/rollup-test-main.ts",
"lib/mix/rollup-mix.ts",
Expand Down

0 comments on commit adcb360

Please sign in to comment.