stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Bengt Rutisson 2015-10-30 06:50:55 +00:00
commit de43b867e9
3 changed files with 0 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
hotspot/src/share/vm/gc/g1/concurrentMark.cpp
View File

@ -3066,8 +3066,6 @@ public:
HeapWord* addr = _nextMarkBitMap->offsetToHeapWord(offset); HeapWord* addr = _nextMarkBitMap->offsetToHeapWord(offset);
assert(_nextMarkBitMap->isMarked(addr), "invariant"); assert(_nextMarkBitMap->isMarked(addr), "invariant");
assert( addr < _cm->finger(), "invariant"); assert( addr < _cm->finger(), "invariant");
statsOnly( _task->increase_objs_found_on_bitmap() );
assert(addr >= _task->finger(), "invariant"); assert(addr >= _task->finger(), "invariant");
// We move that task's local finger along. // We move that task's local finger along.
@ -3193,30 +3191,6 @@ void CMTask::reset(CMBitMap* nextMarkBitMap) {
_elapsed_time_ms = 0.0; _elapsed_time_ms = 0.0;
_termination_time_ms = 0.0; _termination_time_ms = 0.0;
_termination_start_time_ms = 0.0; _termination_start_time_ms = 0.0;
#if _MARKING_STATS_
_aborted = 0;
_aborted_overflow = 0;
_aborted_cm_aborted = 0;
_aborted_yield = 0;
_aborted_timed_out = 0;
_aborted_satb = 0;
_aborted_termination = 0;
_steal_attempts = 0;
_steals = 0;
_local_pushes = 0;
_local_pops = 0;
_local_max_size = 0;
_objs_scanned = 0;
_global_pushes = 0;
_global_pops = 0;
_global_max_size = 0;
_global_transfers_to = 0;
_global_transfers_from = 0;
_regions_claimed = 0;
_objs_found_on_bitmap = 0;
_satb_buffers_processed = 0;
#endif // _MARKING_STATS_
} }
bool CMTask::should_exit_termination() { bool CMTask::should_exit_termination() {
@ -3257,42 +3231,16 @@ void CMTask::regular_clock_call() {
// (2) If marking has been aborted for Full GC, then we also abort. // (2) If marking has been aborted for Full GC, then we also abort.
if (_cm->has_aborted()) { if (_cm->has_aborted()) {
set_has_aborted(); set_has_aborted();
statsOnly( ++_aborted_cm_aborted );
return; return;
} }
double curr_time_ms = os::elapsedVTime() * 1000.0; double curr_time_ms = os::elapsedVTime() * 1000.0;
// (3) If marking stats are enabled, then we update the step history.
#if _MARKING_STATS_
if (_words_scanned >= _words_scanned_limit) {
++_clock_due_to_scanning;
}
if (_refs_reached >= _refs_reached_limit) {
++_clock_due_to_marking;
}
double last_interval_ms = curr_time_ms - _interval_start_time_ms;
_interval_start_time_ms = curr_time_ms;
_all_clock_intervals_ms.add(last_interval_ms);
if (_cm->verbose_medium()) {
gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, "
"scanned = " SIZE_FORMAT "%s, refs reached = " SIZE_FORMAT "%s",
_worker_id, last_interval_ms,
_words_scanned,
(_words_scanned >= _words_scanned_limit) ? " (*)" : "",
_refs_reached,
(_refs_reached >= _refs_reached_limit) ? " (*)" : "");
}
#endif // _MARKING_STATS_
// (4) We check whether we should yield. If we have to, then we abort. // (4) We check whether we should yield. If we have to, then we abort.
if (SuspendibleThreadSet::should_yield()) { if (SuspendibleThreadSet::should_yield()) {
// We should yield. To do this we abort the task. The caller is // We should yield. To do this we abort the task. The caller is
// responsible for yielding. // responsible for yielding.
set_has_aborted(); set_has_aborted();
statsOnly( ++_aborted_yield );
return; return;
} }
@ -3302,7 +3250,6 @@ void CMTask::regular_clock_call() {
if (elapsed_time_ms > _time_target_ms) { if (elapsed_time_ms > _time_target_ms) {
set_has_aborted(); set_has_aborted();
_has_timed_out = true; _has_timed_out = true;
statsOnly( ++_aborted_timed_out );
return; return;
} }
@ -3317,7 +3264,6 @@ void CMTask::regular_clock_call() {
// we do need to process SATB buffers, we'll abort and restart // we do need to process SATB buffers, we'll abort and restart
// the marking task to do so // the marking task to do so
set_has_aborted(); set_has_aborted();
statsOnly( ++_aborted_satb );
return; return;
} }
} }
@ -3361,8 +3307,6 @@ void CMTask::move_entries_to_global_stack() {
if (n > 0) { if (n > 0) {
// we popped at least one entry from the local queue // we popped at least one entry from the local queue
statsOnly( ++_global_transfers_to; _local_pops += n );
if (!_cm->mark_stack_push(buffer, n)) { if (!_cm->mark_stack_push(buffer, n)) {
if (_cm->verbose_low()) { if (_cm->verbose_low()) {
gclog_or_tty->print_cr("[%u] aborting due to global stack overflow", gclog_or_tty->print_cr("[%u] aborting due to global stack overflow",
@ -3376,11 +3320,6 @@ void CMTask::move_entries_to_global_stack() {
gclog_or_tty->print_cr("[%u] pushed %d entries to the global stack", gclog_or_tty->print_cr("[%u] pushed %d entries to the global stack",
_worker_id, n); _worker_id, n);
} }
statsOnly( size_t tmp_size = _cm->mark_stack_size();
if (tmp_size > _global_max_size) {
_global_max_size = tmp_size;
}
_global_pushes += n );
} }
} }
@ -3398,8 +3337,6 @@ void CMTask::get_entries_from_global_stack() {
"we should not pop more than the given limit"); "we should not pop more than the given limit");
if (n > 0) { if (n > 0) {
// yes, we did actually pop at least one entry // yes, we did actually pop at least one entry
statsOnly( ++_global_transfers_from; _global_pops += n );
if (_cm->verbose_medium()) { if (_cm->verbose_medium()) {
gclog_or_tty->print_cr("[%u] popped %d entries from the global stack", gclog_or_tty->print_cr("[%u] popped %d entries from the global stack",
_worker_id, n); _worker_id, n);
@ -3410,12 +3347,6 @@ void CMTask::get_entries_from_global_stack() {
// given target limit. So, we do not expect this push to fail. // given target limit. So, we do not expect this push to fail.
assert(success, "invariant"); assert(success, "invariant");
} }
statsOnly( size_t tmp_size = (size_t)_task_queue->size();
if (tmp_size > _local_max_size) {
_local_max_size = tmp_size;
}
_local_pushes += n );
} }
// this operation was quite expensive, so decrease the limits // this operation was quite expensive, so decrease the limits
@ -3444,8 +3375,6 @@ void CMTask::drain_local_queue(bool partially) {
oop obj; oop obj;
bool ret = _task_queue->pop_local(obj); bool ret = _task_queue->pop_local(obj);
while (ret) { while (ret) {
statsOnly( ++_local_pops );
if (_cm->verbose_high()) { if (_cm->verbose_high()) {
gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id, gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id,
p2i((void*) obj)); p2i((void*) obj));
@ -3532,7 +3461,6 @@ void CMTask::drain_satb_buffers() {
if (_cm->verbose_medium()) { if (_cm->verbose_medium()) {
gclog_or_tty->print_cr("[%u] processed an SATB buffer", _worker_id); gclog_or_tty->print_cr("[%u] processed an SATB buffer", _worker_id);
} }
statsOnly( ++_satb_buffers_processed );
regular_clock_call(); regular_clock_call();
} }
@ -3557,34 +3485,6 @@ void CMTask::print_stats() {
_step_times_ms.sd()); _step_times_ms.sd());
gclog_or_tty->print_cr(" max = %1.2lfms, total = %1.2lfms", gclog_or_tty->print_cr(" max = %1.2lfms, total = %1.2lfms",
_step_times_ms.maximum(), _step_times_ms.sum()); _step_times_ms.maximum(), _step_times_ms.sum());
#if _MARKING_STATS_
gclog_or_tty->print_cr(" Clock Intervals (cum): num = %d, avg = %1.2lfms, sd = %1.2lfms",
_all_clock_intervals_ms.num(), _all_clock_intervals_ms.avg(),
_all_clock_intervals_ms.sd());
gclog_or_tty->print_cr(" max = %1.2lfms, total = %1.2lfms",
_all_clock_intervals_ms.maximum(),
_all_clock_intervals_ms.sum());
gclog_or_tty->print_cr(" Clock Causes (cum): scanning = " SIZE_FORMAT ", marking = " SIZE_FORMAT,
_clock_due_to_scanning, _clock_due_to_marking);
gclog_or_tty->print_cr(" Objects: scanned = " SIZE_FORMAT ", found on the bitmap = " SIZE_FORMAT,
_objs_scanned, _objs_found_on_bitmap);
gclog_or_tty->print_cr(" Local Queue: pushes = " SIZE_FORMAT ", pops = " SIZE_FORMAT ", max size = " SIZE_FORMAT,
_local_pushes, _local_pops, _local_max_size);
gclog_or_tty->print_cr(" Global Stack: pushes = " SIZE_FORMAT ", pops = " SIZE_FORMAT ", max size = " SIZE_FORMAT,
_global_pushes, _global_pops, _global_max_size);
gclog_or_tty->print_cr(" transfers to = " SIZE_FORMAT ", transfers from = " SIZE_FORMAT,
_global_transfers_to,_global_transfers_from);
gclog_or_tty->print_cr(" Regions: claimed = " SIZE_FORMAT, _regions_claimed);
gclog_or_tty->print_cr(" SATB buffers: processed = " SIZE_FORMAT, _satb_buffers_processed);
gclog_or_tty->print_cr(" Steals: attempts = " SIZE_FORMAT ", successes = " SIZE_FORMAT,
_steal_attempts, _steals);
gclog_or_tty->print_cr(" Aborted: " SIZE_FORMAT ", due to", _aborted);
gclog_or_tty->print_cr(" overflow: " SIZE_FORMAT ", global abort: " SIZE_FORMAT ", yield: " SIZE_FORMAT,
_aborted_overflow, _aborted_cm_aborted, _aborted_yield);
gclog_or_tty->print_cr(" time out: " SIZE_FORMAT ", SATB: " SIZE_FORMAT ", termination: " SIZE_FORMAT,
_aborted_timed_out, _aborted_satb, _aborted_termination);
#endif // _MARKING_STATS_
} }
bool ConcurrentMark::try_stealing(uint worker_id, int* hash_seed, oop& obj) { bool ConcurrentMark::try_stealing(uint worker_id, int* hash_seed, oop& obj) {
@ -3727,7 +3627,6 @@ void CMTask::do_marking_step(double time_target_ms,
_claimed = true; _claimed = true;
_start_time_ms = os::elapsedVTime() * 1000.0; _start_time_ms = os::elapsedVTime() * 1000.0;
statsOnly( _interval_start_time_ms = _start_time_ms );
// If do_stealing is true then do_marking_step will attempt to // If do_stealing is true then do_marking_step will attempt to
// steal work from the other CMTasks. It only makes sense to // steal work from the other CMTasks. It only makes sense to
@ -3887,8 +3786,6 @@ void CMTask::do_marking_step(double time_target_ms,
HeapRegion* claimed_region = _cm->claim_region(_worker_id); HeapRegion* claimed_region = _cm->claim_region(_worker_id);
if (claimed_region != NULL) { if (claimed_region != NULL) {
// Yes, we managed to claim one // Yes, we managed to claim one
statsOnly( ++_regions_claimed );
if (_cm->verbose_low()) { if (_cm->verbose_low()) {
gclog_or_tty->print_cr("[%u] we successfully claimed " gclog_or_tty->print_cr("[%u] we successfully claimed "
"region " PTR_FORMAT, "region " PTR_FORMAT,
@ -3948,16 +3845,12 @@ void CMTask::do_marking_step(double time_target_ms,
while (!has_aborted()) { while (!has_aborted()) {
oop obj; oop obj;
statsOnly( ++_steal_attempts );
if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) { if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) {
if (_cm->verbose_medium()) { if (_cm->verbose_medium()) {
gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully", gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully",
_worker_id, p2i((void*) obj)); _worker_id, p2i((void*) obj));
} }
statsOnly( ++_steals );
assert(_nextMarkBitMap->isMarked((HeapWord*) obj), assert(_nextMarkBitMap->isMarked((HeapWord*) obj),
"any stolen object should be marked"); "any stolen object should be marked");
scan_object(obj); scan_object(obj);
@ -4042,7 +3935,6 @@ void CMTask::do_marking_step(double time_target_ms,
} }
set_has_aborted(); set_has_aborted();
statsOnly( ++_aborted_termination );
} }
} }
@ -4057,9 +3949,6 @@ void CMTask::do_marking_step(double time_target_ms,
if (has_aborted()) { if (has_aborted()) {
// The task was aborted for some reason. // The task was aborted for some reason.
statsOnly( ++_aborted );
if (_has_timed_out) { if (_has_timed_out) {
double diff_ms = elapsed_time_ms - _time_target_ms; double diff_ms = elapsed_time_ms - _time_target_ms;
// Keep statistics of how well we did with respect to hitting // Keep statistics of how well we did with respect to hitting
@ -4091,8 +3980,6 @@ void CMTask::do_marking_step(double time_target_ms,
// task 0 will clear the global data structures. // task 0 will clear the global data structures.
} }
statsOnly( ++_aborted_overflow );
// We clear the local state of this task... // We clear the local state of this task...
clear_region_fields(); clear_region_fields();
@ -4143,9 +4030,6 @@ CMTask::CMTask(uint worker_id,
guarantee(task_queue != NULL, "invariant"); guarantee(task_queue != NULL, "invariant");
guarantee(task_queues != NULL, "invariant"); guarantee(task_queues != NULL, "invariant");
statsOnly( _clock_due_to_scanning = 0;
_clock_due_to_marking = 0 );
_marking_step_diffs_ms.add(0.5); _marking_step_diffs_ms.add(0.5);
} }

54
hotspot/src/share/vm/gc/g1/concurrentMark.hpp
View File

@ -244,22 +244,9 @@ public:
bool should_force() PRODUCT_RETURN_( return false; ); bool should_force() PRODUCT_RETURN_( return false; );
}; };
// this will enable a variety of different statistics per GC task
#define _MARKING_STATS_ 0
// this will enable the higher verbose levels // this will enable the higher verbose levels
#define _MARKING_VERBOSE_ 0 #define _MARKING_VERBOSE_ 0
#if _MARKING_STATS_
#define statsOnly(statement) \
do { \
statement ; \
} while (0)
#else // _MARKING_STATS_
#define statsOnly(statement) \
do { \
} while (0)
#endif // _MARKING_STATS_
typedef enum { typedef enum {
no_verbose = 0, // verbose turned off no_verbose = 0, // verbose turned off
stats_verbose, // only prints stats at the end of marking stats_verbose, // only prints stats at the end of marking
@ -969,43 +956,6 @@ private:
size_t* _marked_bytes_array; size_t* _marked_bytes_array;
BitMap* _card_bm; BitMap* _card_bm;
// LOTS of statistics related with this task
#if _MARKING_STATS_
NumberSeq _all_clock_intervals_ms;
double _interval_start_time_ms;
size_t _aborted;
size_t _aborted_overflow;
size_t _aborted_cm_aborted;
size_t _aborted_yield;
size_t _aborted_timed_out;
size_t _aborted_satb;
size_t _aborted_termination;
size_t _steal_attempts;
size_t _steals;
size_t _clock_due_to_marking;
size_t _clock_due_to_scanning;
size_t _local_pushes;
size_t _local_pops;
size_t _local_max_size;
size_t _objs_scanned;
size_t _global_pushes;
size_t _global_pops;
size_t _global_max_size;
size_t _global_transfers_to;
size_t _global_transfers_from;
size_t _regions_claimed;
size_t _objs_found_on_bitmap;
size_t _satb_buffers_processed;
#endif // _MARKING_STATS_
// it updates the local fields after this task has claimed // it updates the local fields after this task has claimed
// a new region to scan // a new region to scan
void setup_for_region(HeapRegion* hr); void setup_for_region(HeapRegion* hr);
@ -1139,10 +1089,6 @@ public:
// it prints statistics associated with this task // it prints statistics associated with this task
void print_stats(); void print_stats();
#if _MARKING_STATS_
void increase_objs_found_on_bitmap() { ++_objs_found_on_bitmap; }
#endif // _MARKING_STATS_
}; };
// Class that's used to to print out per-region liveness // Class that's used to to print out per-region liveness

7
hotspot/src/share/vm/gc/g1/concurrentMark.inline.hpp
View File

@ -263,12 +263,6 @@ inline void CMTask::push(oop obj) {
bool success = _task_queue->push(obj); bool success = _task_queue->push(obj);
assert(success, "invariant"); assert(success, "invariant");
} }
statsOnly( size_t tmp_size = (size_t)_task_queue->size();
if (tmp_size > _local_max_size) {
_local_max_size = tmp_size;
}
++_local_pushes );
} }
inline bool CMTask::is_below_finger(oop obj, HeapWord* global_finger) const { inline bool CMTask::is_below_finger(oop obj, HeapWord* global_finger) const {
@ -317,7 +311,6 @@ inline void CMTask::process_grey_object(oop obj) {
if (scan) { if (scan) {
obj->oop_iterate(_cm_oop_closure); obj->oop_iterate(_cm_oop_closure);
} }
statsOnly( ++_objs_scanned );
check_limits(); check_limits();
} }