[heap] Harden heap-related cctests

test/cctest/heap/test-incremental-marking.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 
 #ifdef __linux__
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #endif
 
 #include <utility>
 
 #include "src/v8.h"
 
 #include "src/full-codegen/full-codegen.h"
 #include "src/global-handles.h"
 #include "test/cctest/cctest.h"
-#include "test/cctest/heap/utils-inl.h"
-
+#include "test/cctest/heap/heap-utils.h"
 
 using v8::IdleTask;
 using v8::Task;
 using v8::Isolate;
 
 namespace v8 {
 namespace internal {
 
 class MockPlatform : public v8::Platform {
  public:
@@ skipping 79 matching lines @@
   Task* delayed_task_;
 };
 
 
 TEST(IncrementalMarkingUsingIdleTasks) {
   if (!i::FLAG_incremental_marking) return;
   CcTest::InitializeVM();
   v8::Platform* old_platform = i::V8::GetCurrentPlatform();
   MockPlatform platform(old_platform);
   i::V8::SetPlatformForTesting(&platform);
-  SimulateFullSpace(CcTest::heap()->old_space());
+  i::heap::SimulateFullSpace(CcTest::heap()->old_space());
   i::IncrementalMarking* marking = CcTest::heap()->incremental_marking();
   marking->Stop();
   marking->Start();
   CHECK(platform.PendingIdleTask());
   const double kLongIdleTimeInSeconds = 1;
   const double kShortIdleTimeInSeconds = 0.010;
   const int kShortStepCount = 10;
   for (int i = 0; i < kShortStepCount && platform.PendingIdleTask(); i++) {
     platform.PerformIdleTask(kShortIdleTimeInSeconds);
   }
   while (platform.PendingIdleTask()) {
     platform.PerformIdleTask(kLongIdleTimeInSeconds);
   }
   CHECK(marking->IsStopped());
   i::V8::SetPlatformForTesting(old_platform);
 }
 
 
 TEST(IncrementalMarkingUsingIdleTasksAfterGC) {
   if (!i::FLAG_incremental_marking) return;
   CcTest::InitializeVM();
   v8::Platform* old_platform = i::V8::GetCurrentPlatform();
   MockPlatform platform(old_platform);
   i::V8::SetPlatformForTesting(&platform);
-  SimulateFullSpace(CcTest::heap()->old_space());
+  i::heap::SimulateFullSpace(CcTest::heap()->old_space());
   CcTest::heap()->CollectAllGarbage();
   i::IncrementalMarking* marking = CcTest::heap()->incremental_marking();
   marking->Stop();
   marking->Start();
   CHECK(platform.PendingIdleTask());
   const double kLongIdleTimeInSeconds = 1;
   const double kShortIdleTimeInSeconds = 0.010;
   const int kShortStepCount = 10;
   for (int i = 0; i < kShortStepCount && platform.PendingIdleTask(); i++) {
     platform.PerformIdleTask(kShortIdleTimeInSeconds);
   }
   while (platform.PendingIdleTask()) {
     platform.PerformIdleTask(kLongIdleTimeInSeconds);
   }
   CHECK(marking->IsStopped());
   i::V8::SetPlatformForTesting(old_platform);
 }
 
 
 TEST(IncrementalMarkingUsingDelayedTasks) {
   if (!i::FLAG_incremental_marking) return;
   CcTest::InitializeVM();
   v8::Platform* old_platform = i::V8::GetCurrentPlatform();
   MockPlatform platform(old_platform);
   i::V8::SetPlatformForTesting(&platform);
-  SimulateFullSpace(CcTest::heap()->old_space());
+  i::heap::SimulateFullSpace(CcTest::heap()->old_space());
   i::IncrementalMarking* marking = CcTest::heap()->incremental_marking();
   marking->Stop();
   marking->Start();
   CHECK(platform.PendingIdleTask());
   // The delayed task should be a no-op if the idle task makes progress.
   const int kIgnoredDelayedTaskStepCount = 1000;
   for (int i = 0; i < kIgnoredDelayedTaskStepCount; i++) {
     // Dummy idle task progress.
     marking->incremental_marking_job()->NotifyIdleTaskProgress();
     CHECK(platform.PendingDelayedTask());
     platform.PerformDelayedTask();
   }
   // Once we stop notifying idle task progress, the delayed tasks
   // should finish marking.
   while (!marking->IsStopped() && platform.PendingDelayedTask()) {
     platform.PerformDelayedTask();
   }
   // There could be pending delayed task from memory reducer after GC finishes.
   CHECK(marking->IsStopped());
   i::V8::SetPlatformForTesting(old_platform);
 }
 
 }  // namespace internal
 }  // namespace v8