gtestify and cleanup system-alloc_unittest

CMakeLists.txt

@@ -582,11 +582,11 @@ if(BUILD_TESTING)
   target_link_libraries(addressmap_unittest common gtest)
   add_test(addressmap_unittest addressmap_unittest)
 
-  if(NOT MINGW AND NOT MSVC)
+  add_executable(system_alloc_unittest src/tests/system-alloc_unittest.cc)
-    add_executable(system_alloc_unittest src/tests/system-alloc_unittest.cc)
+  target_link_libraries(system_alloc_unittest tcmalloc_minimal gtest)
-    target_link_libraries(system_alloc_unittest tcmalloc_minimal)
+  add_test(system_alloc_unittest system_alloc_unittest)
-    add_test(system_alloc_unittest system_alloc_unittest)
 
+  if(NOT MINGW AND NOT MSVC)
     add_executable(unique_path_unittest src/tests/unique_path_unittest.cc)
     target_link_libraries(unique_path_unittest common gtest)
     add_test(unique_path_unittest unique_path_unittest)

Makefile.am

@@ -411,7 +411,8 @@ if !MINGW
 TESTS += system_alloc_unittest
 system_alloc_unittest_SOURCES = src/tests/system-alloc_unittest.cc
 system_alloc_unittest_LDFLAGS = $(TCMALLOC_FLAGS) $(AM_LDFLAGS)
-system_alloc_unittest_LDADD = libtcmalloc_minimal.la
+system_alloc_unittest_CPPFLAGS = $(gtest_CPPFLAGS)
+system_alloc_unittest_LDADD = libtcmalloc_minimal.la libgtest.la
 endif !MINGW
 
 TESTS += frag_unittest

src/tests/system-alloc_unittest.cc

@@ -30,99 +30,59 @@
 
 // ---
 // Author: Arun Sharma
-
 #include "config_for_unittests.h"
 
-#include "system-alloc.h"
+#include "gperftools/malloc_extension.h"
 
 #include <stdio.h>
-#include <stdint.h>             // to get uintptr_t
+#include <stdint.h>
 #include <sys/types.h>
 
 #include <algorithm>
 #include <limits>
 
-#include "base/logging.h"                // for Check_GEImpl, Check_LTImpl, etc
+#include "base/cleanup.h"
-#include "common.h"                      // for kAddressBits
-#include "gperftools/malloc_extension.h" // for MallocExtension::instance
-#include "gperftools/tcmalloc.h"
 #include "tests/testutil.h"
 
-class ArraySysAllocator : public SysAllocator {
+#include "gtest/gtest.h"
+
+class TestSysAllocator : public SysAllocator {
 public:
   // Was this allocator invoked at least once?
-  bool invoked_;
+  bool invoked_ = false;
 
-  ArraySysAllocator() : SysAllocator() {
+  TestSysAllocator(SysAllocator* prev) : SysAllocator(), prev_(prev) {}
-    ptr_ = 0;
+  ~TestSysAllocator() override {}
-    invoked_ = false;
-  }
 
-  void* Alloc(size_t size, size_t *actual_size, size_t alignment) {
+  void* Alloc(size_t size, size_t *actual_size, size_t alignment) override {
     invoked_ = true;
-
+    return prev_->Alloc(size, actual_size, alignment);
-    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() {
-  }
-
 private:
-  static const int kArraySize = 8 * 1024 * 1024;
+  SysAllocator* const prev_;
-  char array_[kArraySize];
-  // We allocate the next chunk from here
-  int ptr_;
-
 };
-const int ArraySysAllocator::kArraySize;
-ArraySysAllocator a;
 
-static void TestBasicInvoked() {
+TEST(SystemAllocTest, GetsInvoked) {
-  MallocExtension::instance()->SetSystemAllocator(&a);
+  SysAllocator* prev = MallocExtension::instance()->GetSystemAllocator();
+  tcmalloc::Cleanup restore_sys_allocator([prev] () {
+    MallocExtension::instance()->SetSystemAllocator(prev);
+  });
+
+  // Note, normally SysAllocator instances cannot be destroyed, but
+  // we're single-threaded isolated unit test. And we know what we're
+  // doing.
+  TestSysAllocator test_allocator{prev};
+  MallocExtension::instance()->SetSystemAllocator(&test_allocator);
 
   // An allocation size that is likely to trigger the system allocator.
-  // XXX: this is implementation specific.
+  char *p =  noopt(new char[20 << 20]);
-  char *p =  noopt(new char[1024 * 1024]);
   delete [] p;
 
   // Make sure that our allocator was invoked.
-  CHECK(a.invoked_);
+  ASSERT_TRUE(test_allocator.invoked_);
 }
 
-#if 0  // could port this to various OSs, but won't bother for now
+TEST(SystemAllocTest, RetryAfterFail) {
-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, std::min(kImplementedVirtualBits, kPointerBits));
-}
-#endif
-
-static void TestBasicRetryFailTest() {
   // Check with the allocator still works after a failed allocation.
   //
   // There is no way to call malloc and guarantee it will fail.  malloc takes a
@@ -137,21 +97,13 @@ static void TestBasicRetryFailTest() {
   // If the second allocation succeeds, you will have to rewrite or
   // disable this test.
   // The weird parens are to avoid macro-expansion of 'max' on windows.
-  const size_t kHugeSize = (std::numeric_limits<size_t>::max)() / 2;
+  constexpr size_t kHugeSize = std::numeric_limits<size_t>::max() / 2;
   void* p1 = noopt(malloc(kHugeSize));
   void* p2 = noopt(malloc(kHugeSize));
-  CHECK(p2 == NULL);
+  ASSERT_EQ(p2, nullptr);
-  if (p1 != NULL) free(p1);
+
+  free(p1);
 
   char* q = noopt(new char[1024]);
-  CHECK(q != NULL);
   delete [] q;
 }
-
-int main(int argc, char** argv) {
-  TestBasicInvoked();
-  TestBasicRetryFailTest();
-
-  printf("PASS\n");
-  return 0;
-}

vsprojects/system-alloc_unittest/system-alloc_unittest.vcxproj

@@ -215,6 +215,9 @@
       <Project>{55e2b3ae-3ca1-4db6-97f7-0a044d6f446f}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\gtest\gtest.vcxproj">
+      <Project>{0496df42-d7ad-46b6-b10c-c57a07e89b0d}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">