Merged third_party/tcmalloc/vendor/src(google-perftools r87) into...

third_party/tcmalloc/chromium/src/malloc_extension.cc

 // Copyright (c) 2005, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 125 matching lines @@
 }
 
 void MallocExtension::MarkThreadIdle() {
   // Default implementation does nothing
 }
 
 void MallocExtension::MarkThreadBusy() {
   // Default implementation does nothing
 }
 
+void MallocExtension::ReleaseToSystem(size_t num_bytes) {
+  // Default implementation does nothing
+}
+
 void MallocExtension::ReleaseFreeMemory() {
-  // Default implementation does nothing
+  ReleaseToSystem(static_cast<size_t>(-1));   // SIZE_T_MAX
 }
 
 void MallocExtension::SetMemoryReleaseRate(double rate) {
   // Default implementation does nothing
 }
 
 double MallocExtension::GetMemoryReleaseRate() {
   return -1.0;
 }
 
@@ skipping 135 matching lines @@
   // client wants to focus on the latest stack traces.
   PrintHeader(writer, "growth", entries);
   for (void** entry = entries; Count(entry) != 0; entry += 3 + Depth(entry)) {
     PrintStackEntry(writer, entry);
   }
   delete[] entries;
 
   DumpAddressMap(writer);
 }
 
+void MallocExtension::Ranges(void* arg, RangeFunction func) {
+  // No callbacks by default
+}
+
 // These are C shims that work on the current instance.
 
 #define C_SHIM(fn, retval, paramlist, arglist)          \
   extern "C" PERFTOOLS_DLL_DECL retval MallocExtension_##fn paramlist {    \
     return MallocExtension::instance()->fn arglist;     \
   }
 
 C_SHIM(VerifyAllMemory, int, (void), ());
 C_SHIM(VerifyNewMemory, int, (void* p), (p));
 C_SHIM(VerifyArrayNewMemory, int, (void* p), (p));
 C_SHIM(VerifyMallocMemory, int, (void* p), (p));
 C_SHIM(MallocMemoryStats, int,
        (int* blocks, size_t* total, int histogram[kMallocHistogramSize]),
        (blocks, total, histogram));
 
 C_SHIM(GetStats, void,
        (char* buffer, int buffer_length), (buffer, buffer_length));
 C_SHIM(GetNumericProperty, int,
        (const char* property, size_t* value), (property, value));
 C_SHIM(SetNumericProperty, int,
        (const char* property, size_t value), (property, value));
 
 C_SHIM(MarkThreadIdle, void, (void), ());
 C_SHIM(MarkThreadBusy, void, (void), ());
 C_SHIM(ReleaseFreeMemory, void, (void), ());
+C_SHIM(ReleaseToSystem, void, (size_t num_bytes), (num_bytes));
 C_SHIM(GetEstimatedAllocatedSize, size_t, (size_t size), (size));
 C_SHIM(GetAllocatedSize, size_t, (void* p), (p));