src/share/vm/prims/whitebox.cpp

rev 12310 : [mq]: gcinterface.patch

*** 162,172 ****
    return (jlong)Arguments::max_heap_for_compressed_oops();
  }
  WB_END
  
  WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) {
!   CollectorPolicy * p = Universe::heap()->collector_policy();
    tty->print_cr("Minimum heap " SIZE_FORMAT " Initial heap "
      SIZE_FORMAT " Maximum heap " SIZE_FORMAT " Space alignment " SIZE_FORMAT " Heap alignment " SIZE_FORMAT,
      p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(),
      p->space_alignment(), p->heap_alignment());
  }
--- 162,172 ----
    return (jlong)Arguments::max_heap_for_compressed_oops();
  }
  WB_END
  
  WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) {
!   CollectorPolicy * p = GC::gc()->heap()->collector_policy();
    tty->print_cr("Minimum heap " SIZE_FORMAT " Initial heap "
      SIZE_FORMAT " Maximum heap " SIZE_FORMAT " Space alignment " SIZE_FORMAT " Heap alignment " SIZE_FORMAT,
      p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(),
      p->space_alignment(), p->heap_alignment());
  }
*** 344,359 ****
    oop p = JNIHandles::resolve(obj);
    return p->size() * HeapWordSize;
  WB_END
  
  WB_ENTRY(jlong, WB_GetHeapSpaceAlignment(JNIEnv* env, jobject o))
!   size_t alignment = Universe::heap()->collector_policy()->space_alignment();
    return (jlong)alignment;
  WB_END
  
  WB_ENTRY(jlong, WB_GetHeapAlignment(JNIEnv* env, jobject o))
!   size_t alignment = Universe::heap()->collector_policy()->heap_alignment();
    return (jlong)alignment;
  WB_END
  
  #if INCLUDE_ALL_GCS
  WB_ENTRY(jboolean, WB_G1IsHumongous(JNIEnv* env, jobject o, jobject obj))
--- 344,359 ----
    oop p = JNIHandles::resolve(obj);
    return p->size() * HeapWordSize;
  WB_END
  
  WB_ENTRY(jlong, WB_GetHeapSpaceAlignment(JNIEnv* env, jobject o))
!   size_t alignment = GC::gc()->heap()->collector_policy()->space_alignment();
    return (jlong)alignment;
  WB_END
  
  WB_ENTRY(jlong, WB_GetHeapAlignment(JNIEnv* env, jobject o))
!   size_t alignment = GC::gc()->heap()->collector_policy()->heap_alignment();
    return (jlong)alignment;
  WB_END
  
  #if INCLUDE_ALL_GCS
  WB_ENTRY(jboolean, WB_G1IsHumongous(JNIEnv* env, jobject o, jobject obj))
*** 1130,1151 ****
    jchar* name = java_lang_String::as_unicode_string(JNIHandles::resolve(javaString), len, CHECK_false);
    return (StringTable::lookup(name, len) != NULL);
  WB_END
  
  WB_ENTRY(void, WB_FullGC(JNIEnv* env, jobject o))
!   Universe::heap()->collector_policy()->set_should_clear_all_soft_refs(true);
!   Universe::heap()->collect(GCCause::_wb_full_gc);
  #if INCLUDE_ALL_GCS
    if (UseG1GC) {
      // Needs to be cleared explicitly for G1
!     Universe::heap()->collector_policy()->set_should_clear_all_soft_refs(false);
    }
  #endif // INCLUDE_ALL_GCS
  WB_END
  
  WB_ENTRY(void, WB_YoungGC(JNIEnv* env, jobject o))
!   Universe::heap()->collect(GCCause::_wb_young_gc);
  WB_END
  
  WB_ENTRY(void, WB_ReadReservedMemory(JNIEnv* env, jobject o))
    // static+volatile in order to force the read to happen
    // (not be eliminated by the compiler)
--- 1130,1151 ----
    jchar* name = java_lang_String::as_unicode_string(JNIHandles::resolve(javaString), len, CHECK_false);
    return (StringTable::lookup(name, len) != NULL);
  WB_END
  
  WB_ENTRY(void, WB_FullGC(JNIEnv* env, jobject o))
!   GC::gc()->heap()->collector_policy()->set_should_clear_all_soft_refs(true);
!   GC::gc()->heap()->collect(GCCause::_wb_full_gc);
  #if INCLUDE_ALL_GCS
    if (UseG1GC) {
      // Needs to be cleared explicitly for G1
!     GC::gc()->heap()->collector_policy()->set_should_clear_all_soft_refs(false);
    }
  #endif // INCLUDE_ALL_GCS
  WB_END
  
  WB_ENTRY(void, WB_YoungGC(JNIEnv* env, jobject o))
!   GC::gc()->heap()->collect(GCCause::_wb_young_gc);
  WB_END
  
  WB_ENTRY(void, WB_ReadReservedMemory(JNIEnv* env, jobject o))
    // static+volatile in order to force the read to happen
    // (not be eliminated by the compiler)