archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8076237: Remove unused _collector_policy field in SharedHeap

Browse source 
Reviewed-by: jwilhelm, drwhite, stefank
This commit is contained in:
Bengt Rutisson 2015-03-31 11:27:20 +02:00
parent ff23a17283
commit a5e42354fe
4 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
View file

@ -1728,7 +1728,7 @@ void G1CollectedHeap::shrink(size_t shrink_bytes) {
G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) : G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) :
SharedHeap(policy_), SharedHeap(),
_g1_policy(policy_), _g1_policy(policy_),
_dirty_card_queue_set(false), _dirty_card_queue_set(false),
_into_cset_dirty_card_queue_set(false), _into_cset_dirty_card_queue_set(false),

2
hotspot/src/share/vm/memory/genCollectedHeap.cpp
View file

@ -78,7 +78,7 @@ enum GCH_strong_roots_tasks {
}; };
GenCollectedHeap::GenCollectedHeap(GenCollectorPolicy *policy) : GenCollectedHeap::GenCollectedHeap(GenCollectorPolicy *policy) :
SharedHeap(policy), SharedHeap(),
_rem_set(NULL), _rem_set(NULL),
_gen_policy(policy), _gen_policy(policy),
_process_strong_tasks(new SubTasksDone(GCH_PS_NumElements)), _process_strong_tasks(new SubTasksDone(GCH_PS_NumElements)),

3
hotspot/src/share/vm/memory/sharedHeap.cpp
View file

@ -37,9 +37,8 @@
SharedHeap* SharedHeap::_sh; SharedHeap* SharedHeap::_sh;
SharedHeap::SharedHeap(CollectorPolicy* policy_) : SharedHeap::SharedHeap() :
CollectedHeap(), CollectedHeap(),
_collector_policy(policy_),
_workers(NULL) _workers(NULL)
{ {
_sh = this; // ch is static, should be set only once. _sh = this; // ch is static, should be set only once.

7
hotspot/src/share/vm/memory/sharedHeap.hpp
View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -110,15 +110,12 @@ protected:
// set the static pointer "_sh" to that instance. // set the static pointer "_sh" to that instance.
static SharedHeap* _sh; 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. // If we're doing parallel GC, use this gang of threads.
FlexibleWorkGang* _workers; FlexibleWorkGang* _workers;
// Full initialization is done in a concrete subtype's "initialize" // Full initialization is done in a concrete subtype's "initialize"
// function. // function.
SharedHeap(CollectorPolicy* policy_); SharedHeap();
// Returns true if the calling thread holds the heap lock, // 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 // or the calling thread is a par gc thread and the heap_lock is held