From: Evan Martin <martine@danga.com>
Date: Tue, 1 Feb 2011 18:18:16 +0000 (-0800)
Subject: implement parallelism flag
X-Git-Tag: release-120715~496
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2baf05d2b80c5b852ee718f272446ceba572b9cc;p=platform%2Fupstream%2Fninja.git

implement parallelism flag
---

diff --git a/src/build.cc b/src/build.cc
index a75659a..8e567d9 100644
--- a/src/build.cc
+++ b/src/build.cc
@@ -182,19 +182,20 @@ void Plan::Dump() {
 }
 
 struct RealCommandRunner : public CommandRunner {
+  RealCommandRunner(int parallelism) : parallelism_(parallelism) {}
   virtual ~RealCommandRunner() {}
   virtual bool CanRunMore();
   virtual bool StartCommand(Edge* edge);
   virtual bool WaitForCommands();
   virtual Edge* NextFinishedCommand(bool* success);
 
+  int parallelism_;
   SubprocessSet subprocs_;
   map<Subprocess*, Edge*> subproc_to_edge_;
 };
 
 bool RealCommandRunner::CanRunMore() {
-  const size_t kConcurrency = 8;  // XXX make configurable etc.
-  return subprocs_.running_.size() < kConcurrency;
+  return ((int)subprocs_.running_.size()) < parallelism_;
 }
 
 bool RealCommandRunner::StartCommand(Edge* edge) {
@@ -270,7 +271,7 @@ Builder::Builder(State* state, const BuildConfig& config)
   if (config.dry_run)
     command_runner_ = new DryRunCommandRunner;
   else
-    command_runner_ = new RealCommandRunner;
+    command_runner_ = new RealCommandRunner(config.parallelism);
   status_ = new BuildStatus;
   status_->verbosity_ = config.verbosity;
   log_ = state->build_log_;
diff --git a/todo b/todo
index b97df0d..e3e0acb 100644
--- a/todo
+++ b/todo
@@ -3,8 +3,6 @@ necessary
 
 website, contact info
 
--j flag for parallelism
-
 delete halfway-built output files when interrupted
 
 frosting