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

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

Issue 12025014: Android: removes "trace_event_clock_sync" from atrace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove spurious #include Created 7 years, 11 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_impl.h ('k') | no next file » | 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_impl.h" 5 #include "base/debug/trace_event_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/debug/leak_annotations.h" 10 #include "base/debug/leak_annotations.h"
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 OnTraceLogWillDisable()); 565 OnTraceLogWillDisable());
566 dispatching_to_observer_list_ = false; 566 dispatching_to_observer_list_ = false;
567 567
568 included_categories_.clear(); 568 included_categories_.clear();
569 excluded_categories_.clear(); 569 excluded_categories_.clear();
570 watch_category_ = NULL; 570 watch_category_ = NULL;
571 watch_event_name_ = ""; 571 watch_event_name_ = "";
572 for (int i = 0; i < g_category_index; i++) 572 for (int i = 0; i < g_category_index; i++)
573 g_category_enabled[i] = 0; 573 g_category_enabled[i] = 0;
574 AddThreadNameMetadataEvents(); 574 AddThreadNameMetadataEvents();
575 #if defined(OS_ANDROID)
576 AddClockSyncMetadataEvents();
577 #endif
578 } 575 }
579 576
580 void TraceLog::SetEnabled(bool enabled) { 577 void TraceLog::SetEnabled(bool enabled) {
581 if (enabled) 578 if (enabled)
582 SetEnabled(std::vector<std::string>(), std::vector<std::string>()); 579 SetEnabled(std::vector<std::string>(), std::vector<std::string>());
583 else 580 else
584 SetDisabled(); 581 SetDisabled();
585 } 582 }
586 583
587 void TraceLog::AddEnabledStateObserver(EnabledStateChangedObserver* listener) { 584 void TraceLog::AddEnabledStateObserver(EnabledStateChangedObserver* listener) {
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 unsigned long long pid = static_cast<unsigned long long>(process_id_); 791 unsigned long long pid = static_cast<unsigned long long>(process_id_);
795 process_id_hash_ = (offset_basis ^ pid) * fnv_prime; 792 process_id_hash_ = (offset_basis ^ pid) * fnv_prime;
796 } 793 }
797 794
798 void TraceLog::SetTimeOffset(TimeDelta offset) { 795 void TraceLog::SetTimeOffset(TimeDelta offset) {
799 time_offset_ = offset; 796 time_offset_ = offset;
800 } 797 }
801 798
802 } // namespace debug 799 } // namespace debug
803 } // namespace base 800 } // namespace base
OLDNEW
« no previous file with comments | « base/debug/trace_event_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698