GN threading refactor

tools/gn/trace.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/trace.h"
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 #include <vector>
@@ skipping 116 matching lines @@
 
 ScopedTrace::ScopedTrace(TraceItem::Type t, const std::string& name)
     : item_(NULL),
       done_(false) {
   if (trace_log) {
     item_ = new TraceItem(t, name, base::PlatformThread::CurrentId());
     item_->set_begin(base::TimeTicks::HighResNow());
   }
 }
 
+ScopedTrace::ScopedTrace(TraceItem::Type t, const Label& label)
+    : item_(NULL),
+      done_(false) {
+  if (trace_log) {
+    item_ = new TraceItem(t, label.GetUserVisibleName(false),
+                          base::PlatformThread::CurrentId());
+    item_->set_begin(base::TimeTicks::HighResNow());
+  }
+}
+
 ScopedTrace::~ScopedTrace() {
   Done();
 }
 
 void ScopedTrace::SetToolchain(const Label& label) {
   if (item_)
     item_->set_toolchain(label.GetUserVisibleName(false));
 }
 
 void ScopedTrace::SetCommandLine(const CommandLine& cmdline) {
@@ skipping 36 matching lines @@
         parses.push_back(events[i]);
         break;
       case TraceItem::TRACE_FILE_EXECUTE:
         file_execs.push_back(events[i]);
         break;
       case TraceItem::TRACE_SCRIPT_EXECUTE:
         script_execs.push_back(events[i]);
         break;
       case TraceItem::TRACE_FILE_LOAD:
       case TraceItem::TRACE_FILE_WRITE:
+      case TraceItem::TRACE_DEFINE_TARGET:
         break;  // Ignore these for the summary.
     }
   }
 
   std::ostringstream out;
   SummarizeParses(parses, out);
   out << std::endl;
   SummarizeFileExecs(file_execs, out);
   out << std::endl;
   SummarizeScriptExecs(script_execs, out);
   out << std::endl;
 
   return out.str();
 }
 
 void SaveTraces(const base::FilePath& file_name) {
   std::ostringstream out;
 
   out << "{\"traceEvents\":[";
 
   std::string quote_buffer;  // Allocate outside loop to prevent reallocationg.
 
+  // Write main thread metadata (assume this is being written on the main
+  // thread).
+  out << "{\"pid\":0,\"tid\":" << base::PlatformThread::CurrentId();
+  out << ",\"ts\":0,\"ph\":\"M\",";
+  out << "\"name\":\"thread_name\",\"args\":{\"name\":\"Main thread\"}},";
+
   std::vector<TraceItem*> events = trace_log->events();
   for (size_t i = 0; i < events.size(); i++) {
     const TraceItem& item = *events[i];
 
     if (i != 0)
       out << ",";
     out << "{\"pid\":0,\"tid\":" << item.thread_id();
     out << ",\"ts\":" << item.begin().ToInternalValue();
     out << ",\"ph\":\"X\"";  // "X" = complete event with begin & duration.
     out << ",\"dur\":" << item.delta().InMicroseconds();
@@ skipping 12 matching lines @@
         break;
       case TraceItem::TRACE_FILE_EXECUTE:
         out << "\"file_exec\"";
         break;
       case TraceItem::TRACE_FILE_WRITE:
         out << "\"file_write\"";
         break;
       case TraceItem::TRACE_SCRIPT_EXECUTE:
         out << "\"script_exec\"";
         break;
+      case TraceItem::TRACE_DEFINE_TARGET:
+        out << "\"define\"";
     }
 
     if (!item.toolchain().empty() || !item.cmdline().empty()) {
       out << ",\"args\":{";
       bool needs_comma = false;
       if (!item.toolchain().empty()) {
         quote_buffer.resize(0);
         base::JsonDoubleQuote(item.toolchain(), true, &quote_buffer);
         out << "\"toolchain\":" << quote_buffer;
         needs_comma = true;
@@ skipping 10 matching lines @@
     }
     out << "}";
   }
 
   out << "]}";
 
   std::string out_str = out.str();
   file_util::WriteFile(file_name, out_str.data(),
                        static_cast<int>(out_str.size()));
 }