GN threading refactor

tools/gn/function_toolchain.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/err.h"
 #include "tools/gn/functions.h"
 #include "tools/gn/parse_tree.h"
 #include "tools/gn/scheduler.h"
 #include "tools/gn/scope.h"
 #include "tools/gn/settings.h"
@@ skipping 80 matching lines @@
   if (!EnsureNotProcessingImport(function, scope, err) ||
       !EnsureNotProcessingBuildConfig(function, scope, err))
     return Value();
 
   // Note that we don't want to use MakeLabelForScope since that will include
   // the toolchain name in the label, and toolchain labels don't themselves
   // have toolchain names.
   const SourceDir& input_dir = scope->GetSourceDir();
   Label label(input_dir, args[0].string_value());
   if (g_scheduler->verbose_logging())
-    g_scheduler->Log("Generating toolchain", label.GetUserVisibleName(false));
+    g_scheduler->Log("Definining toolchain", label.GetUserVisibleName(false));
 
   // This object will actually be copied into the one owned by the toolchain
   // manager, but that has to be done in the lock.
-  Toolchain toolchain(scope->settings(), label);
+  scoped_ptr<Toolchain> toolchain(new Toolchain(scope->settings(), label));
+  toolchain->set_defined_from(function);
 
   Scope block_scope(scope);
-  block_scope.SetProperty(&kToolchainPropertyKey, &toolchain);
+  block_scope.SetProperty(&kToolchainPropertyKey, toolchain.get());
   block->ExecuteBlockInScope(&block_scope, err);
   block_scope.SetProperty(&kToolchainPropertyKey, NULL);
   if (err->has_error())
     return Value();
   if (!block_scope.CheckForUnusedVars(err))
     return Value();
 
-  const BuildSettings* build_settings = scope->settings()->build_settings();
-  {
-    // Save the toolchain definition in the toolchain manager and mark the
-    // corresponding item in the dependency tree resolved so that targets
-    // that depend on this toolchain know it's ready.
-    base::AutoLock lock(build_settings->item_tree().lock());
-    build_settings->toolchain_manager().SetToolchainDefinitionLocked(
-        toolchain, function->GetRange(), err);
-    build_settings->item_tree().MarkItemDefinedLocked(build_settings, label,
-                                                      err);
-  }
+  scope->settings()->build_settings()->ItemDefined(toolchain.PassAs<Item>());
   return Value();
 }
 
 // tool ------------------------------------------------------------------------
 
 const char kTool[] = "tool";
 const char kTool_Help[] =
     "tool: Specify arguments to a toolchain tool.\n"
     "\n"
     "  tool(<command type>) { <command flags> }\n"
@@ skipping 160 matching lines @@
     return Value();
 
   Scope::KeyValueMap values;
   block_scope.GetCurrentScopeValues(&values);
   toolchain->args() = values;
 
   return Value();
 }
 
 }  // namespace functions