changeset 8058:c3ebf0da7a4d

8076237: Remove unused _collector_policy field in SharedHeap Reviewed-by: jwilhelm, drwhite, stefank
author brutisso
date Tue, 31 Mar 2015 11:27:20 +0200
parents bc08b84af964
children 679a808e7c3c
files src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp src/share/vm/memory/genCollectedHeap.cpp src/share/vm/memory/sharedHeap.cpp src/share/vm/memory/sharedHeap.hpp
diffstat 4 files changed, 5 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Tue Mar 31 08:27:30 2015 +0200
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Tue Mar 31 11:27:20 2015 +0200
@@ -1728,7 +1728,7 @@
 
 
 G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) :
-  SharedHeap(policy_),
+  SharedHeap(),
   _g1_policy(policy_),
   _dirty_card_queue_set(false),
   _into_cset_dirty_card_queue_set(false),
--- a/src/share/vm/memory/genCollectedHeap.cpp	Tue Mar 31 08:27:30 2015 +0200
+++ b/src/share/vm/memory/genCollectedHeap.cpp	Tue Mar 31 11:27:20 2015 +0200
@@ -78,7 +78,7 @@
 };
 
 GenCollectedHeap::GenCollectedHeap(GenCollectorPolicy *policy) :
-  SharedHeap(policy),
+  SharedHeap(),
   _rem_set(NULL),
   _gen_policy(policy),
   _process_strong_tasks(new SubTasksDone(GCH_PS_NumElements)),
--- a/src/share/vm/memory/sharedHeap.cpp	Tue Mar 31 08:27:30 2015 +0200
+++ b/src/share/vm/memory/sharedHeap.cpp	Tue Mar 31 11:27:20 2015 +0200
@@ -37,9 +37,8 @@
 
 SharedHeap* SharedHeap::_sh;
 
-SharedHeap::SharedHeap(CollectorPolicy* policy_) :
+SharedHeap::SharedHeap() :
   CollectedHeap(),
-  _collector_policy(policy_),
   _workers(NULL)
 {
   _sh = this;  // ch is static, should be set only once.
--- a/src/share/vm/memory/sharedHeap.hpp	Tue Mar 31 08:27:30 2015 +0200
+++ b/src/share/vm/memory/sharedHeap.hpp	Tue Mar 31 11:27:20 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -110,15 +110,12 @@
   // set the static pointer "_sh" to that instance.
   static SharedHeap* _sh;
 
-  // A gc policy, controls global gc resource issues
-  CollectorPolicy *_collector_policy;
-
   // If we're doing parallel GC, use this gang of threads.
   FlexibleWorkGang* _workers;
 
   // Full initialization is done in a concrete subtype's "initialize"
   // function.
-  SharedHeap(CollectorPolicy* policy_);
+  SharedHeap();
 
   // Returns true if the calling thread holds the heap lock,
   // or the calling thread is a par gc thread and the heap_lock is held