src/share/vm/memory/collectorPolicy.cpp

rev 7212 : [mq]: remove_get_gen
rev 7213 : imported patch move_genspecs
rev 7215 : imported patch remove_levels

*** 749,759 ****
      // Do an incremental collection.
      gch->do_collection(false            /* full */,
                         false            /* clear_all_soft_refs */,
                         size             /* size */,
                         is_tlab          /* is_tlab */,
!                        number_of_generations() - 1 /* max_level */);
    } else {
      if (Verbose && PrintGCDetails) {
        gclog_or_tty->print(" :: Trying full because partial may fail :: ");
      }
      // Try a full collection; see delta for bug id 6266275
--- 749,759 ----
      // Do an incremental collection.
      gch->do_collection(false            /* full */,
                         false            /* clear_all_soft_refs */,
                         size             /* size */,
                         is_tlab          /* is_tlab */,
!                        Generation::Old  /* max_gen */);
    } else {
      if (Verbose && PrintGCDetails) {
        gclog_or_tty->print(" :: Trying full because partial may fail :: ");
      }
      // Try a full collection; see delta for bug id 6266275
*** 762,772 ****
      // such allocation moved out of the safepoint path.
      gch->do_collection(true             /* full */,
                         false            /* clear_all_soft_refs */,
                         size             /* size */,
                         is_tlab          /* is_tlab */,
!                        number_of_generations() - 1 /* max_level */);
    }
  
    result = gch->attempt_allocation(size, is_tlab, false /*first_only*/);
  
    if (result != NULL) {
--- 762,772 ----
      // such allocation moved out of the safepoint path.
      gch->do_collection(true             /* full */,
                         false            /* clear_all_soft_refs */,
                         size             /* size */,
                         is_tlab          /* is_tlab */,
!                        Generation::Old  /* max_gen */);
    }
  
    result = gch->attempt_allocation(size, is_tlab, false /*first_only*/);
  
    if (result != NULL) {
*** 790,800 ****
  
      gch->do_collection(true             /* full */,
                         true             /* clear_all_soft_refs */,
                         size             /* size */,
                         is_tlab          /* is_tlab */,
!                        number_of_generations() - 1 /* max_level */);
    }
  
    result = gch->attempt_allocation(size, is_tlab, false /* first_only */);
    if (result != NULL) {
      assert(gch->is_in_reserved(result), "result not in heap");
--- 790,800 ----
  
      gch->do_collection(true             /* full */,
                         true             /* clear_all_soft_refs */,
                         size             /* size */,
                         is_tlab          /* is_tlab */,
!                        Generation::Old  /* max_gen */);
    }
  
    result = gch->attempt_allocation(size, is_tlab, false /* first_only */);
    if (result != NULL) {
      assert(gch->is_in_reserved(result), "result not in heap");