src/share/vm/gc_implementation/g1/vm_operations_g1.hpp

rev 8024 : imported patch event1
* * *
imported patch event2

@@ -42,12 +42,13 @@
   AllocationContext_t _allocation_context;
 
 public:
   VM_G1OperationWithAllocRequest(uint           gc_count_before,
                                  size_t         word_size,
-                                 GCCause::Cause gc_cause)
-    : VM_CollectForAllocation(word_size, gc_count_before, gc_cause),
+                                 GCCause::Cause gc_cause,
+                                 uint           gc_attempt)
+    : VM_CollectForAllocation(word_size, gc_count_before, gc_cause, gc_attempt),
       _pause_succeeded(false) {}
   bool pause_succeeded() { return _pause_succeeded; }
   void set_allocation_context(AllocationContext_t context) { _allocation_context = context; }
   AllocationContext_t  allocation_context() { return _allocation_context; }
 };

@@ -66,11 +67,12 @@
 };
 
 class VM_G1CollectForAllocation: public VM_G1OperationWithAllocRequest {
 public:
   VM_G1CollectForAllocation(uint         gc_count_before,
-                            size_t       word_size);
+                            size_t       word_size,
+                            uint         gc_attempt);
   virtual VMOp_Type type() const { return VMOp_G1CollectForAllocation; }
   virtual void doit();
   virtual const char* name() const {
     return "garbage-first collection to satisfy allocation";
   }

@@ -85,11 +87,12 @@
 public:
   VM_G1IncCollectionPause(uint           gc_count_before,
                           size_t         word_size,
                           bool           should_initiate_conc_mark,
                           double         target_pause_time_ms,
-                          GCCause::Cause gc_cause);
+                          GCCause::Cause gc_cause,
+                          uint           gc_attempt = 0);
   virtual VMOp_Type type() const { return VMOp_G1IncCollectionPause; }
   virtual bool doit_prologue();
   virtual void doit();
   virtual void doit_epilogue();
   virtual const char* name() const {