Patch for allowing several V8 instances in process:...

src/top.h

 // Copyright 2006-2008 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 25 matching lines @@
 
 #define RETURN_IF_SCHEDULED_EXCEPTION() \
   if (Top::has_scheduled_exception()) return Top::PromoteScheduledException()
 
 // Top has static variables used for JavaScript execution.
 
 class SaveContext;  // Forward declaration.
 
 class ThreadLocalTop BASE_EMBEDDED {
  public:
+  ThreadLocalTop();
   // Initialize the thread data.
   void Initialize();
 
   // Get the top C++ try catch handler or NULL if none are registered.
   //
   // This method is not guarenteed to return an address that can be
   // used for comparison with addresses into the JS stack.  If such an
   // address is needed, use try_catch_handler_address.
   v8::TryCatch* TryCatchHandler();
 
@@ skipping 52 matching lines @@
   inline void set_stack_is_cooked(bool value) { stack_is_cooked_ = value; }
 
   // Generated code scratch locations.
   int32_t formal_count_;
 
   // Call back function to report unsafe JS accesses.
   v8::FailedAccessCheckCallback failed_access_check_callback_;
 
  private:
   Address try_catch_handler_address_;
+  DISALLOW_COPY_AND_ASSIGN(ThreadLocalTop);
 };
 
 #define TOP_ADDRESS_LIST(C)            \
   C(handler_address)                   \
   C(c_entry_fp_address)                \
   C(context_address)                   \
   C(pending_exception_address)         \
   C(external_caught_exception_address)
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
 #define TOP_ADDRESS_LIST_PROF(C)       \
   C(js_entry_sp_address)
 #else
 #define TOP_ADDRESS_LIST_PROF(C)
 #endif
 
