Change cctest/test-lockers to not copy persistent handles around.

test/cctest/test-lockers.cc

 // Copyright 2007-2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 15 matching lines @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <limits.h>
 
 #include "v8.h"
 
 #include "api.h"
 #include "isolate.h"
 #include "compilation-cache.h"
 #include "execution.h"
+#include "smart-pointers.h"
 #include "snapshot.h"
 #include "platform.h"
 #include "utils.h"
 #include "cctest.h"
 #include "parser.h"
 #include "unicode-inl.h"
 
 using ::v8::AccessorInfo;
 using ::v8::Context;
 using ::v8::Extension;
 using ::v8::Function;
 using ::v8::HandleScope;
 using ::v8::Local;
 using ::v8::Object;
 using ::v8::ObjectTemplate;
 using ::v8::Persistent;
 using ::v8::Script;
 using ::v8::String;
 using ::v8::Value;
 using ::v8::V8;
 
 
 // Migrating an isolate
 class KangarooThread : public v8::internal::Thread {
  public:
-  KangarooThread(v8::Isolate* isolate,
-                 v8::Handle<v8::Context> context)
+  KangarooThread(v8::Isolate* isolate, v8::Handle<v8::Context> context)
       : Thread("KangarooThread"),
-        isolate_(isolate), context_(context) {
-  }
+        isolate_(isolate),
+        context_(isolate, context) {}
 
   void Run() {
     {
       v8::Locker locker(isolate_);
       v8::Isolate::Scope isolate_scope(isolate_);
       CHECK_EQ(isolate_, v8::internal::Isolate::Current());
       v8::HandleScope scope(isolate_);
       v8::Context::Scope context_scope(context_);
       Local<Value> v = CompileRun("getValue()");
       CHECK(v->IsNumber());
@@ skipping 12 matching lines @@
   }
 
  private:
   v8::Isolate* isolate_;
   Persistent<v8::Context> context_;
 };
 
 // Migrates an isolate from one thread to another
 TEST(KangarooIsolates) {
   v8::Isolate* isolate = v8::Isolate::New();
-  Persistent<v8::Context> context;
+  v8::internal::SmartPointer<KangarooThread> thread1;
   {
     v8::Locker locker(isolate);
     v8::Isolate::Scope isolate_scope(isolate);
     v8::HandleScope handle_scope(isolate);
-    context = v8::Context::New();
+    v8::Local<v8::Context> context = v8::Context::New(isolate);
     v8::Context::Scope context_scope(context);
     CHECK_EQ(isolate, v8::internal::Isolate::Current());
     CompileRun("function getValue() { return 30; }");
+    thread1.Reset(new KangarooThread(isolate, context));
   }
-  KangarooThread thread1(isolate, context);
-  thread1.Start();
-  thread1.Join();
+  thread1->Start();
+  thread1->Join();
 }
 
 static void CalcFibAndCheck() {
   Local<Value> v = CompileRun("function fib(n) {"
                               "  if (n <= 2) return 1;"
                               "  return fib(n-1) + fib(n-2);"
                               "}"
                               "fib(10)");
   CHECK(v->IsNumber());
   CHECK_EQ(55, static_cast<int>(v->NumberValue()));
@@ skipping 214 matching lines @@
   isolate2->Dispose();
   isolate1->Dispose();
 }
 
 class LockIsolateAndCalculateFibSharedContextThread : public JoinableThread {
  public:
   explicit LockIsolateAndCalculateFibSharedContextThread(
       v8::Isolate* isolate, v8::Handle<v8::Context> context)
     : JoinableThread("LockIsolateAndCalculateFibThread"),
       isolate_(isolate),
-      context_(context) {
+      context_(isolate, context) {
   }
 
   virtual void Run() {
     v8::Locker lock(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
     HandleScope handle_scope(isolate_);
     v8::Context::Scope context_scope(context_);
     CalcFibAndCheck();
   }
  private:
   v8::Isolate* isolate_;
   Persistent<v8::Context> context_;
 };
 
 class LockerUnlockerThread : public JoinableThread {
  public:
   explicit LockerUnlockerThread(v8::Isolate* isolate)
     : JoinableThread("LockerUnlockerThread"),
       isolate_(isolate) {
   }
 
   virtual void Run() {
     v8::Locker lock(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
     v8::HandleScope handle_scope(isolate_);
-    v8::Handle<v8::Context> context = v8::Context::New();
+    v8::Local<v8::Context> context = v8::Context::New(isolate_);
     {
       v8::Context::Scope context_scope(context);
       CalcFibAndCheck();
     }
     {
+      LockIsolateAndCalculateFibSharedContextThread thread(isolate_, context);
       isolate_->Exit();
       v8::Unlocker unlocker(isolate_);
-      LockIsolateAndCalculateFibSharedContextThread thread(isolate_, context);
       thread.Start();
       thread.Join();
     }
     isolate_->Enter();
     {
       v8::Context::Scope context_scope(context);
       CalcFibAndCheck();
     }
   }
 
@@ skipping 21 matching lines @@
  public:
   explicit LockTwiceAndUnlockThread(v8::Isolate* isolate)
     : JoinableThread("LockTwiceAndUnlockThread"),
       isolate_(isolate) {
   }
 
   virtual void Run() {
     v8::Locker lock(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
     v8::HandleScope handle_scope(isolate_);
-    v8::Handle<v8::Context> context = v8::Context::New();
+    v8::Local<v8::Context> context = v8::Context::New(isolate_);
     {
       v8::Context::Scope context_scope(context);
       CalcFibAndCheck();
     }
     {
       v8::Locker second_lock(isolate_);
       {
+        LockIsolateAndCalculateFibSharedContextThread thread(isolate_, context);
         isolate_->Exit();
         v8::Unlocker unlocker(isolate_);
-        LockIsolateAndCalculateFibSharedContextThread thread(isolate_, context);
         thread.Start();
         thread.Join();
       }
     }
     isolate_->Enter();
     {
       v8::Context::Scope context_scope(context);
       CalcFibAndCheck();
     }
   }
@@ skipping 48 matching lines @@
     {
       v8::Isolate::Scope isolate_scope(isolate2_);
       v8::HandleScope handle_scope(isolate2_);
       context2 = v8::Context::New();
       {
         v8::Context::Scope context_scope(context2);
         CalcFibAndCheck();
       }
     }
     {
+      v8::internal::SmartPointer<LockIsolateAndCalculateFibSharedContextThread>
+      thread;

[dcarney, 2013/04/24 13:13:38]

spacing

[jochen (gone - plz use gerrit), 2013/04/24 13:15:16]

that's the way the google c++ style wants it (since it's the type not fitting on
the one line)

[Sven Panne, 2013/04/24 13:40:39]

Perhaps we can resolve this dispute by using i::SmartPointer? :-)

+      {
+        CHECK(v8::Locker::IsLocked(isolate1_));
+        v8::Isolate::Scope isolate_scope(isolate1_);
+        v8::HandleScope handle_scope(isolate1_);
+        thread.Reset(new LockIsolateAndCalculateFibSharedContextThread(
+            isolate1_, v8::Local<v8::Context>::New(isolate1_, context1)));
+      }
       v8::Unlocker unlock1(isolate1_);
       CHECK(!v8::Locker::IsLocked(isolate1_));
       CHECK(v8::Locker::IsLocked(isolate2_));
       v8::Isolate::Scope isolate_scope(isolate2_);
       v8::HandleScope handle_scope(isolate2_);
       v8::Context::Scope context_scope(context2);
-      LockIsolateAndCalculateFibSharedContextThread thread(isolate1_, context1);
-      thread.Start();
+      thread->Start();
       CalcFibAndCheck();
-      thread.Join();
+      thread->Join();
     }
   }
 
  private:
   v8::Isolate* isolate1_;
   v8::Isolate* isolate2_;
 };
 
 // Lock two isolates and unlock one of them.
 TEST(LockAndUnlockDifferentIsolates) {
   v8::Isolate* isolate1 = v8::Isolate::New();
   v8::Isolate* isolate2 = v8::Isolate::New();
   LockAndUnlockDifferentIsolatesThread thread(isolate1, isolate2);
   thread.Start();
   thread.Join();
   isolate2->Dispose();
   isolate1->Dispose();
 }
 
 class LockUnlockLockThread : public JoinableThread {
  public:
-  LockUnlockLockThread(v8::Isolate* isolate, v8::Handle<v8::Context> context)
+  LockUnlockLockThread(v8::Isolate* isolate, v8::Local<v8::Context> context)
     : JoinableThread("LockUnlockLockThread"),
       isolate_(isolate),
-      context_(context) {
+      context_(isolate, context) {
   }
 
   virtual void Run() {
     v8::Locker lock1(isolate_);
     CHECK(v8::Locker::IsLocked(isolate_));
     CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
     {
       v8::Isolate::Scope isolate_scope(isolate_);
       v8::HandleScope handle_scope(isolate_);
       v8::Context::Scope context_scope(context_);
@@ skipping 22 matching lines @@
 
 // Locker inside an Unlocker inside a Locker.
 TEST(LockUnlockLockMultithreaded) {
 #ifdef V8_TARGET_ARCH_MIPS
   const int kNThreads = 50;
 #else
   const int kNThreads = 100;
 #endif
   v8::Isolate* isolate = v8::Isolate::New();
   Persistent<v8::Context> context;
+  i::List<JoinableThread*> threads(kNThreads);
   {
     v8::Locker locker_(isolate);
     v8::Isolate::Scope isolate_scope(isolate);
     v8::HandleScope handle_scope(isolate);
     context = v8::Context::New();
-  }
-  i::List<JoinableThread*> threads(kNThreads);
-  for (int i = 0; i < kNThreads; i++) {
-    threads.Add(new LockUnlockLockThread(isolate, context));
+    for (int i = 0; i < kNThreads; i++) {
+      threads.Add(new LockUnlockLockThread(
+          isolate, v8::Local<v8::Context>::New(isolate, context)));
+    }
   }
   StartJoinAndDeleteThreads(threads);
   isolate->Dispose();
 }
 
 class LockUnlockLockDefaultIsolateThread : public JoinableThread {
  public:
-  explicit LockUnlockLockDefaultIsolateThread(v8::Handle<v8::Context> context)
-    : JoinableThread("LockUnlockLockDefaultIsolateThread"),
-      context_(context) {
-  }
+  explicit LockUnlockLockDefaultIsolateThread(v8::Local<v8::Context> context)
+      : JoinableThread("LockUnlockLockDefaultIsolateThread"),
+        context_(CcTest::default_isolate(), context) {}
 
   virtual void Run() {
     v8::Locker lock1(CcTest::default_isolate());
     {
       v8::HandleScope handle_scope(CcTest::default_isolate());
       v8::Context::Scope context_scope(context_);
       CalcFibAndCheck();
     }
     {
       v8::Unlocker unlock1(CcTest::default_isolate());
@@ skipping 11 matching lines @@
 };
 
 // Locker inside an Unlocker inside a Locker for default isolate.
 TEST(LockUnlockLockDefaultIsolateMultithreaded) {
 #ifdef V8_TARGET_ARCH_MIPS
   const int kNThreads = 50;
 #else
   const int kNThreads = 100;
 #endif
   Persistent<v8::Context> context;
+  i::List<JoinableThread*> threads(kNThreads);
   {
     v8::Locker locker_(CcTest::default_isolate());
     v8::HandleScope handle_scope(CcTest::default_isolate());
     context = v8::Context::New();
-  }
-  i::List<JoinableThread*> threads(kNThreads);
-  for (int i = 0; i < kNThreads; i++) {
-    threads.Add(new LockUnlockLockDefaultIsolateThread(context));
+    for (int i = 0; i < kNThreads; i++) {
+      threads.Add(new LockUnlockLockDefaultIsolateThread(
+          v8::Local<v8::Context>::New(CcTest::default_isolate(), context)));
+    }
   }
   StartJoinAndDeleteThreads(threads);
 }
 
 
 TEST(Regress1433) {
   for (int i = 0; i < 10; i++) {
     v8::Isolate* isolate = v8::Isolate::New();
     {
       v8::Locker lock(isolate);
@@ skipping 68 matching lines @@
                                           kSimpleExtensionSource));
   const char* extension_names[] = { "test0", "test1",
                                     "test2", "test3", "test4",
                                     "test5", "test6", "test7" };
   i::List<JoinableThread*> threads(kNThreads);
   for (int i = 0; i < kNThreads; i++) {
     threads.Add(new IsolateGenesisThread(8, extension_names));
   }
   StartJoinAndDeleteThreads(threads);
 }