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

rev 7474 : imported patch cleanup

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 34,66 ****
  //   - VM_G1CollectFull
  //   - VM_G1OperationWithAllocRequest
  //     - VM_G1CollectForAllocation
  //     - VM_G1IncCollectionPause
  
! class VM_G1OperationWithAllocRequest: public VM_GC_Operation {
  protected:
-   size_t    _word_size;
-   HeapWord* _result;
    bool      _pause_succeeded;
    AllocationContext_t _allocation_context;
  
  public:
!   VM_G1OperationWithAllocRequest(unsigned int gc_count_before,
                                   size_t       word_size,
                                   GCCause::Cause gc_cause)
!     : VM_GC_Operation(gc_count_before, gc_cause),
!       _word_size(word_size), _result(NULL), _pause_succeeded(false) { }
!   HeapWord* result() { return _result; }
    bool pause_succeeded() { return _pause_succeeded; }
    void set_allocation_context(AllocationContext_t context) { _allocation_context = context; }
    AllocationContext_t  allocation_context() { return _allocation_context; }
  };
  
  class VM_G1CollectFull: public VM_GC_Operation {
  public:
!   VM_G1CollectFull(unsigned int gc_count_before,
!                    unsigned int full_gc_count_before,
                     GCCause::Cause cause)
      : VM_GC_Operation(gc_count_before, cause, full_gc_count_before, true) { }
    virtual VMOp_Type type() const { return VMOp_G1CollectFull; }
    virtual void doit();
    virtual const char* name() const {
--- 34,63 ----
  //   - VM_G1CollectFull
  //   - VM_G1OperationWithAllocRequest
  //     - VM_G1CollectForAllocation
  //     - VM_G1IncCollectionPause
  
! class VM_G1OperationWithAllocRequest : public VM_CollectForAllocation {
  protected:
    bool      _pause_succeeded;
    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),
!       _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; }
  };
  
  class VM_G1CollectFull: public VM_GC_Operation {
  public:
!   VM_G1CollectFull(uint gc_count_before,
!                    uint full_gc_count_before,
                     GCCause::Cause cause)
      : VM_GC_Operation(gc_count_before, cause, full_gc_count_before, true) { }
    virtual VMOp_Type type() const { return VMOp_G1CollectFull; }
    virtual void doit();
    virtual const char* name() const {
*** 68,78 ****
    }
  };
  
  class VM_G1CollectForAllocation: public VM_G1OperationWithAllocRequest {
  public:
!   VM_G1CollectForAllocation(unsigned int gc_count_before,
                              size_t       word_size);
    virtual VMOp_Type type() const { return VMOp_G1CollectForAllocation; }
    virtual void doit();
    virtual const char* name() const {
      return "garbage-first collection to satisfy allocation";
--- 65,75 ----
    }
  };
  
  class VM_G1CollectForAllocation: public VM_G1OperationWithAllocRequest {
  public:
!   VM_G1CollectForAllocation(uint         gc_count_before,
                              size_t       word_size);
    virtual VMOp_Type type() const { return VMOp_G1CollectForAllocation; }
    virtual void doit();
    virtual const char* name() const {
      return "garbage-first collection to satisfy allocation";
*** 82,94 ****
  class VM_G1IncCollectionPause: public VM_G1OperationWithAllocRequest {
  private:
    bool         _should_initiate_conc_mark;
    bool         _should_retry_gc;
    double       _target_pause_time_ms;
!   unsigned int _old_marking_cycles_completed_before;
  public:
!   VM_G1IncCollectionPause(unsigned int   gc_count_before,
                            size_t         word_size,
                            bool           should_initiate_conc_mark,
                            double         target_pause_time_ms,
                            GCCause::Cause gc_cause);
    virtual VMOp_Type type() const { return VMOp_G1IncCollectionPause; }
--- 79,91 ----
  class VM_G1IncCollectionPause: public VM_G1OperationWithAllocRequest {
  private:
    bool         _should_initiate_conc_mark;
    bool         _should_retry_gc;
    double       _target_pause_time_ms;
!   uint         _old_marking_cycles_completed_before;
  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);
    virtual VMOp_Type type() const { return VMOp_G1IncCollectionPause; }