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

third_party/tcmalloc/chromium/src/tests/system-alloc_unittest.cc

 // Copyright (c) 2007, 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 13 matching lines @@
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // ---
 // Author: Arun Sharma
 
 #include "config_for_unittests.h"
+#include "system-alloc.h"
 #include <stdio.h>
 #if defined HAVE_STDINT_H
 #include <stdint.h>             // to get uintptr_t
 #elif defined HAVE_INTTYPES_H
 #include <inttypes.h>           // another place uintptr_t might be defined
 #endif
 #include <sys/types.h>
-#include "base/logging.h"
-#include "system-alloc.h"
+#include <algorithm>
+#include "base/logging.h"               // for Check_GEImpl, Check_LTImpl, etc
+#include <google/malloc_extension.h>    // for MallocExtension::instance
+#include "common.h"                     // for kAddressBits
 
 class ArraySysAllocator : public SysAllocator {
 public:
   // Was this allocator invoked at least once?
   bool invoked_;
 
   ArraySysAllocator() : SysAllocator() {
     ptr_ = 0;
     invoked_ = false;
   }
 
   void* Alloc(size_t size, size_t *actual_size, size_t alignment) {
     invoked_ = true;
+
+    if (size > kArraySize) {
+      return NULL;
+    }
+
     void *result = &array_[ptr_];
     uintptr_t ptr = reinterpret_cast<uintptr_t>(result);
 
     if (actual_size) {
       *actual_size = size;
     }
 
     // Try to get more memory for alignment
     size_t extra = alignment - (ptr & (alignment-1));
     size += extra;
     CHECK_LT(ptr_ + size, kArraySize);
 
     if ((ptr & (alignment-1)) != 0) {
       ptr += alignment - (ptr & (alignment-1));
     }
 
     ptr_ += size;
     return reinterpret_cast<void *>(ptr);
   }
 
-  void DumpStats(TCMalloc_Printer* printer) {
+  void DumpStats() {
   }
+  void FlagsInitialized() {}
 
 private:
   static const int kArraySize = 8 * 1024 * 1024;
   char array_[kArraySize];
   // We allocate the next chunk from here
   int ptr_;
 
 };
 const int ArraySysAllocator::kArraySize;
 ArraySysAllocator a;
 
 static void TestBasicInvoked() {
-  RegisterSystemAllocator(&a, 0);
+  MallocExtension::instance()->SetSystemAllocator(&a);
 
   // An allocation size that is likely to trigger the system allocator.
   // XXX: this is implementation specific.
   char *p = new char[1024 * 1024];
   delete [] p;
 
   // Make sure that our allocator was invoked.
   CHECK(a.invoked_);
 }
 
+#if 0  // could port this to various OSs, but won't bother for now
+TEST(AddressBits, CpuVirtualBits) {
+  // Check that kAddressBits is as least as large as either the number of bits
+  // in a pointer or as the number of virtual bits handled by the processor.
+  // To be effective this test must be run on each processor model.
+  const int kPointerBits = 8 * sizeof(void*);
+  const int kImplementedVirtualBits = NumImplementedVirtualBits();
+
+  CHECK_GE(kAddressBits, min(kImplementedVirtualBits, kPointerBits));
+}
+#endif
+
+static void TestBasicRetryFailTest() {
+  // Check with the allocator still works after a failed allocation.
+  void* p = malloc(1ULL << 50);  // Asking for 1P ram
+  CHECK(p == NULL);
+
+  char* q = new char[1024];
+  CHECK(q != NULL);
+  delete [] q;
+}
+
 int main(int argc, char** argv) {
   TestBasicInvoked();
+  TestBasicRetryFailTest();
 
   printf("PASS\n");
   return 0;
 }