+class TopPrivateData;
+
+class TopData {
+  // The context that initiated this JS execution.
+  ThreadLocalTop thread_local_;
+
+  // Debug.
+  // Mutex for serializing access to break control structures.
+  Mutex* break_access_;
+
+  TopPrivateData* top_private_data_;
+  TopData();
+
+  friend class Top;
+  friend class TopPrivateData;
+  friend class ExecutionAccess;
+  friend class V8Context;
+  DISALLOW_COPY_AND_ASSIGN(TopData);
+};
 
 class Top {
  public:
   enum AddressId {
 #define C(name) k_##name,
     TOP_ADDRESS_LIST(C)
     TOP_ADDRESS_LIST_PROF(C)
 #undef C
     k_top_address_count
   };
 
   static Address get_address_from_id(AddressId id);
 
   // Access to top context (where the current function object was created).
-  static Context* context() { return thread_local_.context_; }
+  static Context* context() {
+    return v8_context()->top_data_.thread_local_.context_;
+  }
   static void set_context(Context* context) {
-    thread_local_.context_ = context;
+    v8_context()->top_data_.thread_local_.context_ = context;
   }
-  static Context** context_address() { return &thread_local_.context_; }
+  static Context** context_address() {
+    return &v8_context()->top_data_.thread_local_.context_;
+  }
 
-  static SaveContext* save_context() {return thread_local_.save_context_; }
+  static SaveContext* save_context() {
+    return v8_context()->top_data_.thread_local_.save_context_;
+  }
   static void set_save_context(SaveContext* save) {
-    thread_local_.save_context_ = save;
+    v8_context()->top_data_.thread_local_.save_context_ = save;
   }
 
   // Access to current thread id.
-  static int thread_id() { return thread_local_.thread_id_; }
-  static void set_thread_id(int id) { thread_local_.thread_id_ = id; }
+  static int thread_id() {
+    return v8_context()->top_data_.thread_local_.thread_id_;
+  }
+  static void set_thread_id(int id) {
+    v8_context()->top_data_.thread_local_.thread_id_ = id;
+  }
 
   // Interface to pending exception.
   static Object* pending_exception() {
     ASSERT(has_pending_exception());
-    return thread_local_.pending_exception_;
+    return v8_context()->top_data_.thread_local_.pending_exception_;
   }
   static bool external_caught_exception() {
-    return thread_local_.external_caught_exception_;
+    return v8_context()->top_data_.thread_local_.external_caught_exception_;
   }
   static void set_pending_exception(Object* exception) {
-    thread_local_.pending_exception_ = exception;
+    v8_context()->top_data_.thread_local_.pending_exception_ = exception;
   }
   static void clear_pending_exception() {
-    thread_local_.pending_exception_ = Heap::the_hole_value();
+    v8_context()->top_data_.thread_local_.pending_exception_ =
+      Heap::the_hole_value();
   }
 
   static Object** pending_exception_address() {
-    return &thread_local_.pending_exception_;
+    return &v8_context()->top_data_.thread_local_.pending_exception_;
   }
   static bool has_pending_exception() {
-    return !thread_local_.pending_exception_->IsTheHole();
+    return !v8_context()->top_data_.thread_local_.pending_exception_->
+      IsTheHole();
   }
   static void clear_pending_message() {
-    thread_local_.has_pending_message_ = false;
-    thread_local_.pending_message_ = NULL;
-    thread_local_.pending_message_obj_ = Heap::the_hole_value();
-    thread_local_.pending_message_script_ = NULL;
+    ThreadLocalTop& thread_local = v8_context()->top_data_.thread_local_;
+    thread_local.has_pending_message_ = false;
+    thread_local.pending_message_ = NULL;
+    thread_local.pending_message_obj_ = Heap::the_hole_value();
+    thread_local.pending_message_script_ = NULL;
   }
   static v8::TryCatch* try_catch_handler() {
-    return thread_local_.TryCatchHandler();
+    return v8_context()->top_data_.thread_local_.TryCatchHandler();
   }
   static Address try_catch_handler_address() {
-    return thread_local_.try_catch_handler_address();
+    return v8_context()->top_data_.thread_local_.try_catch_handler_address();
   }
   // This method is called by the api after operations that may throw
   // exceptions.  If an exception was thrown and not handled by an external
   // handler the exception is scheduled to be rethrown when we return to running
   // JavaScript code.  If an exception is scheduled true is returned.
   static bool OptionalRescheduleException(bool is_bottom_call);
 
 
   static bool* external_caught_exception_address() {
-    return &thread_local_.external_caught_exception_;
+    return &v8_context()->top_data_.thread_local_.external_caught_exception_;
   }
 
   static Object** scheduled_exception_address() {
-    return &thread_local_.scheduled_exception_;
+    return &v8_context()->top_data_.thread_local_.scheduled_exception_;
   }
 
   static Object* scheduled_exception() {
     ASSERT(has_scheduled_exception());
-    return thread_local_.scheduled_exception_;
+    return v8_context()->top_data_.thread_local_.scheduled_exception_;
   }
   static bool has_scheduled_exception() {
-    return !thread_local_.scheduled_exception_->IsTheHole();
+    return !v8_context()->top_data_.thread_local_.scheduled_exception_->
+      IsTheHole();
   }
   static void clear_scheduled_exception() {
-    thread_local_.scheduled_exception_ = Heap::the_hole_value();
+    v8_context()->top_data_.thread_local_.scheduled_exception_ =
+      Heap::the_hole_value();
   }
 
   static void setup_external_caught() {
-    thread_local_.external_caught_exception_ =
+    ThreadLocalTop& thread_local = v8_context()->top_data_.thread_local_;
+    thread_local.external_caught_exception_ =
         has_pending_exception() &&
-        (thread_local_.catcher_ != NULL) &&
-        (try_catch_handler() == thread_local_.catcher_);
+        (thread_local.catcher_ != NULL) &&
+        (try_catch_handler() == thread_local.catcher_);
   }
 
   // Tells whether the current context has experienced an out of memory
   // exception.
   static bool is_out_of_memory();
 
   // JS execution stack (see frames.h).
   static Address c_entry_fp(ThreadLocalTop* thread) {
     return thread->c_entry_fp_;
   }
   static Address handler(ThreadLocalTop* thread) { return thread->handler_; }
 
   static inline Address* c_entry_fp_address() {
-    return &thread_local_.c_entry_fp_;
+    return &v8_context()->top_data_.thread_local_.c_entry_fp_;
   }
-  static inline Address* handler_address() { return &thread_local_.handler_; }
+  static inline Address* handler_address() {
+    return &v8_context()->top_data_.thread_local_.handler_;
+  }
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
   // Bottom JS entry (see StackTracer::Trace in log.cc).
   static Address js_entry_sp(ThreadLocalTop* thread) {
     return thread->js_entry_sp_;
   }
   static inline Address* js_entry_sp_address() {
-    return &thread_local_.js_entry_sp_;
+    return &v8_context()->top_data_.thread_local_.js_entry_sp_;
   }
 #endif
 
   // Generated code scratch locations.
-  static void* formal_count_address() { return &thread_local_.formal_count_; }
+  static void* formal_count_address() {
+    return &v8_context()->top_data_.thread_local_.formal_count_;
+  }
 
   static void MarkCompactPrologue(bool is_compacting);
   static void MarkCompactEpilogue(bool is_compacting);
   static void MarkCompactPrologue(bool is_compacting,
                                   char* archived_thread_data);
   static void MarkCompactEpilogue(bool is_compacting,
                                   char* archived_thread_data);
   static void PrintCurrentStackTrace(FILE* out);
   static void PrintStackTrace(FILE* out, char* thread_data);
   static void PrintStack(StringStream* accumulator);
@@ skipping 66 matching lines @@
   }
 
   // Returns the current global context.
   static Handle<Context> global_context();
 
   // Returns the global context of the calling JavaScript code.  That
   // is, the global context of the top-most JavaScript frame.
   static Handle<Context> GetCallingGlobalContext();
 
   static Handle<JSBuiltinsObject> builtins() {
-    return Handle<JSBuiltinsObject>(thread_local_.context_->builtins());
+    return Handle<JSBuiltinsObject>(
+      v8_context()->top_data_.thread_local_.context_->builtins());
   }
 
   static Object* LookupSpecialFunction(JSObject* receiver,
                                        JSObject* prototype,
                                        JSFunction* value);
 
   static void RegisterTryCatchHandler(v8::TryCatch* that);
   static void UnregisterTryCatchHandler(v8::TryCatch* that);
 
 #define TOP_GLOBAL_CONTEXT_FIELD_ACCESSOR(index, type, name)  \
   static Handle<type> name() {                                \
     return Handle<type>(context()->global_context()->name()); \
   }
   GLOBAL_CONTEXT_FIELDS(TOP_GLOBAL_CONTEXT_FIELD_ACCESSOR)
 #undef TOP_GLOBAL_CONTEXT_FIELD_ACCESSOR
 
-  static inline ThreadLocalTop* GetCurrentThread() { return &thread_local_; }
+  static inline ThreadLocalTop* GetCurrentThread() {
+    return &v8_context()->top_data_.thread_local_;
+  }
   static int ArchiveSpacePerThread() { return sizeof(ThreadLocalTop); }
   static char* ArchiveThread(char* to);
   static char* RestoreThread(char* from);
-  static void FreeThreadResources() { thread_local_.Free(); }
+  static void FreeThreadResources() {
+    v8_context()->top_data_.thread_local_.Free();
+  }
 
   static const char* kStackOverflowMessage;
 
  private:
-  // The context that initiated this JS execution.
-  static ThreadLocalTop thread_local_;
   static void InitializeThreadLocal();
   static void PrintStackTrace(FILE* out, ThreadLocalTop* thread);
   static void MarkCompactPrologue(bool is_compacting,
                                   ThreadLocalTop* archived_thread_data);
   static void MarkCompactEpilogue(bool is_compacting,
                                   ThreadLocalTop* archived_thread_data);
 
-  // Debug.
-  // Mutex for serializing access to break control structures.
-  static Mutex* break_access_;
-
   friend class SaveContext;
   friend class AssertNoContextChange;
   friend class ExecutionAccess;
 
+  static void PostConstruct();
+  static void PreDestroy();
   static void FillCache();
+
+  friend class V8Context;
 };
 
 
 // If the GCC version is 4.1.x or 4.2.x an additional field is added to the
 // class as a work around for a bug in the generated code found with these
 // versions of GCC. See V8 issue 122 for details.
 class SaveContext BASE_EMBEDDED {
  public:
   SaveContext()
       : context_(Top::context()),
@@ skipping 54 matching lines @@
 
 class ExecutionAccess BASE_EMBEDDED {
  public:
   ExecutionAccess();
   ~ExecutionAccess();
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_TOP_H_