GN threading refactor

tools/gn/ninja_writer.cc

Index: tools/gn/ninja_writer.cc
diff --git a/tools/gn/ninja_writer.cc b/tools/gn/ninja_writer.cc
index 1fe893edd7e70c6f48a6a7501e54da38e7b43c70..e4c0a22a748ddb7d0a78236565b394d0d7962e74 100644
--- a/tools/gn/ninja_writer.cc
+++ b/tools/gn/ninja_writer.cc
@@ -4,25 +4,29 @@
 
 #include "tools/gn/ninja_writer.h"
 
+#include "tools/gn/builder.h"
+#include "tools/gn/loader.h"
 #include "tools/gn/location.h"
 #include "tools/gn/ninja_build_writer.h"
 #include "tools/gn/ninja_toolchain_writer.h"
 
-NinjaWriter::NinjaWriter(const BuildSettings* build_settings)
-    : build_settings_(build_settings) {
+NinjaWriter::NinjaWriter(const BuildSettings* build_settings,
+                         Builder* builder)
+    : build_settings_(build_settings),
+      builder_(builder) {
 }
 
 NinjaWriter::~NinjaWriter() {
 }
 
 // static
-bool NinjaWriter::RunAndWriteFiles(const BuildSettings* build_settings) {
-  NinjaWriter writer(build_settings);
+bool NinjaWriter::RunAndWriteFiles(const BuildSettings* build_settings,
+                                   Builder* builder) {
+  NinjaWriter writer(build_settings, builder);
 
   std::vector<const Settings*> all_settings;
   std::vector<const Target*> default_targets;
-  if (!writer.WriteToolchains(std::set<std::string>(),
-                              &all_settings, &default_targets))
+  if (!writer.WriteToolchains(&all_settings, &default_targets))
     return false;
   return writer.WriteRootBuildfiles(all_settings, default_targets);
 }
@@ -30,60 +34,54 @@ bool NinjaWriter::RunAndWriteFiles(const BuildSettings* build_settings) {
 // static
 bool NinjaWriter::RunAndWriteToolchainFiles(
     const BuildSettings* build_settings,
-    const std::set<std::string>& skip_files,
+    Builder* builder,
     std::vector<const Settings*>* all_settings) {
-  NinjaWriter writer(build_settings);
+  NinjaWriter writer(build_settings, builder);
   std::vector<const Target*> default_targets;
-  return writer.WriteToolchains(skip_files, all_settings, &default_targets);
+  return writer.WriteToolchains(all_settings, &default_targets);
 }
 
-bool NinjaWriter::WriteToolchains(
-    const std::set<std::string>& skip_files,
-    std::vector<const Settings*>* all_settings,
-    std::vector<const Target*>* default_targets) {
+bool NinjaWriter::WriteToolchains(std::vector<const Settings*>* all_settings,
+                                  std::vector<const Target*>* default_targets) {
   // Categorize all targets by toolchain.
   typedef std::map<Label, std::vector<const Target*> > CategorizedMap;
   CategorizedMap categorized;
 
-  std::vector<const Target*> all_targets;
-  build_settings_->target_manager().GetAllTargets(&all_targets);
-  if (all_targets.empty()) {
+  std::vector<const BuilderRecord*> all_records = builder_->GetAllRecords();
+  for (size_t i = 0; i < all_records.size(); i++) {
+    if (all_records[i]->type() == BuilderRecord::ITEM_TARGET &&
+        all_records[i]->should_generate()) {
+      categorized[all_records[i]->label().GetToolchainLabel()].push_back(
+          all_records[i]->item()->AsTarget());
+      }
+  }
+  if (categorized.empty()) {
     Err(Location(), "No targets.",
         "I could not find any targets to write, so I'm doing nothing.")
         .PrintToStdout();
     return false;
   }
-  for (size_t i = 0; i < all_targets.size(); i++) {
-    categorized[all_targets[i]->label().GetToolchainLabel()].push_back(
-        all_targets[i]);
-  }
 
-  Label default_label =
-      build_settings_->toolchain_manager().GetDefaultToolchainUnlocked();
+  Label default_label = builder_->loader()->GetDefaultToolchain();
 
   // Write out the toolchain buildfiles, and also accumulate the set of
   // all settings and find the list of targets in the default toolchain.
   for (CategorizedMap::const_iterator i = categorized.begin();
        i != categorized.end(); ++i) {
-    const Settings* settings;
-    {
-      base::AutoLock lock(build_settings_->item_tree().lock());
-      Err ignored;
-      settings =
-          build_settings_->toolchain_manager().GetSettingsForToolchainLocked(
-              LocationRange(), i->first, &ignored);
-    }
+    const Settings* settings =
+        builder_->loader()->GetToolchainSettings(i->first);
+    const Toolchain* toolchain = builder_->GetToolchain(i->first);
+
     all_settings->push_back(settings);
-    if (!NinjaToolchainWriter::RunAndWriteFile(settings, i->second,
-                                               skip_files)) {
+    if (!NinjaToolchainWriter::RunAndWriteFile(settings, toolchain,
+                                               i->second)) {
       Err(Location(),
           "Couldn't open toolchain buildfile(s) for writing").PrintToStdout();
       return false;
     }
   }
 
-  *default_targets = categorized[
-      build_settings_->toolchain_manager().GetDefaultToolchainUnlocked()];
+  *default_targets = categorized[default_label];
   return true;
 }