implement job server

Instead of trying to block recursive jom calls, use a job server
similar to what GNU make provides.

Task-number: QTCREATORBUG-10846
Change-Id: I0e17bb3a4e22e911da58f90e1bebc20aa5e6c75a
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

1 files changed, 9 insertions, 4 deletions

diff --git a/src/jomlib/targetexecutor.h b/src/jomlib/targetexecutor.h
index 7f61f2b..f5497d2 100644
--- a/src/jomlib/targetexecutor.h
+++ b/src/jomlib/targetexecutor.h
@@ -33,6 +33,7 @@ namespace NMakeFile {
 
 class CommandExecutor;
 class DependencyGraph;
+class JobClient;
 
 class TargetExecutor : public QObject {
     Q_OBJECT
@@ -42,28 +43,32 @@ public:
 
     void apply(Makefile* mkfile, const QStringList& targets);
     void removeTempFiles();
-    bool hasPendingTargets() const;
 
 signals:
     void finished(int exitCode);
 
-public slots:
-   void startProcesses();
-
 private slots:
+    void startProcesses();
+    void buildNextTarget();
     void onChildFinished(CommandExecutor*, bool commandFailed);
 
 private:
+    int numberOfRunningProcesses() const;
     void waitForProcesses();
     void finishBuild(int exitCode);
+    void findNextTarget();
 
 private:
+    ProcessEnvironment m_environment;
     Makefile* m_makefile;
     DependencyGraph* m_depgraph;
     QList<DescriptionBlock*> m_pendingTargets;
+    JobClient *m_jobClient;
     bool m_bAborted;
+    int m_jobAcquisitionCount;
     QList<CommandExecutor*> m_availableProcesses;
     QList<CommandExecutor*> m_processes;
+    DescriptionBlock *m_nextTarget;
     bool m_allCommandsSuccessfullyExecuted;
 };