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

Side by Side Diff: base/debug/trace_event_memory_unittest.cc

Issue 148173011: Make flow event traces disabled-by-default, and rename "ipc" and "task" categories to "toplevel" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Replace "ipc" and "task" categories with toplevel. Created 6 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
« no previous file with comments | « base/debug/trace_event_memory.cc ('k') | base/message_loop/incoming_task_queue.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/debug/trace_event_memory.h" 5 #include "base/debug/trace_event_memory.h"
6 6
7 #include <sstream> 7 #include <sstream>
8 #include <string> 8 #include <string>
9 9
10 #include "base/debug/trace_event_impl.h" 10 #include "base/debug/trace_event_impl.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 "{" 157 "{"
158 "\"current_allocs\": 68, " 158 "\"current_allocs\": 68, "
159 "\"current_bytes\": 4195, " 159 "\"current_bytes\": 4195, "
160 "\"trace\": \"name \"" 160 "\"trace\": \"name \""
161 "}"; 161 "}";
162 std::string output; 162 std::string output;
163 EXPECT_TRUE( 163 EXPECT_TRUE(
164 AppendHeapProfileLineAsTraceFormat(input.str().c_str(), &output)); 164 AppendHeapProfileLineAsTraceFormat(input.str().c_str(), &output));
165 EXPECT_EQ(kExpectedOutput, output); 165 EXPECT_EQ(kExpectedOutput, output);
166 166
167 // Input with with the category "task". 167 // Input with with the category "toplevel".
168 // TODO(jamescook): Eliminate this special case and move the logic to the 168 // TODO(jamescook): Eliminate this special case and move the logic to the
169 // trace viewer code. 169 // trace viewer code.
170 const char kTaskCategory[] = "task"; 170 const char kTaskCategory[] = "toplevel";
171 const char kTaskName[] = "TaskName"; 171 const char kTaskName[] = "TaskName";
172 std::ostringstream input2; 172 std::ostringstream input2;
173 input2 << " 68: 4195 [ 1087: 98009] @ " << &kTaskCategory << " " 173 input2 << " 68: 4195 [ 1087: 98009] @ " << &kTaskCategory << " "
174 << &kTaskName; 174 << &kTaskName;
175 const std::string kExpectedOutput2 = 175 const std::string kExpectedOutput2 =
176 ",\n" 176 ",\n"
177 "{" 177 "{"
178 "\"current_allocs\": 68, " 178 "\"current_allocs\": 68, "
179 "\"current_bytes\": 4195, " 179 "\"current_bytes\": 4195, "
180 "\"trace\": \"TaskName->PostTask \"" 180 "\"trace\": \"TaskName->PostTask \""
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 EXPECT_STREQ("null", StringFromHexAddress("0x0")); 231 EXPECT_STREQ("null", StringFromHexAddress("0x0"));
232 EXPECT_STREQ("error", StringFromHexAddress("not an address")); 232 EXPECT_STREQ("error", StringFromHexAddress("not an address"));
233 const char kHello[] = "hello"; 233 const char kHello[] = "hello";
234 std::ostringstream hex_address; 234 std::ostringstream hex_address;
235 hex_address << &kHello; 235 hex_address << &kHello;
236 EXPECT_STREQ(kHello, StringFromHexAddress(hex_address.str())); 236 EXPECT_STREQ(kHello, StringFromHexAddress(hex_address.str()));
237 } 237 }
238 238
239 } // namespace debug 239 } // namespace debug
240 } // namespace base 240 } // namespace base
OLDNEW
« no previous file with comments | « base/debug/trace_event_memory.cc ('k') | base/message_loop/incoming_task_queue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698