jdk-sandbox: comparison hotspot/src/share/vm/runtime/arguments.cpp

equal deleted inserted replaced

-:7d7a3e02610e
+:c314338bc3da
 /*
-* 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::_java_class_path = NULL;
 SystemProperty *Arguments::_sun_boot_class_path = NULL;
 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) {
 since.to_string(version, sizeof(version));
 warning("ignoring option %s; support was removed in %s", argname, version);
 return true;
 }
-jio_fprintf(defaultStream::error_stream(),
+// For locked flags, report a custom error message if available.
-"Unrecognized VM option '%s'\n", argname);
+// Otherwise, report the standard unrecognized VM option.
+Flag* locked_flag = Flag::find_flag((char*)argname, strlen(argname), true);
+if (locked_flag != NULL) {
+char locked_message_buf[BUFLEN];
+locked_flag->get_locked_message(locked_message_buf, BUFLEN);
+if (strlen(locked_message_buf) == 0) {
+jio_fprintf(defaultStream::error_stream(),
+"Unrecognized VM option '%s'\n", argname);
+} else {
+jio_fprintf(defaultStream::error_stream(), "%s", locked_message_buf);
+}
+}
 // allow for commandline "commenting out" options like -XX:#+Verbose
 return arg[0] == '#';
 }
 bool Arguments::process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized) {
 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,
 strcpy(altclasses_path, get_meta_index_dir());
 strcat(altclasses_path, altclasses_jar);
 scp.add_suffix_to_prefix(altclasses_path);
 scp_assembly_required = true;
 FREE_C_HEAP_ARRAY(char, altclasses_path);
+}
+if (WhiteBoxAPI) {
+// Append wb.jar to bootclasspath if enabled
+const char* wb_jar = "wb.jar";
+size_t wb_path_len = strlen(get_meta_index_dir()) + 1 +
+strlen(wb_jar);
+char* wb_path = NEW_C_HEAP_ARRAY(char, wb_path_len);
+strcpy(wb_path, get_meta_index_dir());
+strcat(wb_path, wb_jar);
+scp.add_suffix(wb_path);
+scp_assembly_required = true;
+FREE_C_HEAP_ARRAY(char, wb_path);
 }
 // Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM)
 result = parse_java_options_environment_variable(&scp, &scp_assembly_required);
 if (result != JNI_OK) {
 // original allocation order after promotion, which improves mutator
 // locality.  A minor effect may be that larger PLABs reduce the
 // number of PLAB allocation events during gc.  The value of 8kw
 // was arrived at by experimenting with specjbb.
 FLAG_SET_CMDLINE(uintx, OldPLABSize, 8*K);  // Note: this is in words
-// CompilationPolicyChoice=0 causes the server compiler to adopt
-// a more conservative which-method-do-I-compile policy when one
-// of the counters maintained by the interpreter trips.  The
-// result is reduced startup time and improved specjbb and
-// alacrity performance.  Zero is the default, but we set it
-// explicitly here in case the default changes.
-// See runtime/compilationPolicy.*.
-FLAG_SET_CMDLINE(intx, CompilationPolicyChoice, 0);
 // Enable parallel GC and adaptive generation sizing
 FLAG_SET_CMDLINE(bool, UseParallelGC, true);
 FLAG_SET_DEFAULT(ParallelGCThreads,
 Abstract_VM_Version::parallel_worker_threads());
 // 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;

changeset 12983	c314338bc3da
parent 12981	b557c10f5444
parent 12165	22a13b8c1d4c
child 12988	b31a90568395