Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes.

third_party/tcmalloc/chromium/src/common.h

Index: third_party/tcmalloc/chromium/src/common.h
diff --git a/third_party/tcmalloc/chromium/src/common.h b/third_party/tcmalloc/chromium/src/common.h
index 78cdc036ceb27bf3538d6c3411810f9a27757ce9..d46270e366a6a0ba1a75cf2d91be4f64ac4ddb25 100644
--- a/third_party/tcmalloc/chromium/src/common.h
+++ b/third_party/tcmalloc/chromium/src/common.h
@@ -31,6 +31,7 @@
 // Author: Sanjay Ghemawat <opensource@google.com>
 //
 // Common definitions for tcmalloc code.
+
 #ifndef TCMALLOC_COMMON_H_
 #define TCMALLOC_COMMON_H_
 
@@ -75,16 +76,15 @@ static const size_t kSkippedClasses = (kAlignment < kMinClassSize ? 1 : 0);
 
 #if defined(TCMALLOC_LARGE_PAGES)
 static const size_t kPageShift  = 15;
-static const size_t kNumClasses = 95 - kSkippedClasses;
-static const size_t kMaxThreadCacheSize = 4 << 20;
+static const size_t kNumClasses = 78 - kSkippedClasses;
 #else
-static const size_t kPageShift  = 12;
-static const size_t kNumClasses = 61 - kSkippedClasses;
-static const size_t kMaxThreadCacheSize = 2 << 20;
+static const size_t kPageShift  = 13;
+static const size_t kNumClasses = 86 - kSkippedClasses;
 #endif

[Dai Mikurube (NOT FULLTIME), 2012/02/14 11:32:09]

From
http://codereview.chromium.org/7430007/diff/18014/third_party/tcmalloc/chromi...
and
http://codereview.chromium.org/7430007/diff/18014/third_party/tcmalloc/chromi...

These changes are manually merged from both the Chromium-original branch and the
latest original gperftools r144.

+static const size_t kMaxThreadCacheSize = 4 << 20;
 
 static const size_t kPageSize   = 1 << kPageShift;
-static const size_t kMaxSize    = 8u * kPageSize;
+static const size_t kMaxSize    = 256 * 1024;

[Dai Mikurube (NOT FULLTIME), 2012/02/14 11:32:09]

From
http://codereview.chromium.org/7430007/diff/18014/third_party/tcmalloc/chromi...

This may affect performance in a large way.  We may have to tune it.

 // For all span-lengths < kMaxPages we keep an exact-size list.
 static const size_t kMaxPages = 1 << (20 - kPageShift);
 
@@ -176,7 +176,7 @@ class SizeMap {
   //   32768      (32768 + 127 + (120<<7)) / 128  376
   static const int kMaxSmallSize = 1024;
   static const size_t kClassArraySize =
-      (((1 << kPageShift) * 8u + 127 + (120 << 7)) >> 7) + 1;
+      ((kMaxSize + 127 + (120 << 7)) >> 7) + 1;
   unsigned char class_array_[kClassArraySize];
 
   // Compute index of the class_array[] entry for a given size
@@ -232,9 +232,6 @@ class SizeMap {
   inline int num_objects_to_move(size_t cl) {
     return num_objects_to_move_[cl];
   }
-
-  // Dump contents of the computed size map
-  void Dump(TCMalloc_Printer* out);
 };
 
 // Allocates "bytes" worth of memory and returns it.  Increments