src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp

rev 8910 : full patch for jfr

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2016, 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) 2014, 2019, 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.
*** 196,205 ****
--- 196,220 ----
      }
    }
    return dest(state);
  }
  
+ void G1ParScanThreadState::report_promotion_event(InCSetState const dest_state,
+                                                   oop const old, size_t word_sz, uint age,
+                                                   HeapWord * const obj_ptr, AllocationContext_t context) const {
+   assert(EnableJFR, "sanity check");
+   ParGCAllocBuffer* alloc_buf = _g1_par_allocator->alloc_buffer(dest_state, context);
+   if (alloc_buf->contains(obj_ptr)) {
+     _g1h->_gc_tracer_stw->report_promotion_in_new_plab_event(old->klass(), word_sz, age,
+                                                              dest_state.value() == InCSetState::Old,
+                                                              alloc_buf->word_sz());
+   } else {
+     _g1h->_gc_tracer_stw->report_promotion_outside_plab_event(old->klass(), word_sz, age,
+                                                               dest_state.value() == InCSetState::Old);
+   }
+ }
+ 
  oop G1ParScanThreadState::copy_to_survivor_space(InCSetState const state,
                                                   oop const old,
                                                   markOop const old_mark) {
    const size_t word_sz = old->size();
    HeapRegion* const from_region = _g1h->heap_region_containing_raw(old);
*** 223,232 ****
--- 238,251 ----
          // This will either forward-to-self, or detect that someone else has
          // installed a forwarding pointer.
          return _g1h->handle_evacuation_failure_par(this, old);
        }
      }
+     if (EnableJFR && _g1h->_gc_tracer_stw->should_report_promotion_events()) {
+       // The events are checked individually as part of the actual commit
+       report_promotion_event(dest_state, old, word_sz, age, obj_ptr, context);
+     }
    }
  
    assert(obj_ptr != NULL, "when we get here, allocation should have succeeded");
  #ifndef PRODUCT
    // Should this evacuation fail?