Revision f230a1cf deps/v8/test/cctest/test-threads.cc

View differences:

deps/v8/test/cctest/test-threads.cc
34 34

  
35 35

  
36 36
TEST(Preemption) {
37
  v8::Isolate* isolate = CcTest::default_isolate();
37
  v8::Isolate* isolate = CcTest::isolate();
38 38
  v8::Locker locker(isolate);
39 39
  v8::V8::Initialize();
40 40
  v8::HandleScope scope(isolate);
41 41
  v8::Handle<v8::Context> context = v8::Context::New(isolate);
42 42
  v8::Context::Scope context_scope(context);
43 43

  
44
  v8::Locker::StartPreemption(100);
44
  v8::Locker::StartPreemption(isolate, 100);
45 45

  
46 46
  v8::Handle<v8::Script> script = v8::Script::Compile(
47 47
      v8::String::New("var count = 0; var obj = new Object(); count++;\n"));
48 48

  
49 49
  script->Run();
50 50

  
51
  v8::Locker::StopPreemption();
51
  v8::Locker::StopPreemption(isolate);
52 52
  v8::internal::OS::Sleep(500);  // Make sure the timer fires.
53 53

  
54 54
  script->Run();
......
69 69
 public:
70 70
  ThreadA() : Thread("ThreadA") { }
71 71
  void Run() {
72
    v8::Isolate* isolate = CcTest::default_isolate();
72
    v8::Isolate* isolate = CcTest::isolate();
73 73
    v8::Locker locker(isolate);
74
    v8::Isolate::Scope isolate_scope(isolate);
74 75
    v8::HandleScope scope(isolate);
75 76
    v8::Handle<v8::Context> context = v8::Context::New(isolate);
76 77
    v8::Context::Scope context_scope(context);
......
90 91
    turn = CLEAN_CACHE;
91 92
    do {
92 93
      {
93
        v8::Unlocker unlocker(CcTest::default_isolate());
94
        v8::Unlocker unlocker(CcTest::isolate());
94 95
        Thread::YieldCPU();
95 96
      }
96 97
    } while (turn != SECOND_TIME_FILL_CACHE);
......
109 110
  void Run() {
110 111
    do {
111 112
      {
112
        v8::Isolate* isolate = CcTest::default_isolate();
113
        v8::Isolate* isolate = CcTest::isolate();
113 114
        v8::Locker locker(isolate);
115
        v8::Isolate::Scope isolate_scope(isolate);
114 116
        if (turn == CLEAN_CACHE) {
115 117
          v8::HandleScope scope(isolate);
116 118
          v8::Handle<v8::Context> context = v8::Context::New(isolate);
117 119
          v8::Context::Scope context_scope(context);
118 120

  
119 121
          // Clear the caches by forcing major GC.
120
          HEAP->CollectAllGarbage(v8::internal::Heap::kNoGCFlags);
122
          CcTest::heap()->CollectAllGarbage(v8::internal::Heap::kNoGCFlags);
121 123
          turn = SECOND_TIME_FILL_CACHE;
122 124
          break;
123 125
        }
......
130 132

  
131 133

  
132 134
TEST(JSFunctionResultCachesInTwoThreads) {
133
  v8::V8::Initialize();
134

  
135 135
  ThreadA threadA;
136 136
  ThreadB threadB;
137 137

  

Also available in: Unified diff