OpenJDK / jdk / jdk
changeset 57859:d37576456de2
8232689: Remove ParCompactionManager::Action enum
Reviewed-by: lkorinth, kbarrett, tschatzl
Contributed-by: Ivan Walulya <ivan.walulya@oracle.com>
author | lkorinth |
---|---|
date | Wed, 29 Jan 2020 09:29:22 +0100 |
parents | db294f18ccc2 |
children | 2a46b7b81e78 |
files | src/hotspot/share/gc/parallel/psCompactionManager.cpp src/hotspot/share/gc/parallel/psCompactionManager.hpp |
diffstat | 2 files changed, 4 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/gc/parallel/psCompactionManager.cpp Tue Jan 28 22:42:32 2020 +0100 +++ b/src/hotspot/share/gc/parallel/psCompactionManager.cpp Wed Jan 29 09:29:22 2020 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020, 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 @@ -52,8 +52,7 @@ GrowableArray<size_t >* ParCompactionManager::_shadow_region_array = NULL; Monitor* ParCompactionManager::_shadow_region_monitor = NULL; -ParCompactionManager::ParCompactionManager() : - _action(CopyAndUpdate) { +ParCompactionManager::ParCompactionManager() { ParallelScavengeHeap* heap = ParallelScavengeHeap::heap(); @@ -115,19 +114,6 @@ } } -bool ParCompactionManager::should_update() { - assert(action() != NotValid, "Action is not set"); - return (action() == ParCompactionManager::Update) || - (action() == ParCompactionManager::CopyAndUpdate) || - (action() == ParCompactionManager::UpdateAndCopy); -} - -bool ParCompactionManager::should_copy() { - assert(action() != NotValid, "Action is not set"); - return (action() == ParCompactionManager::Copy) || - (action() == ParCompactionManager::CopyAndUpdate) || - (action() == ParCompactionManager::UpdateAndCopy); -} ParCompactionManager* ParCompactionManager::gc_thread_compaction_manager(uint index) { @@ -199,4 +185,4 @@ void ParCompactionManager::remove_all_shadow_regions() { _shadow_region_array->clear(); -} \ No newline at end of file +}
--- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp Tue Jan 28 22:42:32 2020 +0100 +++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp Wed Jan 29 09:29:22 2020 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020, 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 @@ -50,16 +50,6 @@ public: -// ------------------------ Don't putback if not needed - // Actions that the compaction manager should take. - enum Action { - Update, - Copy, - UpdateAndCopy, - CopyAndUpdate, - NotValid - }; -// ------------------------ End don't putback if not needed private: // 32-bit: 4K * 8 = 32KiB; 64-bit: 8K * 16 = 128KiB @@ -95,8 +85,6 @@ // See pop/push_shadow_region_mt_safe() below static Monitor* _shadow_region_monitor; - Action _action; - HeapWord* _last_query_beg; oop _last_query_obj; size_t _last_query_ret; @@ -138,9 +126,6 @@ _last_query_ret = 0; } - Action action() { return _action; } - void set_action(Action v) { _action = v; } - // Bitmap query support, cache last query and result HeapWord* last_query_begin() { return _last_query_beg; } oop last_query_object() { return _last_query_obj; }