Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 2378:924777755fad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6962930: make the string table size configurable Reviewed-by: never, phh, stefank, kamg, dholmes, coleenp
author jcoomes
date Mon, 21 Mar 2011 18:38:00 -0700
parents c7f3d0b4570f
children 38fea01eb669 1dac0f3af89f 9c4f56ff88e9
comparison
equal deleted inserted replaced
2377:57552dca1708 2378:924777755fad
2817 } 2817 }
2818 return JNI_OK; 2818 return JNI_OK;
2819 } 2819 }
2820 2820
2821 void Arguments::set_shared_spaces_flags() { 2821 void Arguments::set_shared_spaces_flags() {
2822 const bool must_share = DumpSharedSpaces || RequireSharedSpaces;
2823 const bool might_share = must_share || UseSharedSpaces;
2824
2825 // The string table is part of the shared archive so the size must match.
2826 if (!FLAG_IS_DEFAULT(StringTableSize)) {
2827 // Disable sharing.
2828 if (must_share) {
2829 warning("disabling shared archive %s because of non-default "
2830 "StringTableSize", DumpSharedSpaces ? "creation" : "use");
2831 }
2832 if (might_share) {
2833 FLAG_SET_DEFAULT(DumpSharedSpaces, false);
2834 FLAG_SET_DEFAULT(RequireSharedSpaces, false);
2835 FLAG_SET_DEFAULT(UseSharedSpaces, false);
2836 }
2837 return;
2838 }
2839
2822 // Check whether class data sharing settings conflict with GC, compressed oops 2840 // Check whether class data sharing settings conflict with GC, compressed oops
2823 // or page size, and fix them up. Explicit sharing options override other 2841 // or page size, and fix them up. Explicit sharing options override other
2824 // settings. 2842 // settings.
2825 const bool cannot_share = UseConcMarkSweepGC || CMSIncrementalMode || 2843 const bool cannot_share = UseConcMarkSweepGC || CMSIncrementalMode ||
2826 UseG1GC || UseParNewGC || UseParallelGC || UseParallelOldGC || 2844 UseG1GC || UseParNewGC || UseParallelGC || UseParallelOldGC ||
2827 UseCompressedOops || UseLargePages && FLAG_IS_CMDLINE(UseLargePages); 2845 UseCompressedOops || UseLargePages && FLAG_IS_CMDLINE(UseLargePages);
2828 const bool must_share = DumpSharedSpaces || RequireSharedSpaces;
2829 const bool might_share = must_share || UseSharedSpaces;
2830 if (cannot_share) { 2846 if (cannot_share) {
2831 if (must_share) { 2847 if (must_share) {
2832 warning("selecting serial gc and disabling large pages %s" 2848 warning("selecting serial gc and disabling large pages %s"
2833 "because of %s", "" LP64_ONLY("and compressed oops "), 2849 "because of %s", "" LP64_ONLY("and compressed oops "),
2834 DumpSharedSpaces ? "-Xshare:dump" : "-Xshare:on"); 2850 DumpSharedSpaces ? "-Xshare:dump" : "-Xshare:on");
2835 force_serial_gc(); 2851 force_serial_gc();
2836 FLAG_SET_CMDLINE(bool, UseLargePages, false); 2852 FLAG_SET_CMDLINE(bool, UseLargePages, false);
2837 LP64_ONLY(FLAG_SET_CMDLINE(bool, UseCompressedOops, false)); 2853 LP64_ONLY(FLAG_SET_CMDLINE(bool, UseCompressedOops, false));
2838 } else { 2854 } else {
2839 if (UseSharedSpaces && Verbose) { 2855 if (UseSharedSpaces && Verbose) {
2840 warning("turning off use of shared archive because of " 2856 warning("turning off use of shared archive because of "
2841 "choice of garbage collector or large pages"); 2857 "choice of garbage collector or large pages");
2842 } 2858 }