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

Unified Diff: third_party/tcmalloc/vendor/src/gperftools/malloc_extension.h

Issue 9316021: Update the tcmalloc vendor branch to r144 (gperftools 2.0). (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Reuploading 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 side-by-side diff with in-line comments
Download patch
Index: third_party/tcmalloc/vendor/src/gperftools/malloc_extension.h
diff --git a/third_party/tcmalloc/vendor/src/google/malloc_extension.h b/third_party/tcmalloc/vendor/src/gperftools/malloc_extension.h
similarity index 98%
copy from third_party/tcmalloc/vendor/src/google/malloc_extension.h
copy to third_party/tcmalloc/vendor/src/gperftools/malloc_extension.h
index 4b06b2d951a0cc6305a98712b9f05fb51a72279b..5bee01984e1e1dec9ab3a65d75aec19d75a2d50d 100644
--- a/third_party/tcmalloc/vendor/src/google/malloc_extension.h
+++ b/third_party/tcmalloc/vendor/src/gperftools/malloc_extension.h
@@ -100,10 +100,9 @@ class PERFTOOLS_DLL_DECL MallocExtension {
// See "verify_memory.h" to see what these routines do
virtual bool VerifyAllMemory();
- // TODO(csilvers): change these to const void*.
- virtual bool VerifyNewMemory(void* p);
- virtual bool VerifyArrayNewMemory(void* p);
- virtual bool VerifyMallocMemory(void* p);
+ virtual bool VerifyNewMemory(const void* p);
+ virtual bool VerifyArrayNewMemory(const void* p);
+ virtual bool VerifyMallocMemory(const void* p);
virtual bool MallocMemoryStats(int* blocks, size_t* total,
int histogram[kMallocHistogramSize]);
@@ -281,8 +280,7 @@ class PERFTOOLS_DLL_DECL MallocExtension {
// will return 0.)
// This is equivalent to malloc_size() in OS X, malloc_usable_size()
// in glibc, and _msize() for windows.
- // TODO(csilvers): change to const void*.
- virtual size_t GetAllocatedSize(void* p);
+ virtual size_t GetAllocatedSize(const void* p);
// Returns kOwned if this malloc implementation allocated the memory
// pointed to by p, or kNotOwned if some other malloc implementation

Powered by Google App Engine
This is Rietveld 408576698