multi-tasks 1.0.4 → 1.0.6

package/README.md

@@ -1,2 +1,4 @@
 # multi-tasks
 multi-tasks
+
+- 1.0.6 Performance optimization

package/example/RunnerProducer.js

@@ -17,7 +17,7 @@ class TestProducer extends SuperProducer {
            //throw repos.length+'ff'+repos2.length
             //here, IGNORED_repoRegexStringList
             let alltasks = []
-            for(let i=0;i<100;i++){
+            for(let i=0;i<200;i++){
                 alltasks.push({
                     num:i
                 })

package/example/run.js

@@ -4,7 +4,7 @@ let RunnerProducer = require('./RunnerProducer')
 let RunnerConsumer = require('./RunnerConsumer')
 
 let taskId = Math.random()+'';
-let multi_task_parent_folder = pathutil.resolve(__dirname, `../../../tasks-search-keywords`);
+let multi_task_parent_folder = `C:/tmp-demo`;
 
 let producer = new RunnerProducer(`workers_of_${taskId}`, multi_task_parent_folder)
 let consumer = new RunnerConsumer();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multi-tasks",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
   "main": "index.js",
   "directories": {

package/workers/SuperProducer.js

@@ -45,17 +45,20 @@ class SuperProducer {
 
         
             console.log('allSubTasks=', allSubTasks.length)
+
+            let allSubTasksId = [];
     
             allSubTasks.forEach((info, i)=>{
                 let subid = i;
                 info.subid = subid;
+                allSubTasksId.push(subid+'');
                 let taskfilepath = pathutil.resolve(taskFolderNew, `./${info.subid}.task.json`);
                 fs.writeFileSync(taskfilepath, JSON.stringify(info));
             });
     
             callback({
                 masterTaskId,
-                allSubTasks,
+                allSubTasksId,
                 //mainRptFolder,
                 taskFolder,
                 taskFolderNew,

package/workers/master.js

@@ -49,7 +49,7 @@ let run = (currentProducer, currentConsumer, opt)=>{
 
       currentProducer.generateTasks(opt.quotaOfEachTask, (mainTaskInfo)=>{
           //get ready
-          taskStack = mainTaskInfo.allSubTasks;
+          taskStack = mainTaskInfo.allSubTasksId;
           let totalTaskNum = taskStack.length; 
           console.log( 'tasks=', mainTaskInfo.masterTaskId);
           console.log( 'totalTaskNum=', totalTaskNum);
@@ -61,17 +61,17 @@ let run = (currentProducer, currentConsumer, opt)=>{
               //console.log(`(master).${process.pid} got: '${JSON.stringify(message)}' from w.${worker.process.pid}`);
               if(message === MSG_REQUEST_TASKID){
                 if(taskStack.length > 0){     
-                  let subTaskInfo = taskStack.shift();
+                  let subTaskId = taskStack.shift();
                   let _sendMsg = ()=>{
                     worker.send({
                       startTimestamp: new Date()*1,
                       mainTaskInfo,
-                      subTaskInfo,
+                      subTaskId,
                       totalTaskNum
                     },()=>{
                       //handler
                     }, {
-                      keepOpen: (typeof opt.keepOpen === 'undefined') ? true : opt.keepOpen
+                      keepOpen: (typeof opt.keepOpen === 'undefined') ? false : opt.keepOpen
                     })
                   };
                   _sendMsg();
@@ -101,9 +101,12 @@ let run = (currentProducer, currentConsumer, opt)=>{
       //console.log(`>[w]=${process.pid} started`);
       process.on('message', function(message) {});
       worker.on('message', function(message) {
-          if(message.subTaskInfo){
+          if(message.subTaskId){
               let mainTaskInfo = message.mainTaskInfo;
-              let subTaskInfo = message.subTaskInfo;
+              //console.log(message);
+              let subTaskFilePath = pathutil.resolve(mainTaskInfo.taskFolderNew, `./${message.subTaskId}.task.json`);
+              let subTaskInfo = JSON.parse(fs.readFileSync(subTaskFilePath));
+              //let subTaskInfo = message.subTaskInfo;
               let subid = subTaskInfo.subid;
               if(mainTaskInfo){
                     console.log(`[Task Start]: "${subid}"`, `${subid}/${message.totalTaskNum}`, `pid=${process.pid}`, getDateTimeTxt());