comparison src/share/vm/prims/whitebox.cpp @ 10241:d17700c82d7d

8006088: Incompatible heap size flags accepted by VM Summary: Make processing of minimum, initial and maximum heap size more intiutive by removing previous limitations on allowed values, and make error reporting consistent. Further, fix errors in ergonomic heap sizing. Reviewed-by: johnc, jwilhelm, tamao
author tschatzl
date Mon, 06 May 2013 17:19:42 +0200
parents 9ce110b1d14a
children f54c85acc043
comparison
equal deleted inserted replaced
10240:30860066ae8f 10241:d17700c82d7d
91 ClassLoaderDataGraph::classes_do(&closure); 91 ClassLoaderDataGraph::classes_do(&closure);
92 92
93 return closure.found(); 93 return closure.found();
94 WB_END 94 WB_END
95 95
96 WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) {
97 CollectorPolicy * p = Universe::heap()->collector_policy();
98 gclog_or_tty->print_cr("Minimum heap "SIZE_FORMAT" Initial heap "
99 SIZE_FORMAT" Maximum heap "SIZE_FORMAT" Min alignment "SIZE_FORMAT" Max alignment "SIZE_FORMAT,
100 p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(),
101 p->min_alignment(), p->max_alignment());
102 }
103 WB_END
104
96 #if INCLUDE_ALL_GCS 105 #if INCLUDE_ALL_GCS
97 WB_ENTRY(jboolean, WB_G1IsHumongous(JNIEnv* env, jobject o, jobject obj)) 106 WB_ENTRY(jboolean, WB_G1IsHumongous(JNIEnv* env, jobject o, jobject obj))
98 G1CollectedHeap* g1 = G1CollectedHeap::heap(); 107 G1CollectedHeap* g1 = G1CollectedHeap::heap();
99 oop result = JNIHandles::resolve(obj); 108 oop result = JNIHandles::resolve(obj);
100 const HeapRegion* hr = g1->heap_region_containing(result); 109 const HeapRegion* hr = g1->heap_region_containing(result);
384 {CC"isClassAlive0", CC"(Ljava/lang/String;)Z", (void*)&WB_IsClassAlive }, 393 {CC"isClassAlive0", CC"(Ljava/lang/String;)Z", (void*)&WB_IsClassAlive },
385 {CC"parseCommandLine", 394 {CC"parseCommandLine",
386 CC"(Ljava/lang/String;[Lsun/hotspot/parser/DiagnosticCommand;)[Ljava/lang/Object;", 395 CC"(Ljava/lang/String;[Lsun/hotspot/parser/DiagnosticCommand;)[Ljava/lang/Object;",
387 (void*) &WB_ParseCommandLine 396 (void*) &WB_ParseCommandLine
388 }, 397 },
398 {CC"printHeapSizes", CC"()V", (void*)&WB_PrintHeapSizes },
389 #if INCLUDE_ALL_GCS 399 #if INCLUDE_ALL_GCS
390 {CC"g1InConcurrentMark", CC"()Z", (void*)&WB_G1InConcurrentMark}, 400 {CC"g1InConcurrentMark", CC"()Z", (void*)&WB_G1InConcurrentMark},
391 {CC"g1IsHumongous", CC"(Ljava/lang/Object;)Z", (void*)&WB_G1IsHumongous }, 401 {CC"g1IsHumongous", CC"(Ljava/lang/Object;)Z", (void*)&WB_G1IsHumongous },
392 {CC"g1NumFreeRegions", CC"()J", (void*)&WB_G1NumFreeRegions }, 402 {CC"g1NumFreeRegions", CC"()J", (void*)&WB_G1NumFreeRegions },
393 {CC"g1RegionSize", CC"()I", (void*)&WB_G1RegionSize }, 403 {CC"g1RegionSize", CC"()I", (void*)&WB_G1RegionSize },