Per-isolate v8::Locker and v8::Unlocker

src/isolate.cc

 // Copyright 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 291 matching lines @@
   PerIsolateThreadData* per_thread = NULL;
   {
     ScopedLock lock(process_wide_mutex_);
     per_thread = thread_data_table_->Lookup(this, thread_id);
     if (per_thread == NULL) {
       per_thread = AllocatePerIsolateThreadData(thread_id);
     }
   }
   return per_thread;
 }
 

[Vitaly Repeshko, 2011/04/15 00:29:39]

nit: Two blank lines between functions.

[Dmitry Lomov, 2011/04/19 01:50:47]

Done.

+Isolate::PerIsolateThreadData* Isolate::FindPerThreadDataForThisThread() {
+  ThreadId thread_id = ThreadId::Current();
+  PerIsolateThreadData* per_thread = NULL;
+  {
+    ScopedLock lock(process_wide_mutex_);
+    per_thread = thread_data_table_->Lookup(this, thread_id);
+  }
+  return per_thread;
+}
+
+void Isolate::EnsurePreinitializedForThisThread() {

[Vitaly Repeshko, 2011/04/15 00:29:39]

ForThisThread doesn't make much sense, since the isolate can only be
preinitialized once. How about LockedPreInit?

[Dmitry Lomov, 2011/04/19 01:50:47]

I just removed this.

+  ScopedLock lock(process_wide_mutex_);

[Vitaly Repeshko, 2011/04/15 00:29:39]

I don't think we really need a process-wide mutex here. You could ensure the
mutex from the thread manager is already available and use it here.

+  CHECK(PreInit());
+}
 
 void Isolate::EnsureDefaultIsolate() {
   ScopedLock lock(process_wide_mutex_);
   if (default_isolate_ == NULL) {
     isolate_key_ = Thread::CreateThreadLocalKey();
     thread_id_key_ = Thread::CreateThreadLocalKey();
     per_isolate_thread_data_key_ = Thread::CreateThreadLocalKey();
     thread_data_table_ = new Isolate::ThreadDataTable();
     default_isolate_ = new Isolate();
   }
+  CHECK(default_isolate_->PreInit());
   // Can't use SetIsolateThreadLocals(default_isolate_, NULL) here
   // becase a non-null thread data may be already set.
-  Thread::SetThreadLocal(isolate_key_, default_isolate_);
-  CHECK(default_isolate_->PreInit());
+  if (Thread::GetThreadLocal(isolate_key_) == NULL) {
+    Thread::SetThreadLocal(isolate_key_, default_isolate_);
+  }
 }
 
 
 Debugger* Isolate::GetDefaultIsolateDebugger() {
   EnsureDefaultIsolate();
   return default_isolate_->debugger();
 }
 
 
 StackGuard* Isolate::GetDefaultIsolateStackGuard() {
@@ skipping 296 matching lines @@
   debug_ = NULL;
 #endif
 }
 
 
 bool Isolate::PreInit() {
   if (state_ != UNINITIALIZED) return true;
 
   TRACE_ISOLATE(preinit);
 
-  ASSERT(Isolate::Current() == this);

[Vitaly Repeshko, 2011/04/15 00:29:39]

Removing this is dangerous (at least for now), because passing and caching the
isolate pointer is an optimization and some code may still use
Isolate::Current() with hard to predict effects. Can you just set it in the
thread local slot like it's done in the de-initialization code? I know it's
ugly, but it's safer.

[Dmitry Lomov, 2011/04/19 01:50:47]

Done.

-
 #ifdef ENABLE_DEBUGGER_SUPPORT
   debug_ = new Debug(this);
   debugger_ = new Debugger();
   debugger_->isolate_ = this;
 #endif
 
   memory_allocator_ = new MemoryAllocator();
   memory_allocator_->isolate_ = this;
   code_range_ = new CodeRange();
   code_range_->isolate_ = this;
 
   // Safe after setting Heap::isolate_, initializing StackGuard and
   // ensuring that Isolate::Current() == this.
   heap_.SetStackLimits();
 
 #ifdef DEBUG
-  DisallowAllocationFailure disallow_allocation_failure;
+  DisallowAllocationFailure disallow_allocation_failure(&heap_);
 #endif
 
 #define C(name) isolate_addresses_[Isolate::k_##name] =                        \
     reinterpret_cast<Address>(name());
   ISOLATE_ADDRESS_LIST(C)
   ISOLATE_ADDRESS_LIST_PROF(C)
 #undef C
 
   string_tracker_ = new StringTracker();
   string_tracker_->isolate_ = this;
   thread_manager_ = new ThreadManager();
   thread_manager_->isolate_ = this;
   compilation_cache_ = new CompilationCache(this);
   transcendental_cache_ = new TranscendentalCache();
   keyed_lookup_cache_ = new KeyedLookupCache();
   context_slot_cache_ = new ContextSlotCache();
   descriptor_lookup_cache_ = new DescriptorLookupCache();
   unicode_cache_ = new UnicodeCache();
   pc_to_code_cache_ = new PcToCodeCache(this);
   write_input_buffer_ = new StringInputBuffer();
   global_handles_ = new GlobalHandles(this);
   bootstrapper_ = new Bootstrapper();
-  handle_scope_implementer_ = new HandleScopeImplementer();
+  handle_scope_implementer_ = new HandleScopeImplementer(this);
   stub_cache_ = new StubCache(this);
-  ast_sentinels_ = new AstSentinels();
   regexp_stack_ = new RegExpStack();
   regexp_stack_->isolate_ = this;
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
   producer_heap_profile_ = new ProducerHeapProfile();
   producer_heap_profile_->isolate_ = this;
 #endif
 
   state_ = PREINITIALIZED;
   return true;
 }
 
 
 void Isolate::InitializeThreadLocal() {
+  thread_local_top_.isolate_ = this;
   thread_local_top_.Initialize();
   clear_pending_exception();
   clear_pending_message();
   clear_scheduled_exception();
 }
 
 
 void Isolate::PropagatePendingExceptionToExternalTryCatch() {
   ASSERT(has_pending_exception());
 
@@ skipping 23 matching lines @@
 
 bool Isolate::Init(Deserializer* des) {
   ASSERT(state_ != INITIALIZED);
 
   TRACE_ISOLATE(init);
 
   bool create_heap_objects = des == NULL;
 
 #ifdef DEBUG
   // The initialization process does not handle memory exhaustion.
-  DisallowAllocationFailure disallow_allocation_failure;
+  DisallowAllocationFailure disallow_allocation_failure(&heap_);
 #endif
 
   if (state_ == UNINITIALIZED && !PreInit()) return false;
 
+  // AstSentinels initialization requires Isolate::Current to be set
+  ast_sentinels_ = new AstSentinels();
+
   // Enable logging before setting up the heap
   logger_->Setup();
 
   CpuProfiler::Setup();
   HeapProfiler::Setup();
 
   // Initialize other runtime facilities
 #if defined(USE_SIMULATOR)
 #if defined(V8_TARGET_ARCH_ARM) || defined(V8_TARGET_ARCH_MIPS)
   Simulator::Initialize();
@@ skipping 146 matching lines @@
 
 #ifdef DEBUG
 #define ISOLATE_FIELD_OFFSET(type, name, ignored)                       \
 const intptr_t Isolate::name##_debug_offset_ = OFFSET_OF(Isolate, name##_);
 ISOLATE_INIT_LIST(ISOLATE_FIELD_OFFSET)
 ISOLATE_INIT_ARRAY_LIST(ISOLATE_FIELD_OFFSET)
 #undef ISOLATE_FIELD_OFFSET
 #endif
 
 } }  // namespace v8::internal