repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: avoid out of bound at worker node removal
[poolifier.git]
/
src
/
pools
/
thread
/
fixed.ts
diff --git
a/src/pools/thread/fixed.ts
b/src/pools/thread/fixed.ts
index a575d0972ff6611fadcbb662e195f31bf118a6d7..d69055cf0909efa3b9cf45983163e0be6a35c513 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
@@
-61,37
+62,41
@@
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 w
orkerExitPromise = new Promise<void>(resolve
=> {
+ const w
aitWorkerExit = new Promise<void>((resolve)
=> {
worker.on('exit', () => {
resolve()
})
})
worker.on('exit', () => {
resolve()
})
})
- this.sendToWorker(workerNodeKey, { kill: true, workerId: worker.threadId })
+ await this.sendKillMessageToWorker(
+ workerNodeKey,
+ workerNode.info.id as number
+ )
workerNode.closeChannel()
await worker.terminate()
workerNode.closeChannel()
await worker.terminate()
- await w
orkerExitPromise
+ await w
aitWorkerExit
}
/** @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
, 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
+ const worker
Node = this.workerNodes[workerNodeKey]
+ const
worker = workerNode.worker
+ const port2: MessagePort = (workerNode.messageChannel as MessageChannel)
+
.port2
worker.postMessage(
{
ready: false,
worker.postMessage(
{
ready: false,
- workerId: worker
.threadI
d,
+ workerId: worker
Node.info.i
d,
port: port2
},
[port2]
port: port2
},
[port2]
@@
-104,7
+109,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)
}
@@
-126,16
+131,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()