Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp	Mon Mar 22 02:40:53 2010 -0700
     1.2 +++ b/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp	Thu Mar 18 12:14:59 2010 -0400
     1.3 @@ -35,7 +35,7 @@
     1.4  
     1.5  void G1SATBCardTableModRefBS::enqueue(oop pre_val) {
     1.6    assert(pre_val->is_oop_or_null(true), "Error");
     1.7 -  if (!JavaThread::satb_mark_queue_set().active()) return;
     1.8 +  if (!JavaThread::satb_mark_queue_set().is_active()) return;
     1.9    Thread* thr = Thread::current();
    1.10    if (thr->is_Java_thread()) {
    1.11      JavaThread* jt = (JavaThread*)thr;
    1.12 @@ -51,7 +51,7 @@
    1.13  G1SATBCardTableModRefBS::write_ref_field_pre_static(T* field,
    1.14                                                      oop new_val,
    1.15                                                      JavaThread* jt) {
    1.16 -  if (!JavaThread::satb_mark_queue_set().active()) return;
    1.17 +  if (!JavaThread::satb_mark_queue_set().is_active()) return;
    1.18    T heap_oop = oopDesc::load_heap_oop(field);
    1.19    if (!oopDesc::is_null(heap_oop)) {
    1.20      oop pre_val = oopDesc::decode_heap_oop_not_null(heap_oop);
    1.21 @@ -62,7 +62,7 @@
    1.22  
    1.23  template <class T> void
    1.24  G1SATBCardTableModRefBS::write_ref_array_pre_work(T* dst, int count) {
    1.25 -  if (!JavaThread::satb_mark_queue_set().active()) return;
    1.26 +  if (!JavaThread::satb_mark_queue_set().is_active()) return;
    1.27    T* elem_ptr = dst;
    1.28    for (int i = 0; i < count; i++, elem_ptr++) {
    1.29      T heap_oop = oopDesc::load_heap_oop(elem_ptr);