| OLD | NEW |
| 1 // Copyright 2007-2011 the V8 project authors. All rights reserved. | 1 // Copyright 2007-2011 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 | 27 |
| 28 #include <limits.h> | 28 #include <limits.h> |
| 29 | 29 |
| 30 #include "src/v8.h" | 30 #include "src/v8.h" |
| 31 | 31 |
| 32 #include "src/api.h" | 32 #include "src/api.h" |
| 33 #include "src/base/platform/platform.h" | 33 #include "src/base/platform/platform.h" |
| 34 #include "src/base/smart-pointers.h" |
| 34 #include "src/compilation-cache.h" | 35 #include "src/compilation-cache.h" |
| 35 #include "src/execution.h" | 36 #include "src/execution.h" |
| 36 #include "src/isolate.h" | 37 #include "src/isolate.h" |
| 37 #include "src/parser.h" | 38 #include "src/parser.h" |
| 38 #include "src/smart-pointers.h" | |
| 39 #include "src/unicode-inl.h" | 39 #include "src/unicode-inl.h" |
| 40 #include "src/utils.h" | 40 #include "src/utils.h" |
| 41 #include "test/cctest/cctest.h" | 41 #include "test/cctest/cctest.h" |
| 42 | 42 |
| 43 using ::v8::Context; | 43 using ::v8::Context; |
| 44 using ::v8::Extension; | 44 using ::v8::Extension; |
| 45 using ::v8::Function; | 45 using ::v8::Function; |
| 46 using ::v8::HandleScope; | 46 using ::v8::HandleScope; |
| 47 using ::v8::Local; | 47 using ::v8::Local; |
| 48 using ::v8::Object; | 48 using ::v8::Object; |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 v8::Isolate* isolate_; | 94 v8::Isolate* isolate_; |
| 95 Persistent<v8::Context> context_; | 95 Persistent<v8::Context> context_; |
| 96 }; | 96 }; |
| 97 | 97 |
| 98 | 98 |
| 99 // Migrates an isolate from one thread to another | 99 // Migrates an isolate from one thread to another |
| 100 TEST(KangarooIsolates) { | 100 TEST(KangarooIsolates) { |
| 101 v8::Isolate::CreateParams create_params; | 101 v8::Isolate::CreateParams create_params; |
| 102 create_params.array_buffer_allocator = CcTest::array_buffer_allocator(); | 102 create_params.array_buffer_allocator = CcTest::array_buffer_allocator(); |
| 103 v8::Isolate* isolate = v8::Isolate::New(create_params); | 103 v8::Isolate* isolate = v8::Isolate::New(create_params); |
| 104 i::SmartPointer<KangarooThread> thread1; | 104 v8::base::SmartPointer<KangarooThread> thread1; |
| 105 { | 105 { |
| 106 v8::Locker locker(isolate); | 106 v8::Locker locker(isolate); |
| 107 v8::Isolate::Scope isolate_scope(isolate); | 107 v8::Isolate::Scope isolate_scope(isolate); |
| 108 v8::HandleScope handle_scope(isolate); | 108 v8::HandleScope handle_scope(isolate); |
| 109 v8::Local<v8::Context> context = v8::Context::New(isolate); | 109 v8::Local<v8::Context> context = v8::Context::New(isolate); |
| 110 v8::Context::Scope context_scope(context); | 110 v8::Context::Scope context_scope(context); |
| 111 CHECK_EQ(reinterpret_cast<v8::internal::Isolate*>(isolate), | 111 CHECK_EQ(reinterpret_cast<v8::internal::Isolate*>(isolate), |
| 112 v8::internal::Isolate::Current()); | 112 v8::internal::Isolate::Current()); |
| 113 CompileRun("function getValue() { return 30; }"); | 113 CompileRun("function getValue() { return 30; }"); |
| 114 thread1.Reset(new KangarooThread(isolate, context)); | 114 thread1.Reset(new KangarooThread(isolate, context)); |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 class LockAndUnlockDifferentIsolatesThread : public JoinableThread { | 457 class LockAndUnlockDifferentIsolatesThread : public JoinableThread { |
| 458 public: | 458 public: |
| 459 LockAndUnlockDifferentIsolatesThread(v8::Isolate* isolate1, | 459 LockAndUnlockDifferentIsolatesThread(v8::Isolate* isolate1, |
| 460 v8::Isolate* isolate2) | 460 v8::Isolate* isolate2) |
| 461 : JoinableThread("LockAndUnlockDifferentIsolatesThread"), | 461 : JoinableThread("LockAndUnlockDifferentIsolatesThread"), |
| 462 isolate1_(isolate1), | 462 isolate1_(isolate1), |
| 463 isolate2_(isolate2) { | 463 isolate2_(isolate2) { |
| 464 } | 464 } |
| 465 | 465 |
| 466 virtual void Run() { | 466 virtual void Run() { |
| 467 i::SmartPointer<LockIsolateAndCalculateFibSharedContextThread> thread; | 467 v8::base::SmartPointer<LockIsolateAndCalculateFibSharedContextThread> |
| 468 thread; |
| 468 v8::Locker lock1(isolate1_); | 469 v8::Locker lock1(isolate1_); |
| 469 CHECK(v8::Locker::IsLocked(isolate1_)); | 470 CHECK(v8::Locker::IsLocked(isolate1_)); |
| 470 CHECK(!v8::Locker::IsLocked(isolate2_)); | 471 CHECK(!v8::Locker::IsLocked(isolate2_)); |
| 471 { | 472 { |
| 472 v8::Isolate::Scope isolate_scope(isolate1_); | 473 v8::Isolate::Scope isolate_scope(isolate1_); |
| 473 v8::HandleScope handle_scope(isolate1_); | 474 v8::HandleScope handle_scope(isolate1_); |
| 474 v8::Handle<v8::Context> context1 = v8::Context::New(isolate1_); | 475 v8::Handle<v8::Context> context1 = v8::Context::New(isolate1_); |
| 475 { | 476 { |
| 476 v8::Context::Scope context_scope(context1); | 477 v8::Context::Scope context_scope(context1); |
| 477 CalcFibAndCheck(); | 478 CalcFibAndCheck(); |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 728 kSimpleExtensionSource)); | 729 kSimpleExtensionSource)); |
| 729 const char* extension_names[] = { "test0", "test1", | 730 const char* extension_names[] = { "test0", "test1", |
| 730 "test2", "test3", "test4", | 731 "test2", "test3", "test4", |
| 731 "test5", "test6", "test7" }; | 732 "test5", "test6", "test7" }; |
| 732 i::List<JoinableThread*> threads(kNThreads); | 733 i::List<JoinableThread*> threads(kNThreads); |
| 733 for (int i = 0; i < kNThreads; i++) { | 734 for (int i = 0; i < kNThreads; i++) { |
| 734 threads.Add(new IsolateGenesisThread(8, extension_names)); | 735 threads.Add(new IsolateGenesisThread(8, extension_names)); |
| 735 } | 736 } |
| 736 StartJoinAndDeleteThreads(threads); | 737 StartJoinAndDeleteThreads(threads); |
| 737 } | 738 } |
| OLD | NEW |