src/hotspot/share/prims/whitebox.cpp

*** 175,189 ****
    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());
  }
  WB_END
  
  #ifndef PRODUCT
  // Forward declaration
--- 175,192 ----
    return (jlong)Arguments::max_heap_for_compressed_oops();
  }
  WB_END
  
  WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) {
+ #if 0
    CollectorPolicy * p = Universe::heap()->collector_policy();
+   CollectedHeap* c = Universe::heap();
    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(),
!     c->space_alignment(), c->heap_alignment());
! #endif
  }
  WB_END
  
  #ifndef PRODUCT
  // Forward declaration
*** 357,372 ****
    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
  
  WB_ENTRY(jboolean, WB_SupportsConcurrentGCPhaseControl(JNIEnv* env, jobject o))
    return Universe::heap()->supports_concurrent_phase_control();
--- 360,375 ----
    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()->space_alignment();
    return (jlong)alignment;
  WB_END
  
  WB_ENTRY(jlong, WB_GetHeapAlignment(JNIEnv* env, jobject o))
!   size_t alignment = Universe::heap()->heap_alignment();
    return (jlong)alignment;
  WB_END
  
  WB_ENTRY(jboolean, WB_SupportsConcurrentGCPhaseControl(JNIEnv* env, jobject o))
    return Universe::heap()->supports_concurrent_phase_control();
*** 489,499 ****
  WB_END
  
  WB_ENTRY(jlong, WB_PSHeapGenerationAlignment(JNIEnv* env, jobject o))
  #if INCLUDE_ALL_GCS
    if (UseParallelGC) {
!     return ParallelScavengeHeap::heap()->generation_alignment();
    }
  #endif // INCLUDE_ALL_GCS
    THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_PSHeapGenerationAlignment: Parallel GC is not enabled");
  WB_END
  
--- 492,502 ----
  WB_END
  
  WB_ENTRY(jlong, WB_PSHeapGenerationAlignment(JNIEnv* env, jobject o))
  #if INCLUDE_ALL_GCS
    if (UseParallelGC) {
!     return ParallelScavengeHeap::heap()->gen_alignment();
    }
  #endif // INCLUDE_ALL_GCS
    THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_PSHeapGenerationAlignment: Parallel GC is not enabled");
  WB_END
  
*** 1210,1225 ****
    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))
--- 1213,1228 ----
    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()->soft_ref_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()->soft_ref_policy()->set_should_clear_all_soft_refs(false);
    }
  #endif // INCLUDE_ALL_GCS
  WB_END
  
  WB_ENTRY(void, WB_YoungGC(JNIEnv* env, jobject o))