Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 11096:71180a6e5080
7133260: AllocationProfiler uses space in metadata and doesn't seem to do anything useful.
Summary: Remove -Xaprof and Klass::_alloc_count & ArrayKlass::_alloc_size.
Reviewed-by: stefank, coleenp
author | jiangli |
---|---|
date | Wed, 03 Jul 2013 17:26:59 -0400 |
parents | b88209cf98c0 |
children | fa6929d0b0a9 |
comparison
equal
deleted
inserted
replaced
11065:cedf20e2a655 | 11096:71180a6e5080 |
---|---|
66 int Arguments::_num_jvm_args = 0; | 66 int Arguments::_num_jvm_args = 0; |
67 char* Arguments::_java_command = NULL; | 67 char* Arguments::_java_command = NULL; |
68 SystemProperty* Arguments::_system_properties = NULL; | 68 SystemProperty* Arguments::_system_properties = NULL; |
69 const char* Arguments::_gc_log_filename = NULL; | 69 const char* Arguments::_gc_log_filename = NULL; |
70 bool Arguments::_has_profile = false; | 70 bool Arguments::_has_profile = false; |
71 bool Arguments::_has_alloc_profile = false; | |
72 uintx Arguments::_min_heap_size = 0; | 71 uintx Arguments::_min_heap_size = 0; |
73 Arguments::Mode Arguments::_mode = _mixed; | 72 Arguments::Mode Arguments::_mode = _mixed; |
74 bool Arguments::_java_compiler = false; | 73 bool Arguments::_java_compiler = false; |
75 bool Arguments::_xdebug_mode = false; | 74 bool Arguments::_xdebug_mode = false; |
76 const char* Arguments::_java_vendor_url_bug = DEFAULT_VENDOR_URL_BUG; | 75 const char* Arguments::_java_vendor_url_bug = DEFAULT_VENDOR_URL_BUG; |
1974 } | 1973 } |
1975 | 1974 |
1976 status = status && check_gc_consistency(); | 1975 status = status && check_gc_consistency(); |
1977 status = status && check_stack_pages(); | 1976 status = status && check_stack_pages(); |
1978 | 1977 |
1979 if (_has_alloc_profile) { | |
1980 if (UseParallelGC || UseParallelOldGC) { | |
1981 jio_fprintf(defaultStream::error_stream(), | |
1982 "error: invalid argument combination.\n" | |
1983 "Allocation profiling (-Xaprof) cannot be used together with " | |
1984 "Parallel GC (-XX:+UseParallelGC or -XX:+UseParallelOldGC).\n"); | |
1985 status = false; | |
1986 } | |
1987 if (UseConcMarkSweepGC) { | |
1988 jio_fprintf(defaultStream::error_stream(), | |
1989 "error: invalid argument combination.\n" | |
1990 "Allocation profiling (-Xaprof) cannot be used together with " | |
1991 "the CMS collector (-XX:+UseConcMarkSweepGC).\n"); | |
1992 status = false; | |
1993 } | |
1994 } | |
1995 | |
1996 if (CMSIncrementalMode) { | 1978 if (CMSIncrementalMode) { |
1997 if (!UseConcMarkSweepGC) { | 1979 if (!UseConcMarkSweepGC) { |
1998 jio_fprintf(defaultStream::error_stream(), | 1980 jio_fprintf(defaultStream::error_stream(), |
1999 "error: invalid argument combination.\n" | 1981 "error: invalid argument combination.\n" |
2000 "The CMS collector (-XX:+UseConcMarkSweepGC) must be " | 1982 "The CMS collector (-XX:+UseConcMarkSweepGC) must be " |
2665 #else // INCLUDE_FPROF | 2647 #else // INCLUDE_FPROF |
2666 jio_fprintf(defaultStream::error_stream(), | 2648 jio_fprintf(defaultStream::error_stream(), |
2667 "Flat profiling is not supported in this VM.\n"); | 2649 "Flat profiling is not supported in this VM.\n"); |
2668 return JNI_ERR; | 2650 return JNI_ERR; |
2669 #endif // INCLUDE_FPROF | 2651 #endif // INCLUDE_FPROF |
2670 // -Xaprof | |
2671 } else if (match_option(option, "-Xaprof", &tail)) { | |
2672 _has_alloc_profile = true; | |
2673 // -Xconcurrentio | 2652 // -Xconcurrentio |
2674 } else if (match_option(option, "-Xconcurrentio", &tail)) { | 2653 } else if (match_option(option, "-Xconcurrentio", &tail)) { |
2675 FLAG_SET_CMDLINE(bool, UseLWPSynchronization, true); | 2654 FLAG_SET_CMDLINE(bool, UseLWPSynchronization, true); |
2676 FLAG_SET_CMDLINE(bool, BackgroundCompilation, false); | 2655 FLAG_SET_CMDLINE(bool, BackgroundCompilation, false); |
2677 FLAG_SET_CMDLINE(intx, DeferThrSuspendLoopCount, 1); | 2656 FLAG_SET_CMDLINE(intx, DeferThrSuspendLoopCount, 1); |