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

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

Issue 1425933002: [iOS] Disable COUNT_RESIDENT_BYTES_SUPPORTED. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | 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 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_PROCESS_MEMORY_DUMP_H_ 5 #ifndef BASE_TRACE_EVENT_PROCESS_MEMORY_DUMP_H_
6 #define BASE_TRACE_EVENT_PROCESS_MEMORY_DUMP_H_ 6 #define BASE_TRACE_EVENT_PROCESS_MEMORY_DUMP_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base_export.h" 10 #include "base/base_export.h"
11 #include "base/containers/hash_tables.h" 11 #include "base/containers/hash_tables.h"
12 #include "base/containers/small_map.h" 12 #include "base/containers/small_map.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_vector.h" 14 #include "base/memory/scoped_vector.h"
15 #include "base/trace_event/memory_allocator_dump.h" 15 #include "base/trace_event/memory_allocator_dump.h"
16 #include "base/trace_event/memory_allocator_dump_guid.h" 16 #include "base/trace_event/memory_allocator_dump_guid.h"
17 #include "base/trace_event/memory_dump_session_state.h" 17 #include "base/trace_event/memory_dump_session_state.h"
18 #include "base/trace_event/process_memory_maps.h" 18 #include "base/trace_event/process_memory_maps.h"
19 #include "base/trace_event/process_memory_totals.h" 19 #include "base/trace_event/process_memory_totals.h"
20 20
21 // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the 21 // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the
22 // resident memory. 22 // resident memory.
23 #if defined(OS_POSIX) && !defined(OS_NACL) 23 // TODO(crbug.com/542671): COUNT_RESIDENT_BYTES_SUPPORTED is disabled on iOS
24 // as it cause memory corruption on iOS 9.0+ devices.
25 #if defined(OS_POSIX) && !defined(OS_NACL) && !defined(OS_IOS)
24 #define COUNT_RESIDENT_BYTES_SUPPORTED 26 #define COUNT_RESIDENT_BYTES_SUPPORTED
25 #endif 27 #endif
26 28
27 namespace base { 29 namespace base {
28 namespace trace_event { 30 namespace trace_event {
29 31
30 class ConvertableToTraceFormat; 32 class ConvertableToTraceFormat;
31 class MemoryDumpManager; 33 class MemoryDumpManager;
32 class MemoryDumpSessionState; 34 class MemoryDumpSessionState;
33 class TracedValue; 35 class TracedValue;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 // Keeps track of relationships between MemoryAllocatorDump(s). 178 // Keeps track of relationships between MemoryAllocatorDump(s).
177 std::vector<MemoryAllocatorDumpEdge> allocator_dumps_edges_; 179 std::vector<MemoryAllocatorDumpEdge> allocator_dumps_edges_;
178 180
179 DISALLOW_COPY_AND_ASSIGN(ProcessMemoryDump); 181 DISALLOW_COPY_AND_ASSIGN(ProcessMemoryDump);
180 }; 182 };
181 183
182 } // namespace trace_event 184 } // namespace trace_event
183 } // namespace base 185 } // namespace base
184 186
185 #endif // BASE_TRACE_EVENT_PROCESS_MEMORY_DUMP_H_ 187 #endif // BASE_TRACE_EVENT_PROCESS_MEMORY_DUMP_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698