comparison src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents 63a4eb8bcd23
children 52b4284cb496
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
659 old_gen->compact(); 659 old_gen->compact();
660 young_gen->compact(); 660 young_gen->compact();
661 } 661 }
662 662
663 jlong PSMarkSweep::millis_since_last_gc() { 663 jlong PSMarkSweep::millis_since_last_gc() {
664 // We need a monotonically non-decreasing time in ms but 664 // We need a monotonically non-deccreasing time in ms but
665 // os::javaTimeMillis() does not guarantee monotonicity. 665 // os::javaTimeMillis() does not guarantee monotonicity.
666 jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC; 666 jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC;
667 jlong ret_val = now - _time_of_last_gc; 667 jlong ret_val = now - _time_of_last_gc;
668 // XXX See note in genCollectedHeap::millis_since_last_gc(). 668 // XXX See note in genCollectedHeap::millis_since_last_gc().
669 if (ret_val < 0) { 669 if (ret_val < 0) {
672 } 672 }
673 return ret_val; 673 return ret_val;
674 } 674 }
675 675
676 void PSMarkSweep::reset_millis_since_last_gc() { 676 void PSMarkSweep::reset_millis_since_last_gc() {
677 // We need a monotonically non-decreasing time in ms but 677 // We need a monotonically non-deccreasing time in ms but
678 // os::javaTimeMillis() does not guarantee monotonicity. 678 // os::javaTimeMillis() does not guarantee monotonicity.
679 _time_of_last_gc = os::javaTimeNanos() / NANOSECS_PER_MILLISEC; 679 _time_of_last_gc = os::javaTimeNanos() / NANOSECS_PER_MILLISEC;
680 } 680 }