Revision f230a1cf deps/v8/test/cctest/test-lockers.cc
| deps/v8/test/cctest/test-lockers.cc | ||
|---|---|---|
| 183 | 183 |
v8::Locker locker(isolate_); |
| 184 | 184 |
v8::Isolate::Scope isolate_scope(isolate_); |
| 185 | 185 |
v8::HandleScope handle_scope(isolate_); |
| 186 |
LocalContext local_context; |
|
| 186 |
LocalContext local_context(isolate_);
|
|
| 187 | 187 |
CHECK_EQ(isolate_, v8::internal::Isolate::Current()); |
| 188 | 188 |
CalcFibAndCheck(); |
| 189 | 189 |
} |
| ... | ... | |
| 267 | 267 |
v8::Locker lock(isolate_); |
| 268 | 268 |
v8::Isolate::Scope isolate_scope(isolate_); |
| 269 | 269 |
v8::HandleScope handle_scope(isolate_); |
| 270 |
LocalContext local_context; |
|
| 270 |
LocalContext local_context(isolate_);
|
|
| 271 | 271 |
{
|
| 272 | 272 |
v8::Locker another_lock(isolate_); |
| 273 | 273 |
CalcFibAndCheck(); |
| ... | ... | |
| 311 | 311 |
v8::Locker lock(isolate1_); |
| 312 | 312 |
v8::Isolate::Scope isolate_scope(isolate1_); |
| 313 | 313 |
v8::HandleScope handle_scope(isolate1_); |
| 314 |
LocalContext local_context; |
|
| 314 |
LocalContext local_context(isolate1_);
|
|
| 315 | 315 |
|
| 316 | 316 |
IsolateLockingThreadWithLocalContext threadB(isolate2_); |
| 317 | 317 |
threadB.Start(); |
| ... | ... | |
| 545 | 545 |
virtual void Run() {
|
| 546 | 546 |
v8::Locker lock1(isolate_); |
| 547 | 547 |
CHECK(v8::Locker::IsLocked(isolate_)); |
| 548 |
CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
|
|
| 548 |
CHECK(!v8::Locker::IsLocked(CcTest::isolate())); |
|
| 549 | 549 |
{
|
| 550 | 550 |
v8::Isolate::Scope isolate_scope(isolate_); |
| 551 | 551 |
v8::HandleScope handle_scope(isolate_); |
| ... | ... | |
| 557 | 557 |
{
|
| 558 | 558 |
v8::Unlocker unlock1(isolate_); |
| 559 | 559 |
CHECK(!v8::Locker::IsLocked(isolate_)); |
| 560 |
CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
|
|
| 560 |
CHECK(!v8::Locker::IsLocked(CcTest::isolate())); |
|
| 561 | 561 |
{
|
| 562 | 562 |
v8::Locker lock2(isolate_); |
| 563 | 563 |
v8::Isolate::Scope isolate_scope(isolate_); |
| 564 | 564 |
v8::HandleScope handle_scope(isolate_); |
| 565 | 565 |
CHECK(v8::Locker::IsLocked(isolate_)); |
| 566 |
CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
|
|
| 566 |
CHECK(!v8::Locker::IsLocked(CcTest::isolate())); |
|
| 567 | 567 |
v8::Local<v8::Context> context = |
| 568 | 568 |
v8::Local<v8::Context>::New(isolate_, context_); |
| 569 | 569 |
v8::Context::Scope context_scope(context); |
| ... | ... | |
| 605 | 605 |
public: |
| 606 | 606 |
explicit LockUnlockLockDefaultIsolateThread(v8::Handle<v8::Context> context) |
| 607 | 607 |
: JoinableThread("LockUnlockLockDefaultIsolateThread"),
|
| 608 |
context_(CcTest::default_isolate(), context) {}
|
|
| 608 |
context_(CcTest::isolate(), context) {}
|
|
| 609 | 609 |
|
| 610 | 610 |
virtual void Run() {
|
| 611 |
v8::Locker lock1(CcTest::default_isolate());
|
|
| 611 |
v8::Locker lock1(CcTest::isolate()); |
|
| 612 | 612 |
{
|
| 613 |
v8::HandleScope handle_scope(CcTest::default_isolate()); |
|
| 613 |
v8::Isolate::Scope isolate_scope(CcTest::isolate()); |
|
| 614 |
v8::HandleScope handle_scope(CcTest::isolate()); |
|
| 614 | 615 |
v8::Local<v8::Context> context = |
| 615 |
v8::Local<v8::Context>::New(CcTest::default_isolate(), context_);
|
|
| 616 |
v8::Local<v8::Context>::New(CcTest::isolate(), context_); |
|
| 616 | 617 |
v8::Context::Scope context_scope(context); |
| 617 | 618 |
CalcFibAndCheck(); |
| 618 | 619 |
} |
| 619 | 620 |
{
|
| 620 |
v8::Unlocker unlock1(CcTest::default_isolate());
|
|
| 621 |
v8::Unlocker unlock1(CcTest::isolate()); |
|
| 621 | 622 |
{
|
| 622 |
v8::Locker lock2(CcTest::default_isolate()); |
|
| 623 |
v8::HandleScope handle_scope(CcTest::default_isolate()); |
|
| 623 |
v8::Locker lock2(CcTest::isolate()); |
|
| 624 |
v8::Isolate::Scope isolate_scope(CcTest::isolate()); |
|
| 625 |
v8::HandleScope handle_scope(CcTest::isolate()); |
|
| 624 | 626 |
v8::Local<v8::Context> context = |
| 625 |
v8::Local<v8::Context>::New(CcTest::default_isolate(), context_);
|
|
| 627 |
v8::Local<v8::Context>::New(CcTest::isolate(), context_); |
|
| 626 | 628 |
v8::Context::Scope context_scope(context); |
| 627 | 629 |
CalcFibAndCheck(); |
| 628 | 630 |
} |
| ... | ... | |
| 644 | 646 |
Local<v8::Context> context; |
| 645 | 647 |
i::List<JoinableThread*> threads(kNThreads); |
| 646 | 648 |
{
|
| 647 |
v8::Locker locker_(CcTest::default_isolate()); |
|
| 648 |
v8::HandleScope handle_scope(CcTest::default_isolate()); |
|
| 649 |
context = v8::Context::New(CcTest::default_isolate()); |
|
| 649 |
v8::Locker locker_(CcTest::isolate()); |
|
| 650 |
v8::Isolate::Scope isolate_scope(CcTest::isolate()); |
|
| 651 |
v8::HandleScope handle_scope(CcTest::isolate()); |
|
| 652 |
context = v8::Context::New(CcTest::isolate()); |
|
| 650 | 653 |
for (int i = 0; i < kNThreads; i++) {
|
| 651 | 654 |
threads.Add(new LockUnlockLockDefaultIsolateThread(context)); |
| 652 | 655 |
} |
Also available in: Unified diff