Update tracing framework to optionally use a ringbuffer.

content/browser/devtools/devtools_tracing_handler.cc

 // Copyright (c) 2012 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 "content/browser/devtools/devtools_tracing_handler.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
@@ skipping 10 matching lines @@
 const char kTracingStartCommand[] = "Tracing.start";
 const char kTracingEndCommand[] = "Tracing.end";
 
 const char kTracingCompleteNotification[] = "Tracing.tracingComplete";
 const char kTracingDataCollected[] = "Tracing.dataCollected";
 
 const char kCategoriesParam[] = "categories";
 
 const char kTraceOptionsParam[] = "trace-options";
 const char kRecordUntilFull[]   = "record-until-full";
+const char kRecordContinuously[] = "record-continuously";
 
 }  // namespace
 
 const char DevToolsTracingHandler::kDomain[] = "Tracing";
 
 DevToolsTracingHandler::DevToolsTracingHandler()
     : is_running_(false) {
   RegisterCommandHandler(kTracingStartCommand,
                          base::Bind(&DevToolsTracingHandler::OnStart,
                                     base::Unretained(this)));
@@ skipping 24 matching lines @@
 base::debug::TraceLog::Options DevToolsTracingHandler::TraceOptionsFromString(
     const std::string& options) {
   std::vector<std::string> split;
   std::vector<std::string>::iterator iter;
   int ret = 0;
 
   base::SplitString(options, ',', &split);
   for (iter = split.begin(); iter != split.end(); ++iter) {
     if (*iter == kRecordUntilFull) {
       ret |= base::debug::TraceLog::RECORD_UNTIL_FULL;
+    } else if (*iter == kRecordContinuously) {
+      ret |= base::debug::TraceLog::RECORD_CONTINUOUSLY;
     }
   }
-  if (ret == 0)
-    ret = base::debug::TraceLog::RECORD_UNTIL_FULL;
+  if (!(ret & base::debug::TraceLog::RECORD_UNTIL_FULL) &&
+      !(ret & base::debug::TraceLog::RECORD_CONTINUOUSLY))
+    ret |= base::debug::TraceLog::RECORD_UNTIL_FULL;
 
   return static_cast<base::debug::TraceLog::Options>(ret);
 }
 
 scoped_ptr<DevToolsProtocol::Response>
 DevToolsTracingHandler::OnStart(DevToolsProtocol::Command* command) {
   std::string categories;
   base::DictionaryValue* params = command->params();
   if (params && params->HasKey(kCategoriesParam))
     params->GetString(kCategoriesParam, &categories);
@@ skipping 12 matching lines @@
 }
 
 
 scoped_ptr<DevToolsProtocol::Response>
 DevToolsTracingHandler::OnEnd(DevToolsProtocol::Command* command) {
   TraceController::GetInstance()->EndTracingAsync(this);
   return command->SuccessResponse(NULL);
 }
 
 }  // namespace content