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

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

Issue 10035042: Rewrite base::JSONReader to be 35-40% faster, depending on the input string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really fix Windows, address comments Created 8 years, 7 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/base_export.h ('k') | base/json/json_parser.h » ('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 (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 "base/debug/trace_event.h" 5 #include "base/debug/trace_event.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 void TraceEventTestFixture::OnTraceDataCollected( 93 void TraceEventTestFixture::OnTraceDataCollected(
94 const scoped_refptr<base::RefCountedString>& events_str) { 94 const scoped_refptr<base::RefCountedString>& events_str) {
95 AutoLock lock(lock_); 95 AutoLock lock(lock_);
96 json_output_.json_output.clear(); 96 json_output_.json_output.clear();
97 trace_buffer_.Start(); 97 trace_buffer_.Start();
98 trace_buffer_.AddFragment(events_str->data()); 98 trace_buffer_.AddFragment(events_str->data());
99 trace_buffer_.Finish(); 99 trace_buffer_.Finish();
100 100
101 scoped_ptr<Value> root; 101 scoped_ptr<Value> root;
102 root.reset(base::JSONReader::Read(json_output_.json_output)); 102 root.reset(base::JSONReader::Read(json_output_.json_output,
103 JSON_PARSE_RFC | JSON_DETACHABLE_CHILDREN));
103 104
104 if (!root.get()) { 105 if (!root.get()) {
105 LOG(ERROR) << json_output_.json_output; 106 LOG(ERROR) << json_output_.json_output;
106 } 107 }
107 108
108 ListValue* root_list = NULL; 109 ListValue* root_list = NULL;
109 ASSERT_TRUE(root.get()); 110 ASSERT_TRUE(root.get());
110 ASSERT_TRUE(root->GetAsList(&root_list)); 111 ASSERT_TRUE(root->GetAsList(&root_list));
111 112
112 // Move items into our aggregate collection 113 // Move items into our aggregate collection
(...skipping 1252 matching lines...) Expand 10 before | Expand all | Expand 10 after
1365 Clear(); 1366 Clear();
1366 1367
1367 trace_buffer_.Start(); 1368 trace_buffer_.Start();
1368 trace_buffer_.AddFragment("bla1,bla2,bla3,bla4"); 1369 trace_buffer_.AddFragment("bla1,bla2,bla3,bla4");
1369 trace_buffer_.Finish(); 1370 trace_buffer_.Finish();
1370 EXPECT_STREQ(json_output_.json_output.c_str(), "[bla1,bla2,bla3,bla4]"); 1371 EXPECT_STREQ(json_output_.json_output.c_str(), "[bla1,bla2,bla3,bla4]");
1371 } 1372 }
1372 1373
1373 } // namespace debug 1374 } // namespace debug
1374 } // namespace base 1375 } // namespace base
OLDNEW
« no previous file with comments | « base/base_export.h ('k') | base/json/json_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698