8079080: ConcurrentMark::mark_stack_push(oop) is unused
Remove unused functions from ConcurrentMark and CMMarkStack.
Reviewed-by: jmasa, tschatzl
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
index 083ca7d..e8029a6 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -275,7 +275,6 @@
_capacity = (jint) capacity;
_saved_index = -1;
_should_expand = false;
- NOT_PRODUCT(_max_depth = 0);
return true;
}
@@ -331,54 +330,6 @@
}
}
-void CMMarkStack::par_push(oop ptr) {
- while (true) {
- if (isFull()) {
- _overflow = true;
- return;
- }
- // Otherwise...
- jint index = _index;
- jint next_index = index+1;
- jint res = Atomic::cmpxchg(next_index, &_index, index);
- if (res == index) {
- _base[index] = ptr;
- // Note that we don't maintain this atomically. We could, but it
- // doesn't seem necessary.
- NOT_PRODUCT(_max_depth = MAX2(_max_depth, next_index));
- return;
- }
- // Otherwise, we need to try again.
- }
-}
-
-void CMMarkStack::par_adjoin_arr(oop* ptr_arr, int n) {
- while (true) {
- if (isFull()) {
- _overflow = true;
- return;
- }
- // Otherwise...
- jint index = _index;
- jint next_index = index + n;
- if (next_index > _capacity) {
- _overflow = true;
- return;
- }
- jint res = Atomic::cmpxchg(next_index, &_index, index);
- if (res == index) {
- for (int i = 0; i < n; i++) {
- int ind = index + i;
- assert(ind < _capacity, "By overflow test above.");
- _base[ind] = ptr_arr[i];
- }
- NOT_PRODUCT(_max_depth = MAX2(_max_depth, next_index));
- return;
- }
- // Otherwise, we need to try again.
- }
-}
-
void CMMarkStack::par_push_arr(oop* ptr_arr, int n) {
MutexLockerEx x(ParGCRareEvent_lock, Mutex::_no_safepoint_check_flag);
jint start = _index;
@@ -394,7 +345,6 @@
assert(ind < _capacity, "By overflow test above.");
_base[ind] = ptr_arr[i];
}
- NOT_PRODUCT(_max_depth = MAX2(_max_depth, next_index));
}
bool CMMarkStack::par_pop_arr(oop* ptr_arr, int max, int* n) {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
index 78b24b6..ace6057 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
@@ -180,25 +180,12 @@
jint _index; // one more than last occupied index
jint _capacity; // max #elements
jint _saved_index; // value of _index saved at start of GC
- NOT_PRODUCT(jint _max_depth;) // max depth plumbed during run
bool _overflow;
bool _should_expand;
DEBUG_ONLY(bool _drain_in_progress;)
DEBUG_ONLY(bool _drain_in_progress_yields;)
- public:
- CMMarkStack(ConcurrentMark* cm);
- ~CMMarkStack();
-
-#ifndef PRODUCT
- jint max_depth() const {
- return _max_depth;
- }
-#endif
-
- bool allocate(size_t capacity);
-
oop pop() {
if (!isEmpty()) {
return _base[--_index] ;
@@ -206,27 +193,11 @@
return NULL;
}
- // If overflow happens, don't do the push, and record the overflow.
- // *Requires* that "ptr" is already marked.
- void push(oop ptr) {
- if (isFull()) {
- // Record overflow.
- _overflow = true;
- return;
- } else {
- _base[_index++] = ptr;
- NOT_PRODUCT(_max_depth = MAX2(_max_depth, _index));
- }
- }
- // Non-block impl. Note: concurrency is allowed only with other
- // "par_push" operations, not with "pop" or "drain". We would need
- // parallel versions of them if such concurrency was desired.
- void par_push(oop ptr);
+ public:
+ CMMarkStack(ConcurrentMark* cm);
+ ~CMMarkStack();
- // Pushes the first "n" elements of "ptr_arr" on the stack.
- // Non-block impl. Note: concurrency is allowed only with other
- // "par_adjoin_arr" or "push" operations, not with "pop" or "drain".
- void par_adjoin_arr(oop* ptr_arr, int n);
+ bool allocate(size_t capacity);
// Pushes the first "n" elements of "ptr_arr" on the stack.
// Locking impl: concurrency is allowed only with
@@ -254,7 +225,6 @@
bool drain(OopClosureClass* cl, CMBitMap* bm, bool yield_after = false);
bool isEmpty() { return _index == 0; }
- bool isFull() { return _index == _capacity; }
int maxElems() { return _capacity; }
bool overflow() { return _overflow; }
@@ -378,7 +348,6 @@
friend class ConcurrentMarkThread;
friend class CMTask;
friend class CMBitMapClosure;
- friend class CMGlobalObjectClosure;
friend class CMRemarkTask;
friend class CMConcurrentMarkingTask;
friend class G1ParNoteEndTask;
@@ -473,8 +442,8 @@
// All of these times are in ms
NumberSeq _init_times;
NumberSeq _remark_times;
- NumberSeq _remark_mark_times;
- NumberSeq _remark_weak_ref_times;
+ NumberSeq _remark_mark_times;
+ NumberSeq _remark_weak_ref_times;
NumberSeq _cleanup_times;
double _total_counting_time;
double _total_rs_scrub_time;
@@ -623,19 +592,9 @@
public:
// Manipulation of the global mark stack.
- // Notice that the first mark_stack_push is CAS-based, whereas the
- // two below are Mutex-based. This is OK since the first one is only
- // called during evacuation pauses and doesn't compete with the
- // other two (which are called by the marking tasks during
- // concurrent marking or remark).
- bool mark_stack_push(oop p) {
- _markStack.par_push(p);
- if (_markStack.overflow()) {
- set_has_overflown();
- return false;
- }
- return true;
- }
+ // The push and pop operations are used by tasks for transfers
+ // between task-local queues and the global mark stack, and use
+ // locking for concurrency safety.
bool mark_stack_push(oop* arr, int n) {
_markStack.par_push_arr(arr, n);
if (_markStack.overflow()) {
