Commit 1dedd68

authored

Added support for terminating a spawned worker if a timeout is reached (#207)

1 parent 6bbf617 commit 1dedd68Copy full SHA for 1dedd68

File tree

+16

-1

lines changed

+16

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ console.log(p.data); // prints [1, 2, 3, 4, 5]`
`56`	`56`
`57`	`57`	`---`
`58`	`58`
`59`		-### `spawn(fn)`
	`59`	+### `spawn(fn, opts)`
`60`	`60`
`61`	`61`	`This function will spawn a new process on a worker thread. Pass it the function you want to call. Your`
`62`	`62`	`function will receive one argument, which is the current data. The value returned from your spawned function will`
`@@ -65,6 +65,8 @@ update the current data.`
`65`	`65`	`Arguments`
`66`	`66`
`67`	`67`	* `fn`: A function to execute on a worker thread. Receives the wrapped data as an argument. The value returned will be assigned to the wrapped data.
	`68`	+* `opts`: An optional object to pass to spawn.
	`69`	`+* 'opts.timeout': milliseconds to way for function to return value. If the worker does not finish in this time, it will be killed.`
`68`	`70`
`69`	`71`	`Example`
`70`	`72`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,18 +190,31 @@`
`190`	`190`	`Parallel.prototype.spawn = function(cb, env) {`
`191`	`191`	`const that = this;`
`192`	`192`	`const newOp = new Operation();`
	`193`	`+ let timeout;`
`193`	`194`
`194`	`195`	`env = extend(this.options.env, env \|\| {});`
`195`	`196`
`196`	`197`	`this.operation.then(() => {`
	`198`	`+`
	`199`	`+ if(env.timeout) {`
	`200`	`+ timeout = setTimeout(function() {`
	`201`	`+ if(!newOp.resolved) {`
	`202`	`+ wrk.terminate();`
	`203`	`+ newOp.resolve(new Error('Operation timed out!'), null);`
	`204`	`+ }`
	`205`	`+ }, env.timeout);`
	`206`	`+ }`
	`207`	`+`
`197`	`208`	`const wrk = that._spawnWorker(cb, env);`
`198`	`209`	`if (wrk !== undefined) {`
`199`	`210`	`wrk.onmessage = function(msg) {`
	`211`	`+ if(timeout) clearTimeout(timeout);`
`200`	`212`	`wrk.terminate();`
`201`	`213`	`that.data = msg.data;`
`202`	`214`	`newOp.resolve(null, that.data);`
`203`	`215`	`};`
`204`	`216`	`wrk.onerror = function(e) {`
	`217`	`+ if(timeout) clearTimeout(timeout);`
`205`	`218`	`wrk.terminate();`
`206`	`219`	`newOp.resolve(e, null);`
`207`	`220`	`};`

Comments

(0)