Fixed an issue in the multiprocessing usage causing a traceback when then number of tasks is smaller than the number of worker processes. eric7

Tue, 23 Aug 2022 16:21:07 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 23 Aug 2022 16:21:07 +0200
branch
eric7
changeset 9292
a5c8a0213fe3
parent 9291
7b271bcd12d0
child 9293
7d9d916a9a9f

Fixed an issue in the multiprocessing usage causing a traceback when then number of tasks is smaller than the number of worker processes.

src/eric7/CodeFormatting/BlackFormattingDialog.py file | annotate | diff | comparison | revisions
src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py file | annotate | diff | comparison | revisions
src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py file | annotate | diff | comparison | revisions
src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py file | annotate | diff | comparison | revisions
src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsonCheckSyntax.py file | annotate | diff | comparison | revisions
src/eric7/Plugins/CheckerPlugins/SyntaxChecker/tomlCheckSyntax.py file | annotate | diff | comparison | revisions
src/eric7/Plugins/CheckerPlugins/SyntaxChecker/yamlCheckSyntax.py file | annotate | diff | comparison | revisions
--- a/src/eric7/CodeFormatting/BlackFormattingDialog.py	Tue Aug 23 16:20:08 2022 +0200
+++ b/src/eric7/CodeFormatting/BlackFormattingDialog.py	Tue Aug 23 16:21:07 2022 +0200
@@ -274,7 +274,7 @@
 
         # Submit tasks (initially two times the number of processes)
         tasks = len(files)
-        initialTasks = 2 * NumberOfProcesses
+        initialTasks = min(2 * NumberOfProcesses, tasks)
         for _ in range(initialTasks):
             file = files.pop(0)
             relSrc = self.__project.getRelativePath(str(file)) if self.__project else ""
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Tue Aug 23 16:20:08 2022 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Tue Aug 23 16:21:07 2022 +0200
@@ -226,7 +226,7 @@
 
     # Submit tasks (initially two times the number of processes)
     tasks = len(argumentsList)
-    initialTasks = 2 * NumberOfProcesses
+    initialTasks = min(2 * NumberOfProcesses, tasks)
     for _ in range(initialTasks):
         taskQueue.put(argumentsList.pop(0))
 
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Tue Aug 23 16:20:08 2022 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Tue Aug 23 16:21:07 2022 +0200
@@ -147,7 +147,7 @@
 
     # Submit tasks (initially two times the number of processes)
     tasks = len(argumentsList)
-    initialTasks = 2 * NumberOfProcesses
+    initialTasks = min(2 * NumberOfProcesses, tasks)
     for _ in range(initialTasks):
         taskQueue.put(argumentsList.pop(0))
 
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py	Tue Aug 23 16:20:08 2022 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py	Tue Aug 23 16:21:07 2022 +0200
@@ -96,7 +96,7 @@
 
     # Submit tasks (initially two times the number of processes)
     tasks = len(argumentsList)
-    initialTasks = 2 * NumberOfProcesses
+    initialTasks = min(2 * NumberOfProcesses, tasks)
     for _ in range(initialTasks):
         taskQueue.put(argumentsList.pop(0))
 
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsonCheckSyntax.py	Tue Aug 23 16:20:08 2022 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsonCheckSyntax.py	Tue Aug 23 16:21:07 2022 +0200
@@ -97,7 +97,7 @@
 
     # Submit tasks (initially two times the number of processes)
     tasks = len(argumentsList)
-    initialTasks = 2 * NumberOfProcesses
+    initialTasks = min(2 * NumberOfProcesses, tasks)
     for _ in range(initialTasks):
         taskQueue.put(argumentsList.pop(0))
 
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/tomlCheckSyntax.py	Tue Aug 23 16:20:08 2022 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/tomlCheckSyntax.py	Tue Aug 23 16:21:07 2022 +0200
@@ -97,7 +97,7 @@
 
     # Submit tasks (initially two times the number of processes)
     tasks = len(argumentsList)
-    initialTasks = 2 * NumberOfProcesses
+    initialTasks = min(2 * NumberOfProcesses, tasks)
     for _ in range(initialTasks):
         taskQueue.put(argumentsList.pop(0))
 
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/yamlCheckSyntax.py	Tue Aug 23 16:20:08 2022 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/yamlCheckSyntax.py	Tue Aug 23 16:21:07 2022 +0200
@@ -97,7 +97,7 @@
 
     # Submit tasks (initially two times the number of processes)
     tasks = len(argumentsList)
-    initialTasks = 2 * NumberOfProcesses
+    initialTasks = min(2 * NumberOfProcesses, tasks)
     for _ in range(initialTasks):
         taskQueue.put(argumentsList.pop(0))
 

eric ide

mercurial