repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1148 from poolifier/feature/task-functions
[poolifier.git]
/
src
/
pools
/
thread
/
fixed.ts
diff --git
a/src/pools/thread/fixed.ts
b/src/pools/thread/fixed.ts
index 9acfd6400ef59a12823b52899ca7f35e2ae96e56..2ad94a7bf16083072bf1303745834c2b7c06506a 100644
(file)
--- a/
src/pools/thread/fixed.ts
+++ b/
src/pools/thread/fixed.ts
@@
-62,15
+62,12
@@
export class FixedThreadPool<
// FIXME: wait for tasks to be finished
const workerNode = this.workerNodes[workerNodeKey]
const worker = workerNode.worker
// FIXME: wait for tasks to be finished
const workerNode = this.workerNodes[workerNodeKey]
const worker = workerNode.worker
- const waitWorkerExit = new Promise<void>(
(resolve)
=> {
+ const waitWorkerExit = new Promise<void>(
resolve
=> {
worker.on('exit', () => {
resolve()
})
})
worker.on('exit', () => {
resolve()
})
})
- await this.sendKillMessageToWorker(
- workerNodeKey,
- workerNode.info.id as number
- )
+ await this.sendKillMessageToWorker(workerNodeKey)
workerNode.closeChannel()
await worker.terminate()
await waitWorkerExit
workerNode.closeChannel()
await worker.terminate()
await waitWorkerExit
@@
-82,18
+79,20
@@
export class FixedThreadPool<
message: MessageValue<Data>,
transferList?: TransferListItem[]
): void {
message: MessageValue<Data>,
transferList?: TransferListItem[]
): void {
-
;
(
+ (
this.workerNodes[workerNodeKey].messageChannel as MessageChannel
this.workerNodes[workerNodeKey].messageChannel as MessageChannel
- ).port1.postMessage(message, transferList)
+ ).port1.postMessage(
+ { ...message, workerId: this.workerNodes[workerNodeKey].info.id },
+ transferList
+ )
}
/** @inheritDoc */
protected sendStartupMessageToWorker (workerNodeKey: number): void {
const workerNode = this.workerNodes[workerNodeKey]
}
/** @inheritDoc */
protected sendStartupMessageToWorker (workerNodeKey: number): void {
const workerNode = this.workerNodes[workerNodeKey]
- const worker = workerNode.worker
const port2: MessagePort = (workerNode.messageChannel as MessageChannel)
.port2
const port2: MessagePort = (workerNode.messageChannel as MessageChannel)
.port2
- worker.postMessage(
+ worker
Node.worker
.postMessage(
{
ready: false,
workerId: workerNode.info.id,
{
ready: false,
workerId: workerNode.info.id,
@@
-108,7
+107,7
@@
export class FixedThreadPool<
workerNodeKey: number,
listener: (message: MessageValue<Message>) => void
): void {
workerNodeKey: number,
listener: (message: MessageValue<Message>) => void
): void {
-
;
(
+ (
this.workerNodes[workerNodeKey].messageChannel as MessageChannel
).port1.on('message', listener)
}
this.workerNodes[workerNodeKey].messageChannel as MessageChannel
).port1.on('message', listener)
}