Refactor parallel execution logic in oJob

OpenAF · Oct 19, 2024 · bd0f59d · bd0f59d
1 parent a9a0ef6
commit bd0f59d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/js/owrap.oJob.js b/js/owrap.oJob.js
@@ -2264,9 +2264,10 @@ OpenWrap.oJob.prototype.runJob = function(aJob, provideArgs, aId, noAsync, rExec
 			var errors = [];
 			var single = false;
 			if (isDef(parent.__ojob.numThreads) && parent.__ojob.numThreads <= 1) single = true;
+			if (isDef(parent.__ojob.numThreads)) __cpucores = parent.__ojob.numThreads
 	        if (isDef(aJob.typeArgs.single)) single = aJob.typeArgs.single;
 			if (!single) {
-				parallel4Array(args.__oJobRepeat, function(aValue) {
+				pForEach(args.__oJobRepeat, aValue => {
 					if (isUnDef(aValue.execid) && isUnDef(aValue.objId)) {
 						aValue.execid = args.execid;
 						aValue.objId = args.objId;
@@ -2305,7 +2306,7 @@ OpenWrap.oJob.prototype.runJob = function(aJob, provideArgs, aId, noAsync, rExec
 					} finally {
 						return true;
 					}
-				}, parent.__ojob.numThreads);
+				});
 			} else {
 				for(var aVi in args.__oJobRepeat) {
 					args.__oJobRepeat[aVi].execid = args.execid;

diff --git a/tests/autoTestAll.oJob.js b/tests/autoTestAll.oJob.js
@@ -144,7 +144,10 @@
         var testOJob = {
             "jobs": [ {
                 "name": "a",
-                "exec": "sleep(50, true);__pm = args"
+                "typeArgs": {
+                    "single": true
+                },
+                "exec": "sleep(50, true);__pm = merge(__pm, args)"
             } ],
             "todo": [ {
                 "name": "a",