Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 9077:480d934f62a8
Merge
author | mgerdin |
---|---|
date | Thu, 11 Apr 2013 16:35:34 +0200 |
parents | 68fe50d4f1d5 8be1318fbe77 |
children | 89e4d67fdd2a 63e31ce40bdb 3c0584fec1e6 |
comparison
equal
deleted
inserted
replaced
9076:7b835924c31c | 9077:480d934f62a8 |
---|---|
1752 "%s of " UINTX_FORMAT " is invalid; must be between 0 and 100\n", | 1752 "%s of " UINTX_FORMAT " is invalid; must be between 0 and 100\n", |
1753 name, value); | 1753 name, value); |
1754 return false; | 1754 return false; |
1755 } | 1755 } |
1756 | 1756 |
1757 #if !INCLUDE_ALL_GCS | |
1758 #ifdef ASSERT | |
1757 static bool verify_serial_gc_flags() { | 1759 static bool verify_serial_gc_flags() { |
1758 return (UseSerialGC && | 1760 return (UseSerialGC && |
1759 !(UseParNewGC || (UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC || | 1761 !(UseParNewGC || (UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC || |
1760 UseParallelGC || UseParallelOldGC)); | 1762 UseParallelGC || UseParallelOldGC)); |
1761 } | 1763 } |
1764 #endif // ASSERT | |
1765 #endif // INCLUDE_ALL_GCS | |
1762 | 1766 |
1763 // check if do gclog rotation | 1767 // check if do gclog rotation |
1764 // +UseGCLogFileRotation is a must, | 1768 // +UseGCLogFileRotation is a must, |
1765 // no gc log rotation when log file not supplied or | 1769 // no gc log rotation when log file not supplied or |
1766 // NumberOfGCLogFiles is 0, or GCLogFileSize is 0 | 1770 // NumberOfGCLogFiles is 0, or GCLogFileSize is 0 |
3091 } \ | 3095 } \ |
3092 FLAG_SET_DEFAULT(gc, false); \ | 3096 FLAG_SET_DEFAULT(gc, false); \ |
3093 } \ | 3097 } \ |
3094 } while(0) | 3098 } while(0) |
3095 | 3099 |
3100 #if !INCLUDE_ALL_GCS | |
3096 static void force_serial_gc() { | 3101 static void force_serial_gc() { |
3097 FLAG_SET_DEFAULT(UseSerialGC, true); | 3102 FLAG_SET_DEFAULT(UseSerialGC, true); |
3098 FLAG_SET_DEFAULT(CMSIncrementalMode, false); // special CMS suboption | 3103 FLAG_SET_DEFAULT(CMSIncrementalMode, false); // special CMS suboption |
3099 UNSUPPORTED_GC_OPTION(UseG1GC); | 3104 UNSUPPORTED_GC_OPTION(UseG1GC); |
3100 UNSUPPORTED_GC_OPTION(UseParallelGC); | 3105 UNSUPPORTED_GC_OPTION(UseParallelGC); |
3101 UNSUPPORTED_GC_OPTION(UseParallelOldGC); | 3106 UNSUPPORTED_GC_OPTION(UseParallelOldGC); |
3102 UNSUPPORTED_GC_OPTION(UseConcMarkSweepGC); | 3107 UNSUPPORTED_GC_OPTION(UseConcMarkSweepGC); |
3103 UNSUPPORTED_GC_OPTION(UseParNewGC); | 3108 UNSUPPORTED_GC_OPTION(UseParNewGC); |
3104 } | 3109 } |
3110 #endif // INCLUDE_ALL_GCS | |
3105 | 3111 |
3106 // Parse entry point called from JNI_CreateJavaVM | 3112 // Parse entry point called from JNI_CreateJavaVM |
3107 | 3113 |
3108 jint Arguments::parse(const JavaVMInitArgs* args) { | 3114 jint Arguments::parse(const JavaVMInitArgs* args) { |
3109 | 3115 |