diff -r 1117b60c1f9d -r 0b38613388c9 Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py
--- a/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py Tue Apr 21 19:47:31 2015 +0200
+++ b/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py Wed Apr 22 19:53:58 2015 +0200
@@ -9,6 +9,7 @@
"""
import os
import sys
+import multiprocessing
def initService():
@@ -21,7 +22,16 @@
for i in range(4):
path = os.path.dirname(path)
sys.path.insert(2, os.path.join(path, "ThirdParty", "Jasy"))
- return jsCheckSyntax
+ return jsSyntaxCheck
+
+
+def initBatchService():
+ """
+ Initialize the batch service and return the entry point.
+
+ @return the entry point for the background client (function)
+ """
+ return jsSyntaxBatchCheck
def normalizeCode(codestring):
@@ -46,7 +56,82 @@
return codestring
-def jsCheckSyntax(file, codestring):
+def jsSyntaxCheck(file, codestring):
+ """
+ Function to check a Javascript source file for syntax errors.
+
+ @param file source filename (string)
+ @param codestring string containing the code to check (string)
+ @return dictionary with the keys 'error' and 'warnings' which
+ hold a list containing details about the error/ warnings
+ (file name, line number, column, codestring (only at syntax
+ errors), the message, a list with arguments for the message)
+ """
+ return __jsSyntaxCheck(file, codestring)
+
+
+def jsSyntaxBatchCheck(argumentsList, send, fx, cancelled):
+ """
+ Module function to check syntax for a batch of files.
+
+ @param argumentsList list of arguments tuples as given for
+ syntaxAndPyflakesCheck
+ @param send reference to send function (function)
+ @param fx registered service name (string)
+ @param cancelled reference to function checking for a cancellation
+ (function)
+ """
+ try:
+ NumberOfProcesses = multiprocessing.cpu_count()
+ if NumberOfProcesses >= 1:
+ NumberOfProcesses -= 1
+ except NotImplementedError:
+ NumberOfProcesses = 1
+
+ # Create queues
+ taskQueue = multiprocessing.Queue()
+ doneQueue = multiprocessing.Queue()
+
+ # Submit tasks (initially two time number of processes
+ initialTasks = 2 * NumberOfProcesses
+ for task in argumentsList[:initialTasks]:
+ taskQueue.put(task)
+
+ # Start worker processes
+ for i in range(NumberOfProcesses):
+ multiprocessing.Process(target=worker, args=(taskQueue, doneQueue))\
+ .start()
+
+ # Get and send results
+ endIndex = len(argumentsList) - initialTasks
+ for i in range(len(argumentsList)):
+ filename, result = doneQueue.get()
+ send(fx, filename, result)
+ if cancelled():
+ # just exit the loop ignoring the results of queued tasks
+ break
+ if i < endIndex:
+ taskQueue.put(argumentsList[i + initialTasks])
+
+ # Tell child processes to stop
+ for i in range(NumberOfProcesses):
+ taskQueue.put('STOP')
+
+
+def worker(input, output):
+ """
+ Module function acting as the parallel worker for the style check.
+
+ @param input input queue (multiprocessing.Queue)
+ @param output output queue (multiprocessing.Queue)
+ """
+ for filename, args in iter(input.get, 'STOP'):
+ source = args[0]
+ result = __jsSyntaxCheck(filename, source)
+ output.put((filename, result))
+
+
+def __jsSyntaxCheck(file, codestring):
"""
Function to check a Javascript source file for syntax errors.
