repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: ensure event is emitted before task promise rejection
[poolifier.git]
/
src
/
pools
/
thread
/
fixed.ts
diff --git
a/src/pools/thread/fixed.ts
b/src/pools/thread/fixed.ts
index 3dc10821e2cdb9198e3eea62e287a4fc4d8aa425..d843144c633fd99d5becf18ad1d5918ab570eaf6 100644
(file)
--- a/
src/pools/thread/fixed.ts
+++ b/
src/pools/thread/fixed.ts
@@
-1,13
+1,31
@@
import {
import {
- isMainThread,
MessageChannel,
SHARE_ENV,
MessageChannel,
SHARE_ENV,
- Worker
+ Worker,
+ type WorkerOptions,
+ isMainThread
} from 'node:worker_threads'
import type { Draft, MessageValue } from '../../utility-types'
import { AbstractPool } from '../abstract-pool'
} from 'node:worker_threads'
import type { Draft, MessageValue } from '../../utility-types'
import { AbstractPool } from '../abstract-pool'
-import type { PoolOptions } from '../pool'
-import { PoolType } from '../pool'
+import {
+ type PoolOptions,
+ type PoolType,
+ PoolTypes,
+ type WorkerType,
+ WorkerTypes
+} from '../pool'
+
+/**
+ * Options for a poolifier thread pool.
+ */
+export interface ThreadPoolOptions extends PoolOptions<Worker> {
+ /**
+ * Worker options.
+ *
+ * @see https://nodejs.org/api/worker_threads.html#new-workerfilename-options
+ */
+ workerOptions?: WorkerOptions
+}
/**
* A thread worker with message channels for communication between main thread and thread worker.
/**
* A thread worker with message channels for communication between main thread and thread worker.
@@
-19,8
+37,6
@@
export type ThreadWorkerWithMessageChannel = Worker & Draft<MessageChannel>
*
* It is possible to perform tasks in sync or asynchronous mode as you prefer.
*
*
* It is possible to perform tasks in sync or asynchronous mode as you prefer.
*
- * This pool selects the threads in a round robin fashion.
- *
* @typeParam Data - Type of data sent to the worker. This can only be serializable data.
* @typeParam Response - Type of execution response. This can only be serializable data.
* @author [Alessandro Pio Ardizio](https://github.com/pioardi)
* @typeParam Data - Type of data sent to the worker. This can only be serializable data.
* @typeParam Response - Type of execution response. This can only be serializable data.
* @author [Alessandro Pio Ardizio](https://github.com/pioardi)
@@
-40,7
+56,7
@@
export class FixedThreadPool<
public constructor (
numberOfThreads: number,
filePath: string,
public constructor (
numberOfThreads: number,
filePath: string,
-
opts: PoolOptions<ThreadWorkerWithMessageChannel>
= {}
+
protected readonly opts: ThreadPoolOptions
= {}
) {
super(numberOfThreads, filePath, opts)
}
) {
super(numberOfThreads, filePath, opts)
}
@@
-68,16
+84,17
@@
export class FixedThreadPool<
/** @inheritDoc */
protected registerWorkerMessageListener<Message extends Data | Response>(
/** @inheritDoc */
protected registerWorkerMessageListener<Message extends Data | Response>(
-
messageChannel
: ThreadWorkerWithMessageChannel,
+
worker
: ThreadWorkerWithMessageChannel,
listener: (message: MessageValue<Message>) => void
): void {
listener: (message: MessageValue<Message>) => void
): void {
-
messageChannel
.port2?.on('message', listener)
+
worker
.port2?.on('message', listener)
}
/** @inheritDoc */
protected createWorker (): ThreadWorkerWithMessageChannel {
return new Worker(this.filePath, {
}
/** @inheritDoc */
protected createWorker (): ThreadWorkerWithMessageChannel {
return new Worker(this.filePath, {
- env: SHARE_ENV
+ env: SHARE_ENV,
+ ...this.opts.workerOptions
})
}
})
}
@@
-92,13
+109,23
@@
export class FixedThreadPool<
}
/** @inheritDoc */
}
/** @inheritDoc */
- public get type (): PoolType {
- return PoolType.FIXED
+ protected get type (): PoolType {
+ return PoolTypes.fixed
+ }
+
+ /** @inheritDoc */
+ protected get worker (): WorkerType {
+ return WorkerTypes.thread
+ }
+
+ /** @inheritDoc */
+ protected get minSize (): number {
+ return this.numberOfWorkers
}
/** @inheritDoc */
}
/** @inheritDoc */
- protected get
full (): boolean
{
- return this.
workerNodes.length === this.
numberOfWorkers
+ protected get
maxSize (): number
{
+ return this.numberOfWorkers
}
/** @inheritDoc */
}
/** @inheritDoc */