Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 6928:8cb93eadfb6d hs25-b08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Fri, 02 Nov 2012 07:35:41 -0700
parents acabb5c282f5 e81fbc04a942
children e522a00b91aa e4f764ddb06a
comparison
equal deleted inserted replaced
6914:4d37eb50b9b1 6928:8cb93eadfb6d
255 { "MaxPermSize", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 255 { "MaxPermSize", JDK_Version::jdk(8), JDK_Version::jdk(9) },
256 { "MinPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 256 { "MinPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) },
257 { "MaxPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 257 { "MaxPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) },
258 { "CMSRevisitStackSize", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 258 { "CMSRevisitStackSize", JDK_Version::jdk(8), JDK_Version::jdk(9) },
259 { "PrintRevisitStats", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 259 { "PrintRevisitStats", JDK_Version::jdk(8), JDK_Version::jdk(9) },
260 { "UseVectoredExceptions", JDK_Version::jdk(8), JDK_Version::jdk(9) },
260 #ifdef PRODUCT 261 #ifdef PRODUCT
261 { "DesiredMethodLimit", 262 { "DesiredMethodLimit",
262 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, 263 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },
263 #endif // PRODUCT 264 #endif // PRODUCT
264 { NULL, JDK_Version(0), JDK_Version(0) } 265 { NULL, JDK_Version(0), JDK_Version(0) }
2566 FLAG_SET_CMDLINE(uintx, NewSize, 2567 FLAG_SET_CMDLINE(uintx, NewSize,
2567 ((julong)MaxHeapSize / (julong)8) * (julong)3); 2568 ((julong)MaxHeapSize / (julong)8) * (julong)3);
2568 FLAG_SET_CMDLINE(uintx, MaxNewSize, NewSize); 2569 FLAG_SET_CMDLINE(uintx, MaxNewSize, NewSize);
2569 } 2570 }
2570 2571
2572 #ifndef _ALLBSD_SOURCE // UseLargePages is not yet supported on BSD.
2571 FLAG_SET_DEFAULT(UseLargePages, true); 2573 FLAG_SET_DEFAULT(UseLargePages, true);
2574 #endif
2572 2575
2573 // Increase some data structure sizes for efficiency 2576 // Increase some data structure sizes for efficiency
2574 FLAG_SET_CMDLINE(uintx, BaseFootPrintEstimate, MaxHeapSize); 2577 FLAG_SET_CMDLINE(uintx, BaseFootPrintEstimate, MaxHeapSize);
2575 FLAG_SET_CMDLINE(bool, ResizeTLAB, false); 2578 FLAG_SET_CMDLINE(bool, ResizeTLAB, false);
2576 FLAG_SET_CMDLINE(uintx, TLABSize, 256*K); 2579 FLAG_SET_CMDLINE(uintx, TLABSize, 256*K);
3131 3134
3132 #if (defined JAVASE_EMBEDDED || defined ARM) 3135 #if (defined JAVASE_EMBEDDED || defined ARM)
3133 UNSUPPORTED_OPTION(UseG1GC, "G1 GC"); 3136 UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
3134 #endif 3137 #endif
3135 3138
3139 #ifdef _ALLBSD_SOURCE // UseLargePages is not yet supported on BSD.
3140 UNSUPPORTED_OPTION(UseLargePages, "-XX:+UseLargePages");
3141 #endif
3142
3136 #if !INCLUDE_ALTERNATE_GCS 3143 #if !INCLUDE_ALTERNATE_GCS
3137 if (UseParallelGC) { 3144 if (UseParallelGC) {
3138 warning("Parallel GC is not supported in this VM. Using Serial GC."); 3145 warning("Parallel GC is not supported in this VM. Using Serial GC.");
3139 } 3146 }
3140 if (UseParallelOldGC) { 3147 if (UseParallelOldGC) {