multi-tasks 1.2.3 → 1.2.5

package/README.md

@@ -43,7 +43,7 @@ multiTasks({
     processTask, 
     multi_task_parent_folder: `C:/tmp-demo`, //a directory to store progress and results files, you can check the progress here
     quotaOfEachTask:1, //The number of subtasks assigned to each worker at one time, the default is 1
-    numberOfWorks: 6 //Assign how many workers are working in parallel
+    numberOfWorkers: 6 //Assign how many workers are working in parallel, default is the number of cpu cores minus one
 });
 
 ```
@@ -58,7 +58,7 @@ let RunnerConsumer;//See examples, please provide a Consumer class to process a
 master.start(RunnerProducer, RunnerConsumer, {
     multi_task_parent_folder: `C:/tmp-demo`,
     quotaOfEachTask:2, //The number of tasks assigned to each worker
-    numberOfWorks: 6
+    numberOfWorkers: 6
 });
 ```
 
@@ -71,6 +71,8 @@ node examples/example1/run
 
 Changelog:
 
+- 1.2.5 Rename numberOfWorks to numberOfWorkers, the old one are still supported ;-)
+- 1.2.4 Fix: opt.numberOfWorkers not work
 - 1.2.3 Update README
 - 1.2.2 Update README and examples
 - 1.2.1 Handle exceptions and errors in subtasks

package/examples/example0/run.js

@@ -31,5 +31,5 @@ multiTasks({
     processTask, 
     multi_task_parent_folder: `C:/tmp-demo`, //a directory to store progress and results files, you can check the progress here
     quotaOfEachTask:1, //The number of subtasks assigned to each worker at one time, the default is 1
-    numberOfWorks: 6 //Assign how many workers are working in parallel
+    numberOfWorkers: 6 //Assign how many workers are working in parallel
 });

package/examples/example1/run.js

@@ -5,5 +5,5 @@ let master = require('../../index').master;
 master.start(RunnerProducer, RunnerConsumer, {
     multi_task_parent_folder: `C:/tmp-demo`,
     quotaOfEachTask:2, //The number of tasks assigned to each worker
-    numberOfWorks: 6
+    numberOfWorkers: 6
 });

package/examples/example2/run.js

@@ -19,5 +19,5 @@ producer.setTaskTrunkInfo(taskConfig);
 consumer.setTaskTrunkInfo(taskConfig)
 master.run(producer, consumer, {
     quotaOfEachTask:2,
-    numberOfWorks: 6
+    numberOfWorkers: 6
 });

package/examples/example3-dynamicIncreasing/run.js

@@ -32,5 +32,5 @@ producer.setTaskTrunkInfo(taskConfig);
 consumer.setTaskTrunkInfo(taskConfig)
 master.run(producer, consumer, {
     quotaOfEachTask:1, //<--Lock as one
-    numberOfWorks:NUMBER_OF_WORKS
+    numberOfWorkers:NUMBER_OF_WORKS
 });

package/package.json

@@ -1,21 +1,22 @@
 {
   "name": "multi-tasks",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "",
   "main": "index.js",
   "directories": {
     "example": "example"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest"
   },
   "keywords": [
     "multitask",
     "worker",
     "multithread"
   ],
-  "dependencies": {
-  },
   "author": "zhanglei923@gmail.com",
-  "license": "MIT"
+  "license": "MIT",
+  "devDependencies": {
+    "jest": "^29.7.0"
+  }
 }

package/test/splitter.test.js

@@ -0,0 +1,17 @@
+let splitter = require('../workers/taskSplitter');
+
+let createArray = (len)=>{  
+  let alltasks = []
+  for(let i=0;i<len;i++){
+      alltasks.push(i)
+  }
+  return alltasks;
+}
+
+test('test taskSplitter', async () => {
+    
+  expect(splitter.split(createArray(3), 5).length).toBe(1);
+  expect(splitter.split(createArray(16), 5).length).toBe(4);
+  expect(splitter.split(createArray(101), 1).length).toBe(101);
+  expect(splitter.split(createArray(101), 33).length).toBe(4);
+});

package/workers/master.js

@@ -37,11 +37,12 @@ let hasWorker = ()=>{
   return workidlist.size !== 0;
 }
 let run = (currentProducer, currentConsumer, opt)=>{
-    if(typeof opt === 'undefined') opt = {
-      quotaOfEachTask: 10
-    };    
+    let defaultCPUs = numCPUs - 1;
+    if(typeof opt === 'undefined') opt = {};    
     let masterId = currentProducer.getTaskName();
-    if(typeof opt.numberOfWorks === 'undefined') opt.numberOfWorks = numCPUs;
+    if(typeof opt.quotaOfEachTask === 'undefined') opt.quotaOfEachTask = 1;
+    if(opt.numberOfWorks && !opt.numberOfWorkers) opt.numberOfWorkers = opt.numberOfWorks; //Backward compatible with the wrong variable name
+    if(typeof opt.numberOfWorkers === 'undefined') opt.numberOfWorkers = defaultCPUs;
     console.log('master1, masterId=', masterId)
 
 
@@ -50,7 +51,7 @@ let run = (currentProducer, currentConsumer, opt)=>{
     console.log('start', getDateTimeTxt())
 
     if (cluster.isMaster) {//init
-      let numWorks = opt.numberOfWorks;
+      let numWorks = opt.numberOfWorkers;
       console.log(`numCPUs ${numCPUs}`);
       console.log(`numWorks ${numWorks}`);
       console.log(`Master=${process.pid}`);
@@ -155,8 +156,7 @@ let start = (ProducerClass, ConsumerClass, taskConfig)=>{
   producer.setTaskTrunkInfo(taskConfig);
   consumer.setTaskTrunkInfo(taskConfig);
   run(producer, consumer, {
-      quotaOfEachTask:2,
-      numberOfWorks: 6
+      ...taskConfig
   });
 }
 module.exports = {