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

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

 /* Copyright (c) 2006, 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 128 matching lines @@
     allocated.erase(it);
   }
   if (use_new_arena) {
     CHECK(LowLevelAlloc::DeleteArena(arena));
   }
 }
 
 // used for counting allocates and frees
 static int32 allocates;
 static int32 frees;
-static MallocHook::NewHook old_alloc_hook;
-static MallocHook::DeleteHook old_free_hook;
 
 // called on each alloc if kCallMallocHook specified
 static void AllocHook(const void *p, size_t size) {
   if (using_low_level_alloc) {
     allocates++;
   }
-  if (old_alloc_hook != 0) {
-    (*old_alloc_hook)(p, size);
-  }
 }
 
 // called on each free if kCallMallocHook specified
 static void FreeHook(const void *p) {
   if (using_low_level_alloc) {
     frees++;
   }
-  if (old_free_hook != 0) {
-    (*old_free_hook)(p);
-  }
 }
 
 int main(int argc, char *argv[]) {
   // This is needed by maybe_threads_unittest.sh, which parses argv[0]
   // to figure out what directory low_level_alloc_unittest is in.
   if (argc != 1) {
     fprintf(stderr, "USAGE: %s\n", argv[0]);
     return 1;
   }
 
-  old_alloc_hook = MallocHook::SetNewHook(AllocHook);
-  old_free_hook = MallocHook::SetDeleteHook(FreeHook);
+  CHECK(MallocHook::AddNewHook(&AllocHook));
+  CHECK(MallocHook::AddDeleteHook(&FreeHook));
   CHECK_EQ(allocates, 0);
   CHECK_EQ(frees, 0);
   Test(false, false, 50000);
   CHECK_NE(allocates, 0);   // default arena calls hooks
   CHECK_NE(frees, 0);
   for (int i = 0; i != 16; i++) {
     bool call_hooks = ((i & 1) == 1);
     allocates = 0;
     frees = 0;
     Test(true, call_hooks, 15000);
     if (call_hooks) {
       CHECK_GT(allocates, 5000); // arena calls hooks
       CHECK_GT(frees, 5000);
     } else {
       CHECK_EQ(allocates, 0);    // arena doesn't call hooks
       CHECK_EQ(frees, 0);
     }
   }
   printf("\nPASS\n");
-  CHECK_EQ(MallocHook::SetNewHook(old_alloc_hook), AllocHook);
-  CHECK_EQ(MallocHook::SetDeleteHook(old_free_hook), FreeHook);
+  CHECK(MallocHook::RemoveNewHook(&AllocHook));
+  CHECK(MallocHook::RemoveDeleteHook(&FreeHook));
   return 0;
 }