src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp

rev 4773 : 8005849: JEP 167: Event-Based JVM Tracing
Reviewed-by: acorn, coleenp, sla
Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>

*** 1,7 ****
  /*
!  * Copyright (c) 2002, 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) 2002, 2013, 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.
*** 25,34 ****
--- 25,35 ----
  #include "precompiled.hpp"
  #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
  #include "gc_implementation/parallelScavenge/psOldGen.hpp"
  #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
  #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
+ #include "gc_implementation/shared/gcTrace.hpp"
  #include "gc_implementation/shared/mutableSpace.hpp"
  #include "memory/memRegion.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/oop.psgc.inline.hpp"
  
*** 47,57 ****
    assert(_manager_array == NULL, "Attempt to initialize twice");
    _manager_array = NEW_C_HEAP_ARRAY(PSPromotionManager*, ParallelGCThreads+1, mtGC);
    guarantee(_manager_array != NULL, "Could not initialize promotion manager");
  
    _stack_array_depth = new OopStarTaskQueueSet(ParallelGCThreads);
!   guarantee(_stack_array_depth != NULL, "Cound not initialize promotion manager");
  
    // Create and register the PSPromotionManager(s) for the worker threads.
    for(uint i=0; i<ParallelGCThreads; i++) {
      _manager_array[i] = new PSPromotionManager();
      guarantee(_manager_array[i] != NULL, "Could not create PSPromotionManager");
--- 48,58 ----
    assert(_manager_array == NULL, "Attempt to initialize twice");
    _manager_array = NEW_C_HEAP_ARRAY(PSPromotionManager*, ParallelGCThreads+1, mtGC);
    guarantee(_manager_array != NULL, "Could not initialize promotion manager");
  
    _stack_array_depth = new OopStarTaskQueueSet(ParallelGCThreads);
!   guarantee(_stack_array_depth != NULL, "Could not initialize promotion manager");
  
    // Create and register the PSPromotionManager(s) for the worker threads.
    for(uint i=0; i<ParallelGCThreads; i++) {
      _manager_array[i] = new PSPromotionManager();
      guarantee(_manager_array[i] != NULL, "Could not create PSPromotionManager");
*** 84,100 ****
    for(uint i=0; i<ParallelGCThreads+1; i++) {
      manager_array(i)->reset();
    }
  }
  
! void PSPromotionManager::post_scavenge() {
    TASKQUEUE_STATS_ONLY(if (PrintGCDetails && ParallelGCVerbose) print_stats());
    for (uint i = 0; i < ParallelGCThreads + 1; i++) {
      PSPromotionManager* manager = manager_array(i);
      assert(manager->claimed_stack_depth()->is_empty(), "should be empty");
      manager->flush_labs();
    }
  }
  
  #if TASKQUEUE_STATS
  void
  PSPromotionManager::print_taskqueue_stats(uint i) const {
--- 85,108 ----
    for(uint i=0; i<ParallelGCThreads+1; i++) {
      manager_array(i)->reset();
    }
  }
  
! bool PSPromotionManager::post_scavenge(YoungGCTracer& gc_tracer) {
!   bool promotion_failure_occurred = false;
! 
    TASKQUEUE_STATS_ONLY(if (PrintGCDetails && ParallelGCVerbose) print_stats());
    for (uint i = 0; i < ParallelGCThreads + 1; i++) {
      PSPromotionManager* manager = manager_array(i);
      assert(manager->claimed_stack_depth()->is_empty(), "should be empty");
+     if (manager->_promotion_failed_info.has_failed()) {
+       gc_tracer.report_promotion_failed(manager->_promotion_failed_info);
+       promotion_failure_occurred = true;
+     }
      manager->flush_labs();
    }
+   return promotion_failure_occurred;
  }
  
  #if TASKQUEUE_STATS
  void
  PSPromotionManager::print_taskqueue_stats(uint i) const {
*** 185,194 ****
--- 193,204 ----
  
    lab_base = old_gen()->object_space()->top();
    _old_lab.initialize(MemRegion(lab_base, (size_t)0));
    _old_gen_is_full = false;
  
+   _promotion_failed_info.reset();
+ 
    TASKQUEUE_STATS_ONLY(reset_stats());
  }
  
  
  void PSPromotionManager::drain_stacks_depth(bool totally_drain) {
*** 303,312 ****
--- 313,324 ----
    // it.
    if (obj->cas_forward_to(obj, obj_mark)) {
      // We won any races, we "own" this object.
      assert(obj == obj->forwardee(), "Sanity");
  
+     _promotion_failed_info.register_copy_failure(obj->size());
+ 
      obj->push_contents(this);
  
      // Save the mark if needed
      PSScavenge::oop_promotion_failed(obj, obj_mark);
    }  else {