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

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

Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebasec Created 8 years, 9 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/leak_annotations.h ('k') | chrome/browser/browser_about_handler.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 #include "base/debug/profiler.h" 5 #include "base/debug/profiler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/process_util.h" 9 #include "base/process_util.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
12 12
13 #if defined(OS_WIN) 13 #if defined(OS_WIN)
14 #include "base/win/pe_image.h" 14 #include "base/win/pe_image.h"
15 #endif // defined(OS_WIN) 15 #endif // defined(OS_WIN)
16 16
17 #if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC) 17 #if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC)
18 #include "third_party/tcmalloc/chromium/src/google/profiler.h" 18 #include "third_party/tcmalloc/chromium/src/gperftools/profiler.h"
19 #endif 19 #endif
20 20
21 namespace base { 21 namespace base {
22 namespace debug { 22 namespace debug {
23 23
24 #if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC) 24 #if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC)
25 25
26 static int profile_count = 0; 26 static int profile_count = 0;
27 27
28 void StartProfiling(const std::string& name) { 28 void StartProfiling(const std::string& name) {
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 ReturnAddressLocationResolver resolver_func = NULL; 151 ReturnAddressLocationResolver resolver_func = NULL;
152 image.EnumImportChunks(FindResolutionFunctionInImports, &resolver_func); 152 image.EnumImportChunks(FindResolutionFunctionInImports, &resolver_func);
153 153
154 return resolver_func; 154 return resolver_func;
155 } 155 }
156 156
157 #endif // defined(OS_WIN) 157 #endif // defined(OS_WIN)
158 158
159 } // namespace debug 159 } // namespace debug
160 } // namespace base 160 } // namespace base
OLDNEW
« no previous file with comments | « base/debug/leak_annotations.h ('k') | chrome/browser/browser_about_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698