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

src/allocation.cc

 // Copyright 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 35 matching lines @@
 }
 
 
 void Malloced::FatalProcessOutOfMemory() {
   V8::FatalProcessOutOfMemory("Out of memory");
 }
 
 
 #ifdef DEBUG
 
-static void* invalid = static_cast<void*>(NULL);
+static void* const invalid = static_cast<void*>(NULL);
 
 void* Embedded::operator new(size_t size) {
   UNREACHABLE();
   return invalid;
 }
 
 
 void Embedded::operator delete(void* p) {
   UNREACHABLE();
 }
@@ skipping 23 matching lines @@
 
 char* StrNDup(const char* str, int n) {
   int length = StrLength(str);
   if (n < length) length = n;
   char* result = NewArray<char>(length + 1);
   memcpy(result, str, length * kCharSize);
   result[length] = '\0';
   return result;
 }
 
-
-int NativeAllocationChecker::allocation_disallowed_ = 0;
-
-
-PreallocatedStorage PreallocatedStorage::in_use_list_(0);
-PreallocatedStorage PreallocatedStorage::free_list_(0);
-bool PreallocatedStorage::preallocated_ = false;
+StorageData::StorageData()
+  :in_use_list_(0),
+  free_list_(0),
+  preallocated_(false),
+  #ifdef DEBUG
+  rset_used_(true),
+  #endif
+  allocation_disallowed_(0) {
+}
 
 
 void PreallocatedStorage::Init(size_t size) {
+  StorageData& storage_data = v8_context()->storage_data_;
+  PreallocatedStorage & free_list_ = storage_data.free_list_;
   ASSERT(free_list_.next_ == &free_list_);
   ASSERT(free_list_.previous_ == &free_list_);
   PreallocatedStorage* free_chunk =
       reinterpret_cast<PreallocatedStorage*>(new char[size]);
   free_list_.next_ = free_list_.previous_ = free_chunk;
   free_chunk->next_ = free_chunk->previous_ = &free_list_;
   free_chunk->size_ = size - sizeof(PreallocatedStorage);
-  preallocated_ = true;
+  storage_data.preallocated_ = true;
 }
 
 
 void* PreallocatedStorage::New(size_t size) {
-  if (!preallocated_) {
+  StorageData& storage_data = v8_context()->storage_data_;
+
+  if (!storage_data.preallocated_) {
     return FreeStoreAllocationPolicy::New(size);
   }
+
+  PreallocatedStorage & free_list_ = storage_data.free_list_;
+  PreallocatedStorage & in_use_list_ = storage_data.in_use_list_;
+
   ASSERT(free_list_.next_ != &free_list_);
   ASSERT(free_list_.previous_ != &free_list_);
   size = (size + kPointerSize - 1) & ~(kPointerSize - 1);
   // Search for exact fit.
   for (PreallocatedStorage* storage = free_list_.next_;
        storage != &free_list_;
        storage = storage->next_) {
     if (storage->size_ == size) {
       storage->Unlink();
       storage->LinkTo(&in_use_list_);
@@ skipping 22 matching lines @@
   ASSERT(false);
   return NULL;
 }
 
 
 // We don't attempt to coalesce.
 void PreallocatedStorage::Delete(void* p) {
   if (p == NULL) {
     return;
   }
-  if (!preallocated_) {
+  StorageData& storage_data = v8_context()->storage_data_;
+  if (!storage_data.preallocated_) {
     FreeStoreAllocationPolicy::Delete(p);
     return;
   }
   PreallocatedStorage* storage = reinterpret_cast<PreallocatedStorage*>(p) - 1;
   ASSERT(storage->next_->previous_ == storage);
   ASSERT(storage->previous_->next_ == storage);
   storage->Unlink();
-  storage->LinkTo(&free_list_);
+  storage->LinkTo(&storage_data.free_list_);
 }
 
 
 void PreallocatedStorage::LinkTo(PreallocatedStorage* other) {
   next_ = other->next_;
   other->next_->previous_ = this;
   previous_ = other;
   other->next_ = this;
 }
 
 
 void PreallocatedStorage::Unlink() {
   next_->previous_ = previous_;
   previous_->next_ = next_;
 }
 
 
 PreallocatedStorage::PreallocatedStorage(size_t size)
   : size_(size) {
   previous_ = next_ = this;
 }
 
 } }  // namespace v8::internal