Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/arguments.cpp @ 9088:89e4d67fdd2a
Merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 12 Apr 2013 14:05:42 +0200 |
parents | b9a918201d47 480d934f62a8 |
children | 4abd6387a612 |
comparison
equal
deleted
inserted
replaced
9037:b008f40b67d0 | 9088:89e4d67fdd2a |
---|---|
1761 "%s of " UINTX_FORMAT " is invalid; must be between 0 and 100\n", | 1761 "%s of " UINTX_FORMAT " is invalid; must be between 0 and 100\n", |
1762 name, value); | 1762 name, value); |
1763 return false; | 1763 return false; |
1764 } | 1764 } |
1765 | 1765 |
1766 #if !INCLUDE_ALL_GCS | |
1767 #ifdef ASSERT | |
1766 static bool verify_serial_gc_flags() { | 1768 static bool verify_serial_gc_flags() { |
1767 return (UseSerialGC && | 1769 return (UseSerialGC && |
1768 !(UseParNewGC || (UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC || | 1770 !(UseParNewGC || (UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC || |
1769 UseParallelGC || UseParallelOldGC)); | 1771 UseParallelGC || UseParallelOldGC)); |
1770 } | 1772 } |
1773 #endif // ASSERT | |
1774 #endif // INCLUDE_ALL_GCS | |
1771 | 1775 |
1772 // check if do gclog rotation | 1776 // check if do gclog rotation |
1773 // +UseGCLogFileRotation is a must, | 1777 // +UseGCLogFileRotation is a must, |
1774 // no gc log rotation when log file not supplied or | 1778 // no gc log rotation when log file not supplied or |
1775 // NumberOfGCLogFiles is 0, or GCLogFileSize is 0 | 1779 // NumberOfGCLogFiles is 0, or GCLogFileSize is 0 |
2013 // which are not visible at the CollectedHeap level. We want to | 2017 // which are not visible at the CollectedHeap level. We want to |
2014 // be able to acquire these locks and then do the iteration rather | 2018 // be able to acquire these locks and then do the iteration rather |
2015 // than just disable the lock verification. This will be fixed under | 2019 // than just disable the lock verification. This will be fixed under |
2016 // bug 4788986. | 2020 // bug 4788986. |
2017 if (UseConcMarkSweepGC && FLSVerifyAllHeapReferences) { | 2021 if (UseConcMarkSweepGC && FLSVerifyAllHeapReferences) { |
2018 if (VerifyGCStartAt == 0) { | 2022 if (VerifyDuringStartup) { |
2019 warning("Heap verification at start-up disabled " | 2023 warning("Heap verification at start-up disabled " |
2020 "(due to current incompatibility with FLSVerifyAllHeapReferences)"); | 2024 "(due to current incompatibility with FLSVerifyAllHeapReferences)"); |
2021 VerifyGCStartAt = 1; // Disable verification at start-up | 2025 VerifyDuringStartup = false; // Disable verification at start-up |
2022 } | 2026 } |
2027 | |
2023 if (VerifyBeforeExit) { | 2028 if (VerifyBeforeExit) { |
2024 warning("Heap verification at shutdown disabled " | 2029 warning("Heap verification at shutdown disabled " |
2025 "(due to current incompatibility with FLSVerifyAllHeapReferences)"); | 2030 "(due to current incompatibility with FLSVerifyAllHeapReferences)"); |
2026 VerifyBeforeExit = false; // Disable verification at shutdown | 2031 VerifyBeforeExit = false; // Disable verification at shutdown |
2027 } | 2032 } |
3156 } \ | 3161 } \ |
3157 FLAG_SET_DEFAULT(gc, false); \ | 3162 FLAG_SET_DEFAULT(gc, false); \ |
3158 } \ | 3163 } \ |
3159 } while(0) | 3164 } while(0) |
3160 | 3165 |
3166 #if !INCLUDE_ALL_GCS | |
3161 static void force_serial_gc() { | 3167 static void force_serial_gc() { |
3162 FLAG_SET_DEFAULT(UseSerialGC, true); | 3168 FLAG_SET_DEFAULT(UseSerialGC, true); |
3163 FLAG_SET_DEFAULT(CMSIncrementalMode, false); // special CMS suboption | 3169 FLAG_SET_DEFAULT(CMSIncrementalMode, false); // special CMS suboption |
3164 UNSUPPORTED_GC_OPTION(UseG1GC); | 3170 UNSUPPORTED_GC_OPTION(UseG1GC); |
3165 UNSUPPORTED_GC_OPTION(UseParallelGC); | 3171 UNSUPPORTED_GC_OPTION(UseParallelGC); |
3166 UNSUPPORTED_GC_OPTION(UseParallelOldGC); | 3172 UNSUPPORTED_GC_OPTION(UseParallelOldGC); |
3167 UNSUPPORTED_GC_OPTION(UseConcMarkSweepGC); | 3173 UNSUPPORTED_GC_OPTION(UseConcMarkSweepGC); |
3168 UNSUPPORTED_GC_OPTION(UseParNewGC); | 3174 UNSUPPORTED_GC_OPTION(UseParNewGC); |
3169 } | 3175 } |
3176 #endif // INCLUDE_ALL_GCS | |
3170 | 3177 |
3171 // Parse entry point called from JNI_CreateJavaVM | 3178 // Parse entry point called from JNI_CreateJavaVM |
3172 | 3179 |
3173 jint Arguments::parse(const JavaVMInitArgs* args) { | 3180 jint Arguments::parse(const JavaVMInitArgs* args) { |
3174 | 3181 |