1.1 --- a/src/share/vm/runtime/arguments.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/runtime/arguments.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -38,6 +38,7 @@
1.4 #include "services/management.hpp"
1.5 #include "services/memTracker.hpp"
1.6 #include "utilities/defaultStream.hpp"
1.7 +#include "utilities/macros.hpp"
1.8 #include "utilities/taskqueue.hpp"
1.9 #ifdef TARGET_OS_FAMILY_linux
1.10 # include "os_linux.inline.hpp"
1.11 @@ -51,9 +52,9 @@
1.12 #ifdef TARGET_OS_FAMILY_bsd
1.13 # include "os_bsd.inline.hpp"
1.14 #endif
1.15 -#ifndef SERIALGC
1.16 +#if INCLUDE_ALL_GCS
1.17 #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
1.18 -#endif
1.19 +#endif // INCLUDE_ALL_GCS
1.20
1.21 // Note: This is a special bug reporting site for the JVM
1.22 #define DEFAULT_VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/crash.jsp"
1.23 @@ -1072,7 +1073,7 @@
1.24 }
1.25 }
1.26
1.27 -#if INCLUDE_ALTERNATE_GCS
1.28 +#if INCLUDE_ALL_GCS
1.29 static void disable_adaptive_size_policy(const char* collector_name) {
1.30 if (UseAdaptiveSizePolicy) {
1.31 if (FLAG_IS_CMDLINE(UseAdaptiveSizePolicy)) {
1.32 @@ -1284,7 +1285,7 @@
1.33 tty->print_cr("ConcGCThreads: %u", ConcGCThreads);
1.34 }
1.35 }
1.36 -#endif // INCLUDE_ALTERNATE_GCS
1.37 +#endif // INCLUDE_ALL_GCS
1.38
1.39 void set_object_alignment() {
1.40 // Object alignment.
1.41 @@ -1301,10 +1302,10 @@
1.42 // Oop encoding heap max
1.43 OopEncodingHeapMax = (uint64_t(max_juint) + 1) << LogMinObjAlignmentInBytes;
1.44
1.45 -#if INCLUDE_ALTERNATE_GCS
1.46 +#if INCLUDE_ALL_GCS
1.47 // Set CMS global values
1.48 CompactibleFreeListSpace::set_cms_values();
1.49 -#endif // INCLUDE_ALTERNATE_GCS
1.50 +#endif // INCLUDE_ALL_GCS
1.51 }
1.52
1.53 bool verify_object_alignment() {
1.54 @@ -1976,7 +1977,7 @@
1.55
1.56 status = status && verify_min_value(ParGCArrayScanChunk, 1, "ParGCArrayScanChunk");
1.57
1.58 -#ifndef SERIALGC
1.59 +#if INCLUDE_ALL_GCS
1.60 if (UseG1GC) {
1.61 status = status && verify_percentage(InitiatingHeapOccupancyPercent,
1.62 "InitiatingHeapOccupancyPercent");
1.63 @@ -1985,7 +1986,7 @@
1.64 status = status && verify_min_value((intx)G1ConcMarkStepDurationMillis, 1,
1.65 "G1ConcMarkStepDurationMillis");
1.66 }
1.67 -#endif
1.68 +#endif // INCLUDE_ALL_GCS
1.69
1.70 status = status && verify_interval(RefDiscoveryPolicy,
1.71 ReferenceProcessor::DiscoveryPolicyMin,
1.72 @@ -3157,7 +3158,7 @@
1.73 UNSUPPORTED_OPTION(UseLargePages, "-XX:+UseLargePages");
1.74 #endif
1.75
1.76 -#if !INCLUDE_ALTERNATE_GCS
1.77 +#if !INCLUDE_ALL_GCS
1.78 if (UseParallelGC) {
1.79 warning("Parallel GC is not supported in this VM. Using Serial GC.");
1.80 }
1.81 @@ -3170,7 +3171,7 @@
1.82 if (UseParNewGC) {
1.83 warning("Par New GC is not supported in this VM. Using Serial GC.");
1.84 }
1.85 -#endif // INCLUDE_ALTERNATE_GCS
1.86 +#endif // INCLUDE_ALL_GCS
1.87
1.88 #ifndef PRODUCT
1.89 if (TraceBytecodesAt != 0) {
1.90 @@ -3217,9 +3218,9 @@
1.91 // Set object alignment values.
1.92 set_object_alignment();
1.93
1.94 -#ifdef SERIALGC
1.95 +#if !INCLUDE_ALL_GCS
1.96 force_serial_gc();
1.97 -#endif // SERIALGC
1.98 +#endif // INCLUDE_ALL_GCS
1.99 #if !INCLUDE_CDS
1.100 no_shared_spaces();
1.101 #endif // INCLUDE_CDS
1.102 @@ -3247,7 +3248,7 @@
1.103 // Set heap size based on available physical memory
1.104 set_heap_size();
1.105
1.106 -#if INCLUDE_ALTERNATE_GCS
1.107 +#if INCLUDE_ALL_GCS
1.108 // Set per-collector flags
1.109 if (UseParallelGC || UseParallelOldGC) {
1.110 set_parallel_gc_flags();
1.111 @@ -3259,11 +3260,9 @@
1.112 set_g1_gc_flags();
1.113 }
1.114 check_deprecated_gcs();
1.115 -#endif // INCLUDE_ALTERNATE_GCS
1.116 -
1.117 -#ifdef SERIALGC
1.118 +#else // INCLUDE_ALL_GCS
1.119 assert(verify_serial_gc_flags(), "SerialGC unset");
1.120 -#endif // SERIALGC
1.121 +#endif // INCLUDE_ALL_GCS
1.122
1.123 // Set bytecode rewriting flags
1.124 set_bytecode_flags();
1.125 @@ -3357,7 +3356,7 @@
1.126 }
1.127
1.128 jint Arguments::adjust_after_os() {
1.129 -#if INCLUDE_ALTERNATE_GCS
1.130 +#if INCLUDE_ALL_GCS
1.131 if (UseParallelGC || UseParallelOldGC) {
1.132 if (UseNUMA) {
1.133 if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
1.134 @@ -3368,7 +3367,7 @@
1.135 UseNUMAInterleaving = true;
1.136 }
1.137 }
1.138 -#endif
1.139 +#endif // INCLUDE_ALL_GCS
1.140 return JNI_OK;
1.141 }
1.142
