base/trace_event/trace_event_memory.h - Issue 837303004: Move base/debug/trace_event* to base/trace_event/ [part 1]

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 837303004: Move base/debug/trace_event* to base/trace_event/ [part 1] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing comments Created 5 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

« base/trace_event/trace_event_impl_constants.cc ('K') | « base/trace_event/trace_event_impl_constants.cc ('k') | base/trace_event/trace_event_memory.cc » ('j') | base/trace_event/trace_event_memory.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #ifndef BASE_DEBUG_TRACE_EVENT_MEMORY_H_	5 #ifndef BASE_TRACING_TRACE_EVENT_MEMORY_H_

6 #define BASE_DEBUG_TRACE_EVENT_MEMORY_H_	6 #define BASE_TRACING_TRACE_EVENT_MEMORY_H_

7	7

8 #include "base/base_export.h"	8 #include "base/base_export.h"

9 #include "base/debug/trace_event_impl.h"	9 #include "base/debug/trace_event_impl.h"

10 #include "base/gtest_prod_util.h"	10 #include "base/gtest_prod_util.h"

11 #include "base/memory/ref_counted.h"	11 #include "base/memory/ref_counted.h"

12 #include "base/memory/weak_ptr.h"	12 #include "base/memory/weak_ptr.h"

13 #include "base/timer/timer.h"	13 #include "base/timer/timer.h"

14	14

15 // TODO(jamescook): Windows support for memory tracing.	15 // TODO(jamescook): Windows support for memory tracing.

16 #if !defined(NO_TCMALLOC) && !defined(OS_NACL) && \	16 #if !defined(NO_TCMALLOC) && !defined(OS_NACL) && \

(...skipping 145 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
162 base::debug::ScopedTraceMemory INTERNAL_TRACE_MEMORY_ID(category, name);	162 base::debug::ScopedTraceMemory INTERNAL_TRACE_MEMORY_ID(category, name);

163 #else	163 #else

164 #define INTERNAL_TRACE_MEMORY(category, name)	164 #define INTERNAL_TRACE_MEMORY(category, name)

165 #endif // defined(TRACE_MEMORY_SUPPORTED)	165 #endif // defined(TRACE_MEMORY_SUPPORTED)

166	166

167 // A special trace name that allows us to ignore memory allocations inside	167 // A special trace name that allows us to ignore memory allocations inside

168 // the memory dump system itself. The allocations are recorded, but the	168 // the memory dump system itself. The allocations are recorded, but the

169 // visualizer skips them. Must match the value in heap.js.	169 // visualizer skips them. Must match the value in heap.js.

170 #define TRACE_MEMORY_IGNORE "trace-memory-ignore"	170 #define TRACE_MEMORY_IGNORE "trace-memory-ignore"

171	171

172 #endif // BASE_DEBUG_TRACE_EVENT_MEMORY_H_	172 #endif // BASE_TRACING_TRACE_EVENT_MEMORY_H_

OLD	NEW