Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)

third_party/tcmalloc/chromium/src/tests/frag_unittest.cc

 // Copyright (c) 2003, 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 26 matching lines @@
 #include <stdio.h>
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/time.h>           // for struct timeval
 #include <sys/resource.h>       // for getrusage
 #endif
 #ifdef _WIN32
 #include <windows.h>            // for GetTickCount()
 #endif
 #include <vector>
 #include "base/logging.h"
+#include "common.h"
 #include <google/malloc_extension.h>
 
 using std::vector;
 
 int main(int argc, char** argv) {
-  static const int kAllocSize = 36<<10; // Bigger than tcmalloc page size
-  static const int kTotalAlloc = 400 << 20; // Allocate 400MB in total
+  // Make kAllocSize one page larger than the maximum small object size.
+  static const int kAllocSize = kMaxSize + kPageSize;
+  // Allocate 400MB in total.
+  static const int kTotalAlloc = 400 << 20;
   static const int kAllocIterations = kTotalAlloc / kAllocSize;
 
   // Allocate lots of objects
   vector<char*> saved(kAllocIterations);
   for (int i = 0; i < kAllocIterations; i++) {
     saved[i] = new char[kAllocSize];
   }
 
+  // Check the current "slack".
+  size_t slack_before;
+  MallocExtension::instance()->GetNumericProperty("tcmalloc.slack_bytes",
+                                                  &slack_before);
+
   // Free alternating ones to fragment heap
   size_t free_bytes = 0;
   for (int i = 0; i < saved.size(); i += 2) {
     delete[] saved[i];
     free_bytes += kAllocSize;
   }
 
-  // Check that slack is within 10% of expected
-  size_t slack;
+  // Check that slack delta is within 10% of expected.
+  size_t slack_after;
   MallocExtension::instance()->GetNumericProperty("tcmalloc.slack_bytes",
-                                                  &slack);
+                                                  &slack_after);
+  CHECK_GE(slack_after, slack_before);
+  size_t slack = slack_after - slack_before;
+
   CHECK_GT(double(slack), 0.9*free_bytes);
   CHECK_LT(double(slack), 1.1*free_bytes);
 
   // Dump malloc stats
   static const int kBufSize = 1<<20;
   char* buffer = new char[kBufSize];
   MallocExtension::instance()->GetStats(buffer, kBufSize);
   VLOG(1, "%s", buffer);
   delete[] buffer;
 
@@ skipping 29 matching lines @@
 #else
 # error No way to calculate time on your system
 #endif
     fprintf(stderr, "getproperty: %6.1f ns/call\n",
             (sumsec * 1e9 + sumusec * 1e3) / kIterations);
   }
 
   printf("PASS\n");
   return 0;
 }