Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: content/browser/devtools/devtools_tracing_handler.cc

Issue 12302036: Add a mode flag to the tracing framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/devtools/devtools_tracing_handler.h" 5 #include "content/browser/devtools/devtools_tracing_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/string_split.h"
11 #include "base/values.h" 12 #include "base/values.h"
12 #include "content/browser/devtools/devtools_http_handler_impl.h" 13 #include "content/browser/devtools/devtools_http_handler_impl.h"
13 #include "content/public/browser/trace_controller.h" 14 #include "content/public/browser/trace_controller.h"
14 #include "content/public/browser/trace_subscriber.h" 15 #include "content/public/browser/trace_subscriber.h"
15 16
16 namespace content { 17 namespace content {
17 18
18 namespace { 19 namespace {
19 20
20 const char kTracingStartCommand[] = "Tracing.start"; 21 const char kTracingStartCommand[] = "Tracing.start";
21 const char kTracingEndCommand[] = "Tracing.end"; 22 const char kTracingEndCommand[] = "Tracing.end";
22 23
23 const char kTracingCompleteNotification[] = "Tracing.tracingComplete"; 24 const char kTracingCompleteNotification[] = "Tracing.tracingComplete";
24 const char kTracingDataCollected[] = "Tracing.dataCollected"; 25 const char kTracingDataCollected[] = "Tracing.dataCollected";
25 26
26 const char kCategoriesParam[] = "categories"; 27 const char kCategoriesParam[] = "categories";
27 28
29 const char kTraceOptionsParam[] = "trace-options";
30 const char kRecordUntilFull[] = "record-until-full";
31
28 } // namespace 32 } // namespace
29 33
30 const char DevToolsTracingHandler::kDomain[] = "Tracing"; 34 const char DevToolsTracingHandler::kDomain[] = "Tracing";
31 35
32 DevToolsTracingHandler::DevToolsTracingHandler() 36 DevToolsTracingHandler::DevToolsTracingHandler()
33 : is_running_(false) { 37 : is_running_(false) {
34 RegisterCommandHandler(kTracingStartCommand, 38 RegisterCommandHandler(kTracingStartCommand,
35 base::Bind(&DevToolsTracingHandler::OnStart, 39 base::Bind(&DevToolsTracingHandler::OnStart,
36 base::Unretained(this))); 40 base::Unretained(this)));
37 RegisterCommandHandler(kTracingEndCommand, 41 RegisterCommandHandler(kTracingEndCommand,
(...skipping 11 matching lines...) Expand all
49 53
50 void DevToolsTracingHandler::OnTraceDataCollected( 54 void DevToolsTracingHandler::OnTraceDataCollected(
51 const scoped_refptr<base::RefCountedString>& trace_fragment) { 55 const scoped_refptr<base::RefCountedString>& trace_fragment) {
52 if (is_running_) { 56 if (is_running_) {
53 base::DictionaryValue* params = new base::DictionaryValue(); 57 base::DictionaryValue* params = new base::DictionaryValue();
54 params->SetString("value", trace_fragment->data()); 58 params->SetString("value", trace_fragment->data());
55 SendNotification(kTracingDataCollected, params); 59 SendNotification(kTracingDataCollected, params);
56 } 60 }
57 } 61 }
58 62
63 // Note, if you add more options here you also need to update:
64 // base/debug/trace_event_impl:TraceOptionsFromString
65 base::debug::TraceLog::Options DevToolsTracingHandler::TraceOptionsFromString(
66 const std::string& options) {
67 std::vector<std::string> split;
68 std::vector<std::string>::iterator iter;
69 int ret = 0;
70
71 base::SplitString(options, ',', &split);
72 for (iter = split.begin(); iter != split.end(); ++iter) {
73 if (*iter == kRecordUntilFull) {
74 ret |= base::debug::TraceLog::RECORD_UNTIL_FULL;
75 }
76 }
77 if (ret == 0)
78 ret = base::debug::TraceLog::RECORD_UNTIL_FULL;
79
80 return static_cast<base::debug::TraceLog::Options>(ret);
81 }
82
59 scoped_ptr<DevToolsProtocol::Response> 83 scoped_ptr<DevToolsProtocol::Response>
60 DevToolsTracingHandler::OnStart(DevToolsProtocol::Command* command) { 84 DevToolsTracingHandler::OnStart(DevToolsProtocol::Command* command) {
61 std::string categories; 85 std::string categories;
62 base::DictionaryValue* params = command->params(); 86 base::DictionaryValue* params = command->params();
63 if (params && params->HasKey(kCategoriesParam)) 87 if (params && params->HasKey(kCategoriesParam))
64 params->GetString(kCategoriesParam, &categories); 88 params->GetString(kCategoriesParam, &categories);
65 TraceController::GetInstance()->BeginTracing(this, categories); 89
90 base::debug::TraceLog::Options options =
91 base::debug::TraceLog::RECORD_UNTIL_FULL;
92 if (params && params->HasKey(kTraceOptionsParam)) {
93 std::string options_param;
94 params->GetString(kTraceOptionsParam, &options_param);
95 options = TraceOptionsFromString(options_param);
96 }
97
98 TraceController::GetInstance()->BeginTracing(this, categories, options);
66 is_running_ = true; 99 is_running_ = true;
67 return command->SuccessResponse(NULL); 100 return command->SuccessResponse(NULL);
68 } 101 }
69 102
70 103
71 scoped_ptr<DevToolsProtocol::Response> 104 scoped_ptr<DevToolsProtocol::Response>
72 DevToolsTracingHandler::OnEnd(DevToolsProtocol::Command* command) { 105 DevToolsTracingHandler::OnEnd(DevToolsProtocol::Command* command) {
73 TraceController::GetInstance()->EndTracingAsync(this); 106 TraceController::GetInstance()->EndTracingAsync(this);
74 return command->SuccessResponse(NULL); 107 return command->SuccessResponse(NULL);
75 } 108 }
76 109
77 } // namespace content 110 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/devtools/devtools_tracing_handler.h ('k') | content/browser/tracing/trace_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698