Rollback trunk to bleeding_edge revision 12525

src/incremental-marking.h

 // Copyright 2012 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 77 matching lines @@
   void Finalize();
 
   void Abort();
 
   void MarkingComplete(CompletionAction action);
 
   // It's hard to know how much work the incremental marker should do to make
   // progress in the face of the mutator creating new work for it.  We start
   // of at a moderate rate of work and gradually increase the speed of the
   // incremental marker until it completes.
-  // Do some marking every time this much memory has been allocated or that many
-  // heavy (color-checking) write barriers have been invoked.
+  // Do some marking every time this much memory has been allocated.
   static const intptr_t kAllocatedThreshold = 65536;
-  static const intptr_t kWriteBarriersInvokedThreshold = 65536;
   // Start off by marking this many times more memory than has been allocated.
-  static const intptr_t kInitialMarkingSpeed = 1;
+  static const intptr_t kInitialAllocationMarkingFactor = 1;
   // But if we are promoting a lot of data we need to mark faster to keep up
   // with the data that is entering the old space through promotion.
   static const intptr_t kFastMarking = 3;
   // After this many steps we increase the marking/allocating factor.
-  static const intptr_t kMarkingSpeedAccellerationInterval = 1024;
+  static const intptr_t kAllocationMarkingFactorSpeedupInterval = 1024;
   // This is how much we increase the marking/allocating factor by.
-  static const intptr_t kMarkingSpeedAccelleration = 2;
-  static const intptr_t kMaxMarkingSpeed = 1000;
+  static const intptr_t kAllocationMarkingFactorSpeedup = 2;
+  static const intptr_t kMaxAllocationMarkingFactor = 1000;
 
   void OldSpaceStep(intptr_t allocated) {
-    Step(allocated * kFastMarking / kInitialMarkingSpeed,
+    Step(allocated * kFastMarking / kInitialAllocationMarkingFactor,
          GC_VIA_STACK_GUARD);
   }
 
   void Step(intptr_t allocated, CompletionAction action);
 
   inline void RestartIfNotMarking() {
     if (state_ == COMPLETE) {
       state_ = MARKING;
       if (FLAG_trace_incremental_marking) {
         PrintF("[IncrementalMarking] Restarting (new grey objects)\n");
       }
     }
   }
 
   static void RecordWriteFromCode(HeapObject* obj,
                                   Object* value,
                                   Isolate* isolate);
 
   static void RecordWriteForEvacuationFromCode(HeapObject* obj,
                                                Object** slot,
                                                Isolate* isolate);
 
   // Record a slot for compaction.  Returns false for objects that are
   // guaranteed to be rescanned or not guaranteed to survive.
   //
   // No slots in white objects should be recorded, as some slots are typed and
-  // cannot be interpreted correctly if the underlying object does not survive
+  // cannot be interpreted corrrectly if the underlying object does not survive
   // the incremental cycle (stays white).
   INLINE(bool BaseRecordWrite(HeapObject* obj, Object** slot, Object* value));
   INLINE(void RecordWrite(HeapObject* obj, Object** slot, Object* value));
   INLINE(void RecordWriteIntoCode(HeapObject* obj,
                                   RelocInfo* rinfo,
                                   Object* value));
   INLINE(void RecordWriteOfCodeEntry(JSFunction* host,
                                      Object** slot,
                                      Code* value));
 
@@ skipping 18 matching lines @@
     ASSERT(!Marking::IsImpossible(mark_bit));
     if (mark_bit.Get()) {
       // Grey or black: Keep the color.
       return false;
     }
     mark_bit.Set();
     ASSERT(Marking::IsBlack(mark_bit));
     return true;
   }
 
+  // Marks the object grey and pushes it on the marking stack.
+  // Returns true if object needed marking and false otherwise.
+  // This is for incremental marking only.
+  INLINE(bool MarkObjectAndPush(HeapObject* obj));
+
+  // Marks the object black without pushing it on the marking stack.
+  // Returns true if object needed marking and false otherwise.
+  // This is for incremental marking only.
+  INLINE(bool MarkObjectWithoutPush(HeapObject* obj));
+
   inline int steps_count() {
     return steps_count_;
   }
 
   inline double steps_took() {
     return steps_took_;
   }
 
   inline double longest_step() {
     return longest_step_;
@@ skipping 16 matching lines @@
   }
 
   MarkingDeque* marking_deque() { return &marking_deque_; }
 
   bool IsCompacting() { return IsMarking() && is_compacting_; }
 
   void ActivateGeneratedStub(Code* stub);
 
   void NotifyOfHighPromotionRate() {
     if (IsMarking()) {
-      if (marking_speed_ < kFastMarking) {
+      if (allocation_marking_factor_ < kFastMarking) {
         if (FLAG_trace_gc) {
           PrintPID("Increasing marking speed to %d "
                    "due to high promotion rate\n",
                    static_cast<int>(kFastMarking));
         }
-        marking_speed_ = kFastMarking;
+        allocation_marking_factor_ = kFastMarking;
       }
     }
   }
 
   void EnterNoMarkingScope() {
     no_marking_scope_depth_++;
   }
 
   void LeaveNoMarkingScope() {
     no_marking_scope_depth_--;
@@ skipping 27 matching lines @@
   void EnsureMarkingDequeIsCommitted();
 
   Heap* heap_;
 
   State state_;
   bool is_compacting_;
 
   VirtualMemory* marking_deque_memory_;
   bool marking_deque_memory_committed_;
   MarkingDeque marking_deque_;
+  Marker<IncrementalMarking> marker_;
 
   int steps_count_;
   double steps_took_;
   double longest_step_;
   int64_t old_generation_space_available_at_start_of_incremental_;
   int64_t old_generation_space_used_at_start_of_incremental_;
   int steps_count_since_last_gc_;
   double steps_took_since_last_gc_;
   int64_t bytes_rescanned_;
   bool should_hurry_;
-  int marking_speed_;
+  int allocation_marking_factor_;
   intptr_t bytes_scanned_;
   intptr_t allocated_;
-  intptr_t write_barriers_invoked_since_last_step_;
 
   int no_marking_scope_depth_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IncrementalMarking);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_INCREMENTAL_MARKING_H_