truffle: src/share/vm/runtime/arguments.cpp comparison

comparison src/share/vm/runtime/arguments.cpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/

author	Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date	Mon, 27 Feb 2012 13:10:13 +0100
parents	5b04b33dac74 15085a6eb50c
children	227aa994f058

comparison

equal deleted inserted replaced

-:2cfb7fb2dce7
+:33df1aeaebbf
 /*
-* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 SystemProperty *Arguments::_compiler_class_path = NULL;
 #endif
 char* Arguments::_meta_index_path = NULL;
 char* Arguments::_meta_index_dir = NULL;
-static bool force_client_mode = false;
 // Check if head of 'option' matches 'name', and sets 'tail' remaining part of option string
 static bool match_option(const JavaVMOption *option, const char* name,
 const char** tail) {
 break;
 case _comp:
 UseInterpreter           = false;
 BackgroundCompilation    = false;
 ClipInlining             = false;
+// Be much more aggressive in tiered mode with -Xcomp and exercise C2 more.
+// We will first compile a level 3 version (C1 with full profiling), then do one invocation of it and
+// compile a level 4 (C2) and then continue executing it.
+if (TieredCompilation) {
+Tier3InvokeNotifyFreqLog = 0;
+Tier4InvocationThreshold = 0;
+}
 break;
 }
 }
 // Conflict: required to use shared spaces (-Xshare:on), but
 FLAG_SET_DEFAULT(ReservedCodeCacheSize, ReservedCodeCacheSize * 2);
 }
 }
 #ifndef KERNEL
+static void disable_adaptive_size_policy(const char* collector_name) {
+if (UseAdaptiveSizePolicy) {
+if (FLAG_IS_CMDLINE(UseAdaptiveSizePolicy)) {
+warning("disabling UseAdaptiveSizePolicy; it is incompatible with %s.",
+collector_name);
+}
+FLAG_SET_DEFAULT(UseAdaptiveSizePolicy, false);
+}
+}
 // If the user has chosen ParallelGCThreads > 0, we set UseParNewGC
 // if it's not explictly set or unset. If the user has chosen
 // UseParNewGC and not explicitly set ParallelGCThreads we
 // set it, unless this is a single cpu machine.
 void Arguments::set_parnew_gc_flags() {
 assert(!UseSerialGC && !UseParallelOldGC && !UseParallelGC && !UseG1GC,
 "control point invariant");
 assert(UseParNewGC, "Error");
-// Turn off AdaptiveSizePolicy by default for parnew until it is
+// Turn off AdaptiveSizePolicy for parnew until it is complete.
-// complete.
+disable_adaptive_size_policy("UseParNewGC");
-if (FLAG_IS_DEFAULT(UseAdaptiveSizePolicy)) {
-FLAG_SET_DEFAULT(UseAdaptiveSizePolicy, false);
-}
 if (ParallelGCThreads == 0) {
 FLAG_SET_DEFAULT(ParallelGCThreads,
 Abstract_VM_Version::parallel_worker_threads());
 if (ParallelGCThreads == 1) {
 // unless explicitly forbidden.
 if (FLAG_IS_DEFAULT(UseParNewGC)) {
 FLAG_SET_ERGO(bool, UseParNewGC, true);
 }
-// Turn off AdaptiveSizePolicy by default for cms until it is
+// Turn off AdaptiveSizePolicy for CMS until it is complete.
-// complete.
+disable_adaptive_size_policy("UseConcMarkSweepGC");
-if (FLAG_IS_DEFAULT(UseAdaptiveSizePolicy)) {
-FLAG_SET_DEFAULT(UseAdaptiveSizePolicy, false);
-}
 // In either case, adjust ParallelGCThreads and/or UseParNewGC
 // as needed.
 if (UseParNewGC) {
 set_parnew_gc_flags();
 // that they want sharing explicitly, do not set ergonomics flags.
 if (DumpSharedSpaces || RequireSharedSpaces) {
 return;
 }
-if (os::is_server_class_machine() && !force_client_mode ) {
+if (os::is_server_class_machine()) {
 // If no other collector is requested explicitly,
 // let the VM select the collector based on
 // machine class and automatic selection policy.
 if (!UseSerialGC &&
 !UseConcMarkSweepGC &&
 #ifdef _LP64
 // Check that UseCompressedOops can be set with the max heap size allocated
 // by ergonomics.
 if (MaxHeapSize <= max_heap_for_compressed_oops()) {
 #if !defined(COMPILER1) || defined(TIERED)
-// disable UseCompressedOops by default on MacOS X until 7118647 is fixed
-#ifndef __APPLE__
 if (FLAG_IS_DEFAULT(UseCompressedOops)) {
 FLAG_SET_ERGO(bool, UseCompressedOops, true);
 }
-#endif // !__APPLE__
 #endif
 #ifdef _WIN64
 if (UseLargePages && UseCompressedOops) {
 // Cannot allocate guard pages for implicit checks in indexed addressing
 // mode, when large pages are specified on windows.
 #endif // !ZERO
 }
 void Arguments::set_parallel_gc_flags() {
 assert(UseParallelGC || UseParallelOldGC, "Error");
-// If parallel old was requested, automatically enable parallel scavenge.
+// Enable ParallelOld unless it was explicitly disabled (cmd line or rc file).
-if (UseParallelOldGC && !UseParallelGC && FLAG_IS_DEFAULT(UseParallelGC)) {
+if (FLAG_IS_DEFAULT(UseParallelOldGC)) {
-FLAG_SET_DEFAULT(UseParallelGC, true);
+FLAG_SET_DEFAULT(UseParallelOldGC, true);
 }
+FLAG_SET_DEFAULT(UseParallelGC, true);
 // If no heap maximum was requested explicitly, use some reasonable fraction
 // of the physical memory, up to a maximum of 1GB.
 if (UseParallelGC) {
 FLAG_SET_DEFAULT(ParallelGCThreads,
 VM_Version::internal_vm_info_string());
 vm_exit(0);
 #ifndef PRODUCT
 // -Xprintflags
 } else if (match_option(option, "-Xprintflags", &tail)) {
-CommandLineFlags::printFlags();
+CommandLineFlags::printFlags(tty, false);
 vm_exit(0);
 #endif
 // -D
 } else if (match_option(option, "-D", &tail)) {
 if (!add_property(tail)) {
 // Sharing support
 // Construct the path to the archive
 char jvm_path[JVM_MAXPATHLEN];
 os::jvm_path(jvm_path, sizeof(jvm_path));
-#ifdef TIERED
-if (strstr(jvm_path, "client") != NULL) {
-force_client_mode = true;
-}
-#endif // TIERED
 char *end = strrchr(jvm_path, *os::file_separator());
 if (end != NULL) *end = '\0';
 char *shared_archive_path = NEW_C_HEAP_ARRAY(char, strlen(jvm_path) +
 strlen(os::file_separator()) + 20);
 if (shared_archive_path == NULL) return JNI_ENOMEM;
 }
 if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) {
 IgnoreUnrecognizedVMOptions = false;
 }
 if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
-CommandLineFlags::printFlags();
+CommandLineFlags::printFlags(tty, false);
 vm_exit(0);
 }
 #ifndef PRODUCT
 if (match_option(option, "-XX:+PrintFlagsWithComments", &tail)) {
-CommandLineFlags::printFlags(true);
+CommandLineFlags::printFlags(tty, true);
 vm_exit(0);
 }
 #endif
 }
 #ifdef COMPILER2
 if (!UseBiasedLocking || EmitSync != 0) {
 UseOptoBiasInlining = false;
 }
+if (!EliminateLocks) {
+EliminateNestedLocks = false;
+}
 #endif
 if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {
 warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output");
 DebugNonSafepoints = true;
 }
 }
 #endif
 if (PrintCommandLineFlags) {
-CommandLineFlags::printSetFlags();
+CommandLineFlags::printSetFlags(tty);
 }
 // Apply CPU specific policy for the BiasedLocking
 if (UseBiasedLocking) {
 if (!VM_Version::use_biased_locking() &&

Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 4970:33df1aeaebbf