X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Ffixed.js;h=645528283d80807cbc5374b5184c64b0f4c83c9e;hb=48211d04ba8aeae7c6dca982391054269adddac2;hp=5d5d40e1be1a53c8092360432f97f77a97d57e41;hpb=50811da2e375e78179b56fe78fd7674ad2f360fd;p=poolifier.git

diff --git a/lib/fixed.js b/lib/fixed.js
index 5d5d40e1..64552828 100644
--- a/lib/fixed.js
+++ b/lib/fixed.js
@@ -2,8 +2,6 @@
 const {
   Worker, isMainThread, MessageChannel, SHARE_ENV
 } = require('worker_threads')
-const path = require('path')
-const { generateID } = require('./util')
 
 function empty () {}
 /**
@@ -16,17 +14,18 @@ class FixedThreadPool {
   /**
     *
     * @param {Number} numThreads  Num of threads for this worker pool
-    * @param {string} a file path with implementation of @see ThreadWorker class
-    * @param {Object} an object with possible options for example errorHandler, onlineHandler, exitHandler
+    * @param {string} a file path with implementation of @see ThreadWorker class, relative path is fine
+    * @param {Object} an object with possible options for example errorHandler, onlineHandler.
   */
-  constructor (numThreads, filename, opts) {
+  constructor (numThreads, filePath, opts) {
     if (!isMainThread) throw new Error('Cannot start a thread pool from a worker thread !!!')
-    if (!filename) throw new Error('Please specify a file with a worker implementation')
+    if (!filePath) throw new Error('Please specify a file with a worker implementation')
     this.numThreads = numThreads
     this.workers = []
     this.nextWorker = 0
     this.opts = opts || { maxTasks: 1000 }
-    this.filename = filename
+    this.filePath = filePath
+    this._id = 0
     // threadId as key and an integer value
     this.tasks = new Map()
     for (let i = 1; i <= numThreads; i++) {
@@ -38,7 +37,6 @@ class FixedThreadPool {
     for (const worker of this.workers) {
       worker.terminate()
     }
-    this.emitDestroy()
   }
 
   /**
@@ -50,10 +48,9 @@ class FixedThreadPool {
     // configure worker to handle message with the specified task
     const worker = this._chooseWorker()
     this.tasks.set(worker, this.tasks.get(worker) + 1)
-    const id = generateID()
-    data._id = id
+    const id = ++this._id
     const res = this._execute(worker, id)
-    worker.postMessage(data)
+    worker.postMessage({ data: data, _id: id })
     return res
   }
 
@@ -81,10 +78,11 @@ class FixedThreadPool {
   }
 
   _newWorker () {
-    const worker = new Worker(path.resolve(this.filename), { env: SHARE_ENV })
+    const worker = new Worker(this.filePath, { env: SHARE_ENV })
     worker.on('error', this.opts.errorHandler || empty)
-    worker.on('exit', this.opts.exitHandler || empty)
     worker.on('online', this.opts.onlineHandler || empty)
+    // TODO handle properly when a thread exit
+    worker.on('exit', this.opts.exitHandler || empty)
     this.workers.push(worker)
     const { port1, port2 } = new MessageChannel()
     worker.postMessage({ parent: port1 }, [port1])
@@ -92,7 +90,7 @@ class FixedThreadPool {
     worker.port2 = port2
     // we will attach a listener for every task,
     // when task is completed the listener will be removed but to avoid warnings we are increasing the max listeners size
-    worker.port2.setMaxListeners(this.opts.maxTasks)
+    worker.port2.setMaxListeners(this.opts.maxTasks || 1000)
     // init tasks map
     this.tasks.set(worker, 0)
     return worker