src/share/vm/prims/whitebox.cpp

rev 6878 : 8049599: MetaspaceGC::_capacity_until_GC can overflow

*** 784,793 ****
--- 784,812 ----
        : ClassLoaderData::the_null_class_loader_data();
  
    MetadataFactory::free_array(cld, (Array<u1>*)(uintptr_t)addr);
  WB_END
  
+ WB_ENTRY(jlong, WB_IncMetaspaceCapacityUntilGC(JNIEnv* env, jobject wb, jlong size))
+   if (size < 0) {
+     THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
+         err_msg("WB_IncMetaspaceCapacityUntilGC: size is negative: " JLONG_FORMAT, size));
+   }
+ 
+   if (size > (jlong) ((size_t) -1)) {
+     THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
+         err_msg("WB_IncMetaspaceCapacityUntilGC: size does not fit in size_t: " JLONG_FORMAT, size));
+   }
+ 
+   size_t new_val = MetaspaceGC::inc_capacity_until_GC(align_size_down((size_t) size, Metaspace::commit_alignment()));
+   return (jlong) new_val;
+ WB_END
+ 
+ WB_ENTRY(jlong, WB_MetaspaceCapacityUntilGC(JNIEnv* env, jobject wb))
+   return (jlong) MetaspaceGC::capacity_until_GC();
+ WB_END
+ 
  //Some convenience methods to deal with objects from java
  int WhiteBox::offset_for_field(const char* field_name, oop object,
      Symbol* signature_symbol) {
    assert(field_name != NULL && strlen(field_name) > 0, "Field name not valid");
    Thread* THREAD = Thread::current();
*** 922,931 ****
--- 941,952 ----
    {CC"readReservedMemory", CC"()V",                   (void*)&WB_ReadReservedMemory },
    {CC"allocateMetaspace",
       CC"(Ljava/lang/ClassLoader;J)J",                 (void*)&WB_AllocateMetaspace },
    {CC"freeMetaspace",
       CC"(Ljava/lang/ClassLoader;JJ)V",                (void*)&WB_FreeMetaspace },
+   {CC"incMetaspaceCapacityUntilGC", CC"(J)J",         (void*)&WB_IncMetaspaceCapacityUntilGC },
+   {CC"metaspaceCapacityUntilGC", CC"()J",             (void*)&WB_MetaspaceCapacityUntilGC },
    {CC"getCPUFeatures",     CC"()Ljava/lang/String;",  (void*)&WB_GetCPUFeatures     },
    {CC"getNMethod",         CC"(Ljava/lang/reflect/Executable;Z)[Ljava/lang/Object;",
                                                        (void*)&WB_GetNMethod         },
    {CC"getThreadStackSize", CC"()J",                   (void*)&WB_GetThreadStackSize },
    {CC"getThreadRemainingStackSize", CC"()J",          (void*)&WB_GetThreadRemainingStackSize },