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

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

Issue 15892014: Allow chrome trace to be collected when atrace is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 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
« no previous file with comments | « no previous file | base/debug/trace_event_impl.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 (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 5
6 #ifndef BASE_DEBUG_TRACE_EVENT_IMPL_H_ 6 #ifndef BASE_DEBUG_TRACE_EVENT_IMPL_H_
7 #define BASE_DEBUG_TRACE_EVENT_IMPL_H_ 7 #define BASE_DEBUG_TRACE_EVENT_IMPL_H_
8 8
9 #include <stack> 9 #include <stack>
10 #include <string> 10 #include <string>
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 // by the Singleton class. 456 // by the Singleton class.
457 friend struct StaticMemorySingletonTraits<TraceLog>; 457 friend struct StaticMemorySingletonTraits<TraceLog>;
458 458
459 // Enable/disable each category group based on the current category_filter_. 459 // Enable/disable each category group based on the current category_filter_.
460 // If the category group contains a category that matches an included category 460 // If the category group contains a category that matches an included category
461 // pattern, that category group will be enabled. 461 // pattern, that category group will be enabled.
462 void EnableIncludedCategoryGroups(); 462 void EnableIncludedCategoryGroups();
463 void EnableIncludedCategoryGroup(int category_index); 463 void EnableIncludedCategoryGroup(int category_index);
464 464
465 static void SetCategoryGroupEnabled(int category_index, bool enabled); 465 static void SetCategoryGroupEnabled(int category_index, bool enabled);
466 static bool IsCategoryGroupEnabled(
467 const unsigned char* category_group_enabled);
466 468
467 // The pointer returned from GetCategoryGroupEnabledInternal() points to a 469 // The pointer returned from GetCategoryGroupEnabledInternal() points to a
468 // value with zero or more of the following bits. Used in this class only. 470 // value with zero or more of the following bits. Used in this class only.
469 // The TRACE_EVENT macros should only use the value as a bool. 471 // The TRACE_EVENT macros should only use the value as a bool.
470 enum CategoryEnabledFlags { 472 enum CategoryEnabledFlags {
471 // Normal enabled flag for categories enabled with Enable(). 473 // Normal enabled flag for categories enabled with Enable().
472 CATEGORY_ENABLED = 1 << 0, 474 CATEGORY_ENABLED = 1 << 0,
473 // On Android if ATrace is enabled, all categories will have this bit. 475 // On Android if ATrace is enabled, all categories will have this bit.
474 // Not used on other platforms. 476 // Not used on other platforms.
475 ATRACE_ENABLED = 1 << 1 477 ATRACE_ENABLED = 1 << 1
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 555
554 CategoryFilter category_filter_; 556 CategoryFilter category_filter_;
555 557
556 DISALLOW_COPY_AND_ASSIGN(TraceLog); 558 DISALLOW_COPY_AND_ASSIGN(TraceLog);
557 }; 559 };
558 560
559 } // namespace debug 561 } // namespace debug
560 } // namespace base 562 } // namespace base
561 563
562 #endif // BASE_DEBUG_TRACE_EVENT_IMPL_H_ 564 #endif // BASE_DEBUG_TRACE_EVENT_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | base/debug/trace_event_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698