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

Side by Side Diff: base/trace_event/trace_log.h

Issue 1465433002: Remove ScopedVector from trace_log (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add const Created 5 years 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
« no previous file with comments | « no previous file | base/trace_event/trace_log.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef BASE_TRACE_EVENT_TRACE_LOG_H_ 5 #ifndef BASE_TRACE_EVENT_TRACE_LOG_H_
6 #define BASE_TRACE_EVENT_TRACE_LOG_H_ 6 #define BASE_TRACE_EVENT_TRACE_LOG_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 425
426 // This lock protects TraceLog member accesses (except for members protected 426 // This lock protects TraceLog member accesses (except for members protected
427 // by thread_info_lock_) from arbitrary threads. 427 // by thread_info_lock_) from arbitrary threads.
428 mutable Lock lock_; 428 mutable Lock lock_;
429 // This lock protects accesses to thread_names_, thread_event_start_times_ 429 // This lock protects accesses to thread_names_, thread_event_start_times_
430 // and thread_colors_. 430 // and thread_colors_.
431 Lock thread_info_lock_; 431 Lock thread_info_lock_;
432 Mode mode_; 432 Mode mode_;
433 int num_traces_recorded_; 433 int num_traces_recorded_;
434 scoped_ptr<TraceBuffer> logged_events_; 434 scoped_ptr<TraceBuffer> logged_events_;
435 ScopedVector<TraceEvent> metadata_events_; 435 std::vector<scoped_ptr<TraceEvent>> metadata_events_;
436 subtle::AtomicWord /* EventCallback */ event_callback_; 436 subtle::AtomicWord /* EventCallback */ event_callback_;
437 bool dispatching_to_observer_list_; 437 bool dispatching_to_observer_list_;
438 std::vector<EnabledStateObserver*> enabled_state_observer_list_; 438 std::vector<EnabledStateObserver*> enabled_state_observer_list_;
439 439
440 std::string process_name_; 440 std::string process_name_;
441 base::hash_map<int, std::string> process_labels_; 441 base::hash_map<int, std::string> process_labels_;
442 int process_sort_index_; 442 int process_sort_index_;
443 base::hash_map<int, int> thread_sort_indices_; 443 base::hash_map<int, int> thread_sort_indices_;
444 base::hash_map<int, std::string> thread_names_; 444 base::hash_map<int, std::string> thread_names_;
445 445
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 subtle::AtomicWord generation_; 491 subtle::AtomicWord generation_;
492 bool use_worker_thread_; 492 bool use_worker_thread_;
493 493
494 DISALLOW_COPY_AND_ASSIGN(TraceLog); 494 DISALLOW_COPY_AND_ASSIGN(TraceLog);
495 }; 495 };
496 496
497 } // namespace trace_event 497 } // namespace trace_event
498 } // namespace base 498 } // namespace base
499 499
500 #endif // BASE_TRACE_EVENT_TRACE_LOG_H_ 500 #endif // BASE_TRACE_EVENT_TRACE_LOG_H_
OLDNEW
« no previous file with comments | « no previous file | base/trace_event/trace_log.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698