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

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: Rebased. 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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(ENABLE_PROFILING) && !defined(NO_TCMALLOC) 13 #if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC)
14 #include "third_party/tcmalloc/chromium/src/google/profiler.h" 14 #include "third_party/tcmalloc/chromium/src/gperftools/profiler.h"
15 #endif 15 #endif
16 16
17 namespace base { 17 namespace base {
18 namespace debug { 18 namespace debug {
19 19
20 #if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC) 20 #if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC)
21 21
22 static int profile_count = 0; 22 static int profile_count = 0;
23 23
24 void StartProfiling(const std::string& name) { 24 void StartProfiling(const std::string& name) {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 return false; 63 return false;
64 } 64 }
65 65
66 void RestartProfilingAfterFork() { 66 void RestartProfilingAfterFork() {
67 } 67 }
68 68
69 #endif 69 #endif
70 70
71 } // namespace debug 71 } // namespace debug
72 } // namespace base 72 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698