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

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

Issue 1332943002: [tracing] Smaps provider uses fscanf instead of istream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
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_MAPS_DUMP_PROVIDER_H_ 5 #ifndef BASE_TRACE_EVENT_PROCESS_MEMORY_MAPS_DUMP_PROVIDER_H_
6 #define BASE_TRACE_EVENT_PROCESS_MEMORY_MAPS_DUMP_PROVIDER_H_ 6 #define BASE_TRACE_EVENT_PROCESS_MEMORY_MAPS_DUMP_PROVIDER_H_
7 7
8 #include <istream> 8 #include "base/files/scoped_file.h"
9
10 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
11 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
12 #include "base/trace_event/memory_dump_provider.h" 11 #include "base/trace_event/memory_dump_provider.h"
13 12
14 namespace base { 13 namespace base {
15 namespace trace_event { 14 namespace trace_event {
16 15
17 // Dump provider which collects process-wide memory stats. 16 // Dump provider which collects process-wide memory stats.
18 class BASE_EXPORT ProcessMemoryMapsDumpProvider : public MemoryDumpProvider { 17 class BASE_EXPORT ProcessMemoryMapsDumpProvider : public MemoryDumpProvider {
19 public: 18 public:
20 static ProcessMemoryMapsDumpProvider* GetInstance(); 19 static ProcessMemoryMapsDumpProvider* GetInstance();
21 20
22 // MemoryDumpProvider implementation. 21 // MemoryDumpProvider implementation.
23 bool OnMemoryDump(const MemoryDumpArgs& args, 22 bool OnMemoryDump(const MemoryDumpArgs& args,
24 ProcessMemoryDump* pmd) override; 23 ProcessMemoryDump* pmd) override;
25 24
26 private: 25 private:
27 friend struct DefaultSingletonTraits<ProcessMemoryMapsDumpProvider>; 26 friend struct DefaultSingletonTraits<ProcessMemoryMapsDumpProvider>;
28 FRIEND_TEST_ALL_PREFIXES(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps); 27 FRIEND_TEST_ALL_PREFIXES(ProcessMemoryMapsDumpProviderTest, ParseProcSmaps);
29 28
30 #if defined(OS_LINUX) || defined(OS_ANDROID) 29 #if defined(OS_LINUX) || defined(OS_ANDROID)
31 static std::istream* proc_smaps_for_testing; 30 static ScopedFD* proc_smaps_for_testing;
Primiano Tucci (use gerrit) 2015/09/10 16:52:36 I think you don't want the * here (just scopedfd)
ssid 2015/09/21 11:25:43 Hm it is static variable and scoped. It needs exit
32 #endif 31 #endif
33 32
34 ProcessMemoryMapsDumpProvider(); 33 ProcessMemoryMapsDumpProvider();
35 ~ProcessMemoryMapsDumpProvider() override; 34 ~ProcessMemoryMapsDumpProvider() override;
36 35
37 DISALLOW_COPY_AND_ASSIGN(ProcessMemoryMapsDumpProvider); 36 DISALLOW_COPY_AND_ASSIGN(ProcessMemoryMapsDumpProvider);
38 }; 37 };
39 38
40 } // namespace trace_event 39 } // namespace trace_event
41 } // namespace base 40 } // namespace base
42 41
43 #endif // BASE_TRACE_EVENT_PROCESS_MEMORY_MAPS_DUMP_PROVIDER_H_ 42 #endif // BASE_TRACE_EVENT_PROCESS_MEMORY_MAPS_DUMP_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698