src/hotspot/share/gc/g1/g1CollectedHeap.cpp

rev 48000 : [mq]: open.patch
rev 48001 : [mq]: 8191564-new.patch

*** 1228,1238 ****
    }
  
    const bool do_clear_all_soft_refs = clear_all_soft_refs ||
        collector_policy()->should_clear_all_soft_refs();
  
!   G1FullCollector collector(this, &_full_gc_mem_mgr, explicit_gc, do_clear_all_soft_refs);
    GCTraceTime(Info, gc) tm("Pause Full", NULL, gc_cause(), true);
  
    collector.prepare_collection();
    collector.collect();
    collector.complete_collection();
--- 1228,1238 ----
    }
  
    const bool do_clear_all_soft_refs = clear_all_soft_refs ||
        collector_policy()->should_clear_all_soft_refs();
  
!   G1FullCollector collector(this, &_full_gc_memory_manager, explicit_gc, do_clear_all_soft_refs);
    GCTraceTime(Info, gc) tm("Pause Full", NULL, gc_cause(), true);
  
    collector.prepare_collection();
    collector.collect();
    collector.complete_collection();
*** 1525,1536 ****
  
  G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* collector_policy) :
    CollectedHeap(),
    _young_gen_sampling_thread(NULL),
    _collector_policy(collector_policy),
!   _mem_mgr("G1 Young Generation", "end of minor GC"),
!   _full_gc_mem_mgr("G1 Old Generation", "end of major GC"),
    _eden_pool(NULL),
    _survivor_pool(NULL),
    _old_pool(NULL),
    _gc_timer_stw(new (ResourceObj::C_HEAP, mtGC) STWGCTimer()),
    _gc_tracer_stw(new (ResourceObj::C_HEAP, mtGC) G1NewTracer()),
--- 1525,1536 ----
  
  G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* collector_policy) :
    CollectedHeap(),
    _young_gen_sampling_thread(NULL),
    _collector_policy(collector_policy),
!   _memory_manager("G1 Young Generation", "end of minor GC"),
!   _full_gc_memory_manager("G1 Old Generation", "end of major GC"),
    _eden_pool(NULL),
    _survivor_pool(NULL),
    _old_pool(NULL),
    _gc_timer_stw(new (ResourceObj::C_HEAP, mtGC) STWGCTimer()),
    _gc_tracer_stw(new (ResourceObj::C_HEAP, mtGC) G1NewTracer()),
*** 1829,1844 ****
  
    _eden_pool = new G1EdenPool(this);
    _survivor_pool = new G1SurvivorPool(this);
    _old_pool = new G1OldGenPool(this);
  
!   _full_gc_mem_mgr.add_pool(_eden_pool);
!   _full_gc_mem_mgr.add_pool(_survivor_pool);
!   _full_gc_mem_mgr.add_pool(_old_pool);
  
!   _mem_mgr.add_pool(_eden_pool);
!   _mem_mgr.add_pool(_survivor_pool);
  
    G1StringDedup::initialize();
  
    _preserved_marks_set.init(ParallelGCThreads);
  
--- 1829,1844 ----
  
    _eden_pool = new G1EdenPool(this);
    _survivor_pool = new G1SurvivorPool(this);
    _old_pool = new G1OldGenPool(this);
  
!   _full_gc_memory_manager.add_pool(_eden_pool);
!   _full_gc_memory_manager.add_pool(_survivor_pool);
!   _full_gc_memory_manager.add_pool(_old_pool);
  
!   _memory_manager.add_pool(_eden_pool);
!   _memory_manager.add_pool(_survivor_pool);
  
    G1StringDedup::initialize();
  
    _preserved_marks_set.init(ParallelGCThreads);
  
*** 2969,2979 ****
                                                                    Threads::number_of_non_daemon_threads());
      workers()->update_active_workers(active_workers);
      log_info(gc,task)("Using %u workers of %u for evacuation", active_workers, workers()->total_workers());
  
      TraceCollectorStats tcs(g1mm()->incremental_collection_counters());
!     TraceMemoryManagerStats tms(&_mem_mgr, gc_cause());
  
      // If the secondary_free_list is not empty, append it to the
      // free_list. No need to wait for the cleanup operation to finish;
      // the region allocation code will check the secondary_free_list
      // and wait if necessary. If the G1StressConcRegionFreeing flag is
--- 2969,2979 ----
                                                                    Threads::number_of_non_daemon_threads());
      workers()->update_active_workers(active_workers);
      log_info(gc,task)("Using %u workers of %u for evacuation", active_workers, workers()->total_workers());
  
      TraceCollectorStats tcs(g1mm()->incremental_collection_counters());
!     TraceMemoryManagerStats tms(&_memory_manager, gc_cause());
  
      // If the secondary_free_list is not empty, append it to the
      // free_list. No need to wait for the cleanup operation to finish;
      // the region allocation code will check the secondary_free_list
      // and wait if necessary. If the G1StressConcRegionFreeing flag is
*** 5386,5397 ****
    CodeCache::blobs_do(&blob_cl);
  }
  
  GrowableArray<GCMemoryManager*> G1CollectedHeap::memory_managers() {
    GrowableArray<GCMemoryManager*> memory_managers(2);
!   memory_managers.append(&_mem_mgr);
!   memory_managers.append(&_full_gc_mem_mgr);
    return memory_managers;
  }
  
  GrowableArray<MemoryPool*> G1CollectedHeap::memory_pools() {
    GrowableArray<MemoryPool*> memory_pools(3);
--- 5386,5397 ----
    CodeCache::blobs_do(&blob_cl);
  }
  
  GrowableArray<GCMemoryManager*> G1CollectedHeap::memory_managers() {
    GrowableArray<GCMemoryManager*> memory_managers(2);
!   memory_managers.append(&_memory_manager);
!   memory_managers.append(&_full_gc_memory_manager);
    return memory_managers;
  }
  
  GrowableArray<MemoryPool*> G1CollectedHeap::memory_pools() {
    GrowableArray<MemoryPool*> memory_pools(3);