Merge isolates to bleeding_edge.

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
 //       with the distribution.
 //     * Neither the name of Google Inc. nor the names of its
 //       contributors may be used to endorse or promote products derived
 //       from this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <stdlib.h>
+#include "v8.h"
+#include "isolate.h"
+#include "allocation.h"
 
+/* TODO(isolates): this is what's included in bleeding_edge
+   including of v8.h was replaced with these in
+   http://codereview.chromium.org/5005001/
+   we need Isolate and Isolate needs a lot more so I'm including v8.h back.
 #include "../include/v8stdint.h"
 #include "globals.h"
 #include "checks.h"
 #include "allocation.h"
 #include "utils.h"
+*/
 
 namespace v8 {
 namespace internal {
 
+#ifdef DEBUG
+
+NativeAllocationChecker::NativeAllocationChecker(
+    NativeAllocationChecker::NativeAllocationAllowed allowed)
+    : allowed_(allowed) {
+  if (allowed == DISALLOW) {
+    Isolate* isolate = Isolate::Current();
+    isolate->set_allocation_disallowed(isolate->allocation_disallowed() + 1);
+  }
+}
+
+
+NativeAllocationChecker::~NativeAllocationChecker() {
+  Isolate* isolate = Isolate::Current();
+  if (allowed_ == DISALLOW) {
+    isolate->set_allocation_disallowed(isolate->allocation_disallowed() - 1);
+  }
+  ASSERT(isolate->allocation_disallowed() >= 0);
+}
+
+
+bool NativeAllocationChecker::allocation_allowed() {
+  // TODO(isolates): either find a way to make this work that doesn't
+  // require initializing an isolate before we can use malloc or drop
+  // it completely.
+  return true;
+  // return Isolate::Current()->allocation_disallowed() == 0;
+}
+
+#endif  // DEBUG
+
+
 void* Malloced::New(size_t size) {
   ASSERT(NativeAllocationChecker::allocation_allowed());
   void* result = malloc(size);
   if (result == NULL) {
     v8::internal::FatalProcessOutOfMemory("Malloced operator new");
   }
   return result;
 }
 
 
@@ skipping 47 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);
   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;
-
-
-void PreallocatedStorage::Init(size_t size) {
+void Isolate::PreallocatedStorageInit(size_t size) {
   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;
+  preallocated_storage_preallocated_ = true;
 }
 
 
-void* PreallocatedStorage::New(size_t size) {
-  if (!preallocated_) {
+void* Isolate::PreallocatedStorageNew(size_t size) {
+  if (!preallocated_storage_preallocated_) {
     return FreeStoreAllocationPolicy::New(size);
   }
   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_) {
@@ skipping 21 matching lines @@
       return reinterpret_cast<void*>(storage + 1);
     }
   }
   // Allocation failure.
   ASSERT(false);
   return NULL;
 }
 
 
 // We don't attempt to coalesce.
-void PreallocatedStorage::Delete(void* p) {
+void Isolate::PreallocatedStorageDelete(void* p) {
   if (p == NULL) {
     return;
   }
-  if (!preallocated_) {
+  if (!preallocated_storage_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_);
 }
 
@@ skipping 11 matching lines @@
   previous_->next_ = next_;
 }
 
 
 PreallocatedStorage::PreallocatedStorage(size_t size)
   : size_(size) {
   previous_ = next_ = this;
 }
 
 } }  // namespace v8::internal