Index: third_party/tcmalloc/chromium/src/thread_cache.h |
diff --git a/third_party/tcmalloc/chromium/src/thread_cache.h b/third_party/tcmalloc/chromium/src/thread_cache.h |
index d631f45284f9e817d883dcf7df450b7b7c49fe8d..529402908450e9efb3f06708cdbd6dbecc7c7236 100644 |
--- a/third_party/tcmalloc/chromium/src/thread_cache.h |
+++ b/third_party/tcmalloc/chromium/src/thread_cache.h |
@@ -88,7 +88,6 @@ class ThreadCache { |
void Deallocate(void* ptr, size_t size_class); |
void Scavenge(); |
- void Print(TCMalloc_Printer* out) const; |
int GetSamplePeriod(); |
@@ -125,10 +124,6 @@ class ThreadCache { |
// REQUIRES: Static::pageheap_lock is held. |
static void GetThreadStats(uint64_t* total_bytes, uint64_t* class_count); |
- // Write debugging statistics to 'out'. |
- // REQUIRES: Static::pageheap_lock is held. |
- static void PrintThreads(TCMalloc_Printer* out); |
- |
// Sets the total thread cache size to new_size, recomputing the |
// individual thread cache sizes as necessary. |
// REQUIRES: Static::pageheap lock is held. |
@@ -214,6 +209,11 @@ class ThreadCache { |
return FL_Pop(&list_); |
} |
+ void* Next() { |
+ if (list_ == NULL) return NULL; |
+ return FL_Next(list_); |
+ } |
+ |
void PushRange(int N, void *start, void *end) { |
FL_PushRange(&list_, start, end); |
length_ += N; |
@@ -366,6 +366,12 @@ inline void ThreadCache::Deallocate(void* ptr, size_t cl) { |
FreeList* list = &list_[cl]; |
size_ += Static::sizemap()->ByteSizeForClass(cl); |
ssize_t size_headroom = max_size_ - size_ - 1; |
+ |
+ // This catches back-to-back frees of allocs in the same size |
+ // class. A more comprehensive (and expensive) test would be to walk |
+ // the entire freelist. But this might be enough to find some bugs. |
+ ASSERT(ptr != list->Next()); |
+ |
list->Push(ptr); |
ssize_t list_headroom = |
static_cast<ssize_t>(list->max_length()) - list->length(); |