hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_HDR
  #pragma ident "@(#)vmGCOperations.cpp   1.21 07/05/29 09:44:12 JVM"
  #endif
  /*
!  * Copyright 2005-2006 Sun Microsystems, Inc.  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,10 ----
  #ifdef USE_PRAGMA_IDENT_HDR
  #pragma ident "@(#)vmGCOperations.cpp   1.21 07/05/29 09:44:12 JVM"
  #endif
  /*
!  * Copyright 2005-2008 Sun Microsystems, Inc.  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.
*** 75,100 ****
--- 75,105 ----
  
    acquire_pending_list_lock();
    // If the GC count has changed someone beat us to the collection
    // Get the Heap_lock after the pending_list_lock.
    Heap_lock->lock();
+ 
    // Check invocations
    if (skip_operation()) {
      // skip collection
      Heap_lock->unlock();
      release_and_notify_pending_list_lock();
      _prologue_succeeded = false;
    } else {
      _prologue_succeeded = true;
+     SharedHeap* sh = SharedHeap::heap();
+     if (sh != NULL) sh->_thread_holds_heap_lock_for_gc = true;
    }
    return _prologue_succeeded;
  }
  
  
  void VM_GC_Operation::doit_epilogue() {
    assert(Thread::current()->is_Java_thread(), "just checking");
    // Release the Heap_lock first.
+   SharedHeap* sh = SharedHeap::heap();
+   if (sh != NULL) sh->_thread_holds_heap_lock_for_gc = false;
    Heap_lock->unlock();
    release_and_notify_pending_list_lock();
  }
  
  bool VM_GC_HeapInspection::doit_prologue() {
*** 145,149 ****
--- 150,184 ----
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    GCCauseSetter gccs(gch, _gc_cause);
    gch->do_full_collection(gch->must_clear_all_soft_refs(), _max_level);
    notify_gc_end();
  }
+ 
+ void VM_GenCollectForPermanentAllocation::doit() {
+   JvmtiGCForAllocationMarker jgcm;
+   notify_gc_begin(true);
+   SharedHeap* heap = (SharedHeap*)Universe::heap();
+   GCCauseSetter gccs(heap, _gc_cause);
+   switch (heap->kind()) {
+     case (CollectedHeap::GenCollectedHeap): {
+       GenCollectedHeap* gch = (GenCollectedHeap*)heap;
+       gch->do_full_collection(gch->must_clear_all_soft_refs(),
+                               gch->n_gens() - 1);
+       break;
+     }
+ #ifndef SERIALGC
+     case (CollectedHeap::G1CollectedHeap): {
+       G1CollectedHeap* g1h = (G1CollectedHeap*)heap;
+       g1h->do_full_collection(_gc_cause == GCCause::_last_ditch_collection);
+       break;
+     }
+ #endif // SERIALGC
+     default:
+       ShouldNotReachHere();
+   }
+   _res = heap->perm_gen()->allocate(_size, false);
+   assert(heap->is_in_reserved_or_null(_res), "result not in heap");
+   if (_res == NULL && GC_locker::is_active_and_needs_gc()) {
+     set_gc_locked();
+   }
+   notify_gc_end();
+ }