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

rev 7780 : imported patch 8072621

*** 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2015, 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.
*** 258,268 ****
  
    HeapWord* result = young_gen()->allocate(size);
  
    uint loop_count = 0;
    uint gc_count = 0;
!   int gclocker_stalled_count = 0;
  
    while (result == NULL) {
      // We don't want to have multiple collections for a single filled generation.
      // To prevent this, each thread tracks the total_collections() value, and if
      // the count has changed, does not do a new collection.
--- 258,268 ----
  
    HeapWord* result = young_gen()->allocate(size);
  
    uint loop_count = 0;
    uint gc_count = 0;
!   uint gclocker_stalled_count = 0;
  
    while (result == NULL) {
      // We don't want to have multiple collections for a single filled generation.
      // To prevent this, each thread tracks the total_collections() value, and if
      // the count has changed, does not do a new collection.
*** 518,529 ****
  // This method is used by System.gc() and JVMTI.
  void ParallelScavengeHeap::collect(GCCause::Cause cause) {
    assert(!Heap_lock->owned_by_self(),
      "this thread should not own the Heap_lock");
  
!   unsigned int gc_count      = 0;
!   unsigned int full_gc_count = 0;
    {
      MutexLocker ml(Heap_lock);
      // This value is guarded by the Heap_lock
      gc_count      = Universe::heap()->total_collections();
      full_gc_count = Universe::heap()->total_full_collections();
--- 518,529 ----
  // This method is used by System.gc() and JVMTI.
  void ParallelScavengeHeap::collect(GCCause::Cause cause) {
    assert(!Heap_lock->owned_by_self(),
      "this thread should not own the Heap_lock");
  
!   uint gc_count      = 0;
!   uint full_gc_count = 0;
    {
      MutexLocker ml(Heap_lock);
      // This value is guarded by the Heap_lock
      gc_count      = Universe::heap()->total_collections();
      full_gc_count = Universe::heap()->total_full_collections();