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

src/zone.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 67 matching lines @@
 
   // Never allocate segments smaller than this size in bytes.
   static const int kMinimumSegmentSize = 8 * KB;
 
   // Never allocate segments larger than this size in bytes.
   static const int kMaximumSegmentSize = 1 * MB;
 
   // Never keep segments larger than this size in bytes around.
   static const int kMaximumKeptSegmentSize = 64 * KB;
 
-  // Report zone excess when allocation exceeds this limit.
-  static int zone_excess_limit_;
-
-  // The number of bytes allocated in segments.  Note that this number
-  // includes memory allocated from the OS but not yet allocated from
-  // the zone.
-  static int segment_bytes_allocated_;
-
   // The Zone is intentionally a singleton; you should not try to
   // allocate instances of the class.
   Zone() { UNREACHABLE(); }
 
 
   // Expand the Zone to hold at least 'size' more bytes and allocate
   // the bytes. Returns the address of the newly allocated chunk of
   // memory in the Zone. Should only be called if there isn't enough
   // room in the Zone already.
   static Address NewExpand(int size);
+};
 
+class Segment;
+class ZoneData {
+  friend class Zone;
+
+  // Report zone excess when allocation exceeds this limit.
+  int zone_excess_limit_;
+
+  // The number of bytes allocated in segments.  Note that this number
+  // includes memory allocated from the OS but not yet allocated from
+  // the zone.
+  int segment_bytes_allocated_;
 
   // The free region in the current (front) segment is represented as
   // the half-open interval [position, limit). The 'position' variable
   // is guaranteed to be aligned as dictated by kAlignment.
-  static Address position_;
-  static Address limit_;
+  Address position_;
+  Address limit_;
+
+  Segment* head_;
+  int bytes_allocated_;
+  int nesting_;
+  bool allow_allocation_;
+
+  ZoneData();
+
+  friend class V8Context;
+  friend class ZoneScope;
+  friend class AssertNoZoneAllocation;
+  friend class Zone;
+  friend class Segment;
+
+  DISALLOW_COPY_AND_ASSIGN(ZoneData);
 };
 
-
 // ZoneObject is an abstraction that helps define classes of objects
 // allocated in the Zone. Use it as a base class; see ast.h.
 class ZoneObject {
  public:
   // Allocate a new ZoneObject of 'size' bytes in the Zone.
   void* operator new(size_t size) { return Zone::New(static_cast<int>(size)); }
 
   // Ideally, the delete operator should be private instead of
   // public, but unfortunately the compiler sometimes synthesizes
   // (unused) destructors for classes derived from ZoneObject, which
   // require the operator to be visible. MSVC requires the delete
   // operator to be public.
 
   // ZoneObjects should never be deleted individually; use
   // Zone::DeleteAll() to delete all zone objects in one go.
   void operator delete(void*, size_t) { UNREACHABLE(); }
 };
 
 
 class AssertNoZoneAllocation {
  public:
-  AssertNoZoneAllocation() : prev_(allow_allocation_) {
-    allow_allocation_ = false;
+  AssertNoZoneAllocation() {
+    V8Context* const v8context = v8_context();
+    prev_ = v8context->zone_data_.allow_allocation_;
+    v8context->zone_data_.allow_allocation_ = false;
   }
-  ~AssertNoZoneAllocation() { allow_allocation_ = prev_; }
-  static bool allow_allocation() { return allow_allocation_; }
+  ~AssertNoZoneAllocation() {
+    v8_context()->zone_data_.allow_allocation_ = prev_;
+  }
+  static bool allow_allocation(const ZoneData& zone_data) {
+    return zone_data.allow_allocation_;
+  }
  private:
   bool prev_;
-  static bool allow_allocation_;
 };
 
-
 // The ZoneListAllocationPolicy is used to specialize the GenericList
 // implementation to allocate ZoneLists and their elements in the
 // Zone.
 class ZoneListAllocationPolicy {
  public:
   // Allocate 'size' bytes of memory in the zone.
   static void* New(int size) {  return Zone::New(size); }
 
   // De-allocation attempts are silently ignored.
   static void Delete(void* p) { }
@@ skipping 13 matching lines @@
       : List<T, ZoneListAllocationPolicy>(capacity) { }
 };
 
 
 // ZoneScopes keep track of the current parsing and compilation
 // nesting and cleans up generated ASTs in the Zone when exiting the
 // outer-most scope.
 class ZoneScope BASE_EMBEDDED {
  public:
   explicit ZoneScope(ZoneScopeMode mode) : mode_(mode) {
-    nesting_++;
+    v8_context()->zone_data_.nesting_++;
   }
 
   virtual ~ZoneScope() {
     if (ShouldDeleteOnExit()) Zone::DeleteAll();
-    --nesting_;
+    --v8_context()->zone_data_.nesting_;
   }
 
   bool ShouldDeleteOnExit() {
-    return nesting_ == 1 && mode_ == DELETE_ON_EXIT;
+    return v8_context()->zone_data_.nesting_ == 1 && mode_ == DELETE_ON_EXIT;
   }
 
   // For ZoneScopes that do not delete on exit by default, call this
   // method to request deletion on exit.
   void DeleteOnExit() {
     mode_ = DELETE_ON_EXIT;
   }
 
-  static int nesting() { return nesting_; }
+  static int nesting(const ZoneData& zone_data) { return zone_data.nesting_; }
 
  private:
   ZoneScopeMode mode_;
-  static int nesting_;
 };
 
 
 // A zone splay tree.  The config type parameter encapsulates the
 // different configurations of a concrete splay tree:
 //
 //   typedef Key: the key type
 //   typedef Value: the value type
 //   static const kNoKey: the dummy key used when no key is set
 //   static const kNoValue: the dummy value used to initialize nodes
@@ skipping 82 matching lines @@
   void ForEach(Callback* callback);
 
  private:
   Node* root_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_ZONE_H_