repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 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 f4f712dfd6cc6c720c5872291670c59cc4e3aef3..2ad94a7bf16083072bf1303745834c2b7c06506a 100644
(file)
--- a/
src/pools/thread/fixed.ts
+++ b/
src/pools/thread/fixed.ts
@@
-2,6
+2,7
@@
import {
type MessageChannel,
type MessagePort,
SHARE_ENV,
type MessageChannel,
type MessagePort,
SHARE_ENV,
+ type TransferListItem,
Worker,
type WorkerOptions,
isMainThread
Worker,
type WorkerOptions,
isMainThread
@@
-57,33
+58,44
@@
export class FixedThreadPool<
/** @inheritDoc */
protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
/** @inheritDoc */
protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
+ this.flushTasksQueue(workerNodeKey)
+ // FIXME: wait for tasks to be finished
const workerNode = this.workerNodes[workerNodeKey]
const worker = workerNode.worker
const workerNode = this.workerNodes[workerNodeKey]
const worker = workerNode.worker
- this.sendToWorker(workerNodeKey, { kill: true, workerId: worker.threadId })
+ const waitWorkerExit = new Promise<void>(resolve => {
+ worker.on('exit', () => {
+ resolve()
+ })
+ })
+ await this.sendKillMessageToWorker(workerNodeKey)
workerNode.closeChannel()
await worker.terminate()
workerNode.closeChannel()
await worker.terminate()
+ await waitWorkerExit
}
/** @inheritDoc */
protected sendToWorker (
workerNodeKey: number,
}
/** @inheritDoc */
protected sendToWorker (
workerNodeKey: number,
- message: MessageValue<Data>
+ message: MessageValue<Data>,
+ transferList?: TransferListItem[]
): void {
(
): void {
(
- this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
- ).port1.postMessage(message)
+ this.workerNodes[workerNodeKey].messageChannel as MessageChannel
+ ).port1.postMessage(
+ { ...message, workerId: this.workerNodes[workerNodeKey].info.id },
+ transferList
+ )
}
/** @inheritDoc */
protected sendStartupMessageToWorker (workerNodeKey: number): void {
}
/** @inheritDoc */
protected sendStartupMessageToWorker (workerNodeKey: number): void {
- const worker = this.workerNodes[workerNodeKey].worker
- const port2: MessagePort = (
- this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
- ).port2
- worker.postMessage(
+ const workerNode = this.workerNodes[workerNodeKey]
+ const port2: MessagePort = (workerNode.messageChannel as MessageChannel)
+ .port2
+ workerNode.worker.postMessage(
{
ready: false,
{
ready: false,
- workerId: worker
.threadI
d,
+ workerId: worker
Node.info.i
d,
port: port2
},
[port2]
port: port2
},
[port2]
@@
-96,7
+108,7
@@
export class FixedThreadPool<
listener: (message: MessageValue<Message>) => void
): void {
(
listener: (message: MessageValue<Message>) => void
): void {
(
- this.
getWorkerInfo(workerNodeKey)
.messageChannel as MessageChannel
+ this.
workerNodes[workerNodeKey]
.messageChannel as MessageChannel
).port1.on('message', listener)
}
).port1.on('message', listener)
}
@@
-118,16
+130,6
@@
export class FixedThreadPool<
return WorkerTypes.thread
}
return WorkerTypes.thread
}
- /** @inheritDoc */
- protected get minSize (): number {
- return this.numberOfWorkers
- }
-
- /** @inheritDoc */
- protected get maxSize (): number {
- return this.numberOfWorkers
- }
-
/** @inheritDoc */
protected get busy (): boolean {
return this.internalBusy()
/** @inheritDoc */
protected get busy (): boolean {
return this.internalBusy